Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=3fa88ad575d0d1452a9a79d22c2426a4b7b8bbb9
commit 3fa88ad575d0d1452a9a79d22c2426a4b7b8bbb9 Author: crazy <[email protected]> Date: Fri Jan 26 05:40:36 2018 +0100 gpm-1.20.7-7-x86_64 * rebuild * added patches to fix the build * bleh these weird circular depends=() makes me mad this time diff --git a/source/base/gpm/FrugalBuild b/source/base/gpm/FrugalBuild index c35f1db..cb95a38 100644 --- a/source/base/gpm/FrugalBuild +++ b/source/base/gpm/FrugalBuild @@ -4,7 +4,7 @@ pkgname=gpm pkgver=1.20.7 -pkgrel=6 +pkgrel=7 pkgdesc="General purpose mouse server" url="https://launchpad.net/gpm/"; depends=('ncurses>=6.0-16') @@ -14,12 +14,14 @@ archs=('x86_64') backup=(etc/sysconfig/gpm) up2date="Flasttar https://launchpad.net/gpm/"; source=(http://launchpad.net/gpm/main/$pkgver/+download/gpm-$pkgver.tar.gz \ - gpm gpm.service) + gpm gpm.service gpm-1.20.7-glibc-2.26.patch gpm-1.20.7-sysmacros.patch) _F_systemd_units=(gpm=e) Finclude systemd sha1sums=('3438de6d2be7cb6399bba54f15289ff148a5f11d' \ '45729ab026508ccf12c9435108e4b620c93204ea' \ - 'de2a9c6f0b9b4b899ec1b212f21c04c8d2aed39b') + 'de2a9c6f0b9b4b899ec1b212f21c04c8d2aed39b' \ + 'f1538b4e139cd7057ac2cbb01cc7e7123ed1c0a6' \ + '9e8a3fb2cc1254a7f0a621f050c24d7a72e523eb') build() { diff --git a/source/base/gpm/gpm-1.20.7-glibc-2.26.patch b/source/base/gpm/gpm-1.20.7-glibc-2.26.patch new file mode 100644 index 0000000..ef2de01 --- /dev/null +++ b/source/base/gpm/gpm-1.20.7-glibc-2.26.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/629774 +--- a/src/prog/gpm-root.y 2012-10-26 17:21:38.000000000 -0400 ++++ b/src/prog/gpm-root.y 2017-09-07 20:39:51.933264063 -0400 +@@ -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__ */ diff --git a/source/base/gpm/gpm-1.20.7-sysmacros.patch b/source/base/gpm/gpm-1.20.7-sysmacros.patch new file mode 100644 index 0000000..d8ab2d1 --- /dev/null +++ b/source/base/gpm/gpm-1.20.7-sysmacros.patch @@ -0,0 +1,30 @@ +From b350aee4ea5785a75cb6ad770f6b768c506ebb70 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <[email protected]> +Date: Mon, 14 Mar 2016 15:39:54 -0400 +Subject: [PATCH] fix building w/newer glibc + +Linux C libraries are looking to disentangle sysmacros.h from the +sys/types.h include, so make sure we pull in the header when it is +found. +--- + src/daemon/open_console.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c +index 4d6c0af..6dd43e6 100644 +--- a/src/daemon/open_console.c ++++ b/src/daemon/open_console.c +@@ -24,6 +24,10 @@ + #include <sys/types.h> /* major() */ + #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 */ +-- +2.6.2 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
