From 2bb25ffa3fe7fc141b3b72404ef1837c694ebf7d Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Wed, 1 Aug 2018 12:34:22 +0300
Subject: [PATCH] aalib-gpm:rebuild

---
 .../gpm/files/gpm-1.20.7-glibc_2.26-1.patch   | 65 +++++++++++++++++++
 hardware/misc/gpm/pspec.xml                   |  3 +
 multimedia/graphics/aalib/actions.py          |  2 +
 3 files changed, 70 insertions(+)
 create mode 100644 hardware/misc/gpm/files/gpm-1.20.7-glibc_2.26-1.patch

diff --git a/hardware/misc/gpm/files/gpm-1.20.7-glibc_2.26-1.patch b/hardware/misc/gpm/files/gpm-1.20.7-glibc_2.26-1.patch
new file mode 100644
index 0000000000..b801bcddf5
--- /dev/null
+++ b/hardware/misc/gpm/files/gpm-1.20.7-glibc_2.26-1.patch
@@ -0,0 +1,65 @@
+Submitted by: Pierre Labastie <pierre dot labastie at neuf dot fr>
+Date: 2017-08-17
+Initial Package Version: 1.20.7
+Origin: Nutyx
+Upstream Status: There are PRs, but nothing committed yet
+Description: Fix build failures introduced by glibc-2.26
+
+diff -Naur gpm-1.20.7-orig/src/daemon/open_console.c gpm-1.20.7/src/daemon/open_console.c
+--- gpm-1.20.7-orig/src/daemon/open_console.c	2012-10-26 21:21:38.000000000 +0000
++++ gpm-1.20.7/src/daemon/open_console.c	2017-08-08 17:58:15.176232558 +0000
+@@ -23,6 +23,10 @@
+ #include <sys/stat.h>               /* stat()            */
+ #include <sys/ioctl.h>              /* ioctl             */
+ 
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>          /* major() w/newer glibc */
++#endif
++
+ /* Linux specific (to be outsourced in gpm2 */
+ #include <linux/serial.h>           /* for serial console check */
+ #include <asm/ioctls.h>            /* for serial console check */
+diff -Naur gpm-1.20.7-orig/src/prog/gpm-root.y gpm-1.20.7/src/prog/gpm-root.y
+--- gpm-1.20.7-orig/src/prog/gpm-root.y	2012-10-26 21:21:38.000000000 +0000
++++ gpm-1.20.7/src/prog/gpm-root.y	2017-08-08 18:00:36.442898559 +0000
+@@ -443,6 +443,7 @@
+ }
+ 
+ /*---------------------------------------------------------------------*/
++#if 0
+ static int f_debug_one(FILE *f, Draw *draw)
+ {
+    DrawItem *ip;
+@@ -465,6 +466,7 @@
+ #undef LINE
+    return 0;
+ }
++#endif
+ 
+ int f_debug(int mode, DrawItem *self, int uid)
+ {
+@@ -960,10 +962,8 @@
+ /*------------*/
+ static inline void scr_restore(int fd, FILE *f, unsigned char *buffer, int vc)
+ {
+-   int x,y, dumpfd;
++   int dumpfd;
+    char dumpname[20];
+-
+-   x=buffer[2]; y=buffer[3];
+    
+    /* WILL NOT WORK WITH DEVFS! FIXME! */
+    sprintf(dumpname,"/dev/vcsa%i",vc);
+@@ -1196,11 +1196,7 @@
+                                                         LOG_DAEMON : LOG_USER);
+    /* reap your zombies */
+    childaction.sa_handler=reap_children;
+-#if defined(__GLIBC__)
+-   __sigemptyset(&childaction.sa_mask);
+-#else /* __GLIBC__ */
+-   childaction.sa_mask=0;
+-#endif /* __GLIBC__ */
++   sigemptyset(&childaction.sa_mask);
+    childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
+    sigaction(SIGCHLD,&childaction,NULL);
+ 
diff --git a/hardware/misc/gpm/pspec.xml b/hardware/misc/gpm/pspec.xml
index dc79b6e79d..5a7fa0e0c7 100644
--- a/hardware/misc/gpm/pspec.xml
+++ b/hardware/misc/gpm/pspec.xml
@@ -17,6 +17,9 @@
             <Dependency>ncurses-devel</Dependency>
             <Dependency>texinfo</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch level="1">gpm-1.20.7-glibc_2.26-1.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
diff --git a/multimedia/graphics/aalib/actions.py b/multimedia/graphics/aalib/actions.py
index 06996f8d14..4db1ba997b 100644
--- a/multimedia/graphics/aalib/actions.py
+++ b/multimedia/graphics/aalib/actions.py
@@ -6,10 +6,12 @@
 
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
 
 def setup():
+    shelltools.system("sed -i -e '/AM_PATH_AALIB,/s/AM_PATH_AALIB/[&]/' aalib.m4")
     autotools.autoreconf("-vfi")
 
     autotools.configure("--with-slang-driver \