[crux-contrib] [PATCH] gpm: fix build

Andy Kosela akosela at andykosela.com
Mon Mar 25 06:20:17 UTC 2019


---

Hi contrib@,

Currently contrib/gpm is broken.  This patch fixes it.

--Andy

---
 gpm/.signature                 |  3 ++-
 gpm/Pkgfile                    |  3 ++-
 gpm/gpm-1.20.6-fix-build.patch | 23 +++++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 gpm/gpm-1.20.6-fix-build.patch

diff --git a/gpm/.signature b/gpm/.signature
index e89e6480..b5cb324d 100644
--- a/gpm/.signature
+++ b/gpm/.signature
@@ -1,9 +1,10 @@
 untrusted comment: verify with /etc/ports/contrib.pub
 RWSagIOpLGJF3wBAaqKFOIfcCvPH4H3Lg0XW8YxWqcK6xuyhz/q0eTjYy26bzMnDIzT1dmFzdRmfVnl4M6c5hqJQqywC3EsL0gU=
-SHA256 (Pkgfile) = 1197279c16bf717cf0e355c6142adc2e12551bbb3f84afeaf8c6a7065bc19717
+SHA256 (Pkgfile) = c3a35eaa57c570def71e3d0c7f3e63d335b72bb78f569b3c48f74262bbee8b7d
 SHA256 (.footprint) = 34b0a0b8cabb2b936e9834d858599e6de8a953969393e04776dd43f00023d4ad
 SHA256 (gpm-1.20.6.tar.bz2) = 08b2c395ffbb9dbc3d144d23e20a42ca57d08ef5a354decb7bc8fed6528820a5
 SHA256 (gpm-1.20.5-nodebug.patch) = 1484cc85e7e049bba9a90c40ad831c549661ecd381bcae074e4e4a0698ce2934
 SHA256 (gpm-1.20.5-no-dumb-error-messages.patch) = b00bafe3759346c88426400ead9d0c72320714c4034353a065b78891f6304b7d
 SHA256 (gpm-1.20.5-make-install-fixes.patch) = cbfed192c7abaae00de6b80c9f385bef22e6bf1ba95f6c63f5a16aef5ad853c7
+SHA256 (gpm-1.20.6-fix-build.patch) = 0ddf975585cbfe415a4c0baa0f4dc796e022c50d7145cdce256ffb0c6c0c9097
 SHA256 (gpm.rc) = c6e7824b8178323cd3d949fe1658ddfac908b0b0ab1bd6e082707c41b10a61a6
diff --git a/gpm/Pkgfile b/gpm/Pkgfile
index 2aedc87d..f0f47b56 100644
--- a/gpm/Pkgfile
+++ b/gpm/Pkgfile
@@ -10,6 +10,7 @@ source=(https://nico.schottelius.org/software/gpm/archives/gpm-$version.tar.bz2
 	gpm-1.20.5-nodebug.patch
 	gpm-1.20.5-no-dumb-error-messages.patch
 	gpm-1.20.5-make-install-fixes.patch
+	gpm-1.20.6-fix-build.patch
 	gpm.rc)
 
 build() {
@@ -18,6 +19,7 @@ build() {
 	patch -p 1 -i $SRC/gpm-1.20.5-nodebug.patch
 	patch -p 1 -i $SRC/gpm-1.20.5-no-dumb-error-messages.patch
 	patch -p 1 -i $SRC/gpm-1.20.5-make-install-fixes.patch
+	patch -p 1 -i $SRC/gpm-1.20.6-fix-build.patch
 
 	./configure \
 		--prefix=/usr \
@@ -33,4 +35,3 @@ build() {
 	rmdir $PKG/usr/etc
 	rmdir $PKG/usr/share
 }
-
diff --git a/gpm/gpm-1.20.6-fix-build.patch b/gpm/gpm-1.20.6-fix-build.patch
new file mode 100644
index 00000000..031b9699
--- /dev/null
+++ b/gpm/gpm-1.20.6-fix-build.patch
@@ -0,0 +1,23 @@
+diff -ruN gpm-1.20.6.orig/src/daemon/open_console.c gpm-1.20.6/src/daemon/open_console.c
+--- gpm-1.20.6.orig/src/daemon/open_console.c	2019-03-25 00:15:17.739549170 -0500
++++ gpm-1.20.6/src/daemon/open_console.c	2019-03-25 00:16:26.372880871 -0500
+@@ -21,6 +21,7 @@
+ 
+ #include <fcntl.h>                  /* open and co.      */
+ #include <sys/stat.h>               /* stat()            */
++#include <sys/sysmacros.h>          /* major()           */
+ #include <stropts.h>                /* ioctl             */
+ 
+ /* Linux specific (to be outsourced in gpm2 */
+diff -ruN gpm-1.20.6.orig/src/prog/gpm-root.y gpm-1.20.6/src/prog/gpm-root.y
+--- gpm-1.20.6.orig/src/prog/gpm-root.y	2019-03-25 00:15:17.749549171 -0500
++++ gpm-1.20.6/src/prog/gpm-root.y	2019-03-25 00:17:52.039545503 -0500
+@@ -1197,7 +1197,7 @@
+    /* reap your zombies */
+    childaction.sa_handler=reap_children;
+ #if defined(__GLIBC__)
+-   __sigemptyset(&childaction.sa_mask);
++   sigemptyset(&childaction.sa_mask);
+ #else /* __GLIBC__ */
+    childaction.sa_mask=0;
+ #endif /* __GLIBC__ */
-- 
2.20.1



More information about the crux-contrib mailing list