[arch-commits] Commit in lib32-gpm/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Tuesday, June 4, 2019 @ 21:33:12
  Author: arojas
Revision: 476913

https

Modified:
  lib32-gpm/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-04 21:32:44 UTC (rev 476912)
+++ PKGBUILD2019-06-04 21:33:12 UTC (rev 476913)
@@ -7,11 +7,11 @@
 pkgrel=2
 pkgdesc="A mouse server for the console and xterm (32 bit)"
 arch=('x86_64')
-url="http://www.nico.schottelius.org/software/gpm/";
+url="https://www.nico.schottelius.org/software/gpm/";
 license=('GPL')
 depends=('lib32-ncurses' "$_pkgname")
 options=('!makeflags')
-source=(http://www.nico.schottelius.org/software/gpm/archives/${_pkgname}-${pkgver}.tar.lzma
+source=(https://www.nico.schottelius.org/software/gpm/archives/${_pkgname}-${pkgver}.tar.lzma
 gpm-glibc-2.26.patch)
 sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369'
   '57d98a5ed864ead76290d32a6899caaed0b55959')

[arch-commits] Commit in lib32-gpm/trunk (PKGBUILD gpm-glibc-2.26.patch)

[Antonio Rojas via arch-commits]

Date: Saturday, June 9, 2018 @ 06:32:09
  Author: arojas
Revision: 342116

BUILDINFO rebuild

Added:
  lib32-gpm/trunk/gpm-glibc-2.26.patch
Modified:
  lib32-gpm/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 gpm-glibc-2.26.patch |   64 +
 2 files changed, 74 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-09 06:27:08 UTC (rev 342115)
+++ PKGBUILD2018-06-09 06:32:09 UTC (rev 342116)
@@ -5,7 +5,7 @@
 _pkgname=gpm
 pkgname=lib32-$_pkgname
 pkgver=1.20.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A mouse server for the console and xterm (32 bit)"
 arch=('x86_64')
 url="http://www.nico.schottelius.org/software/gpm/";
@@ -12,9 +12,16 @@
 license=('GPL')
 depends=('lib32-ncurses' "$_pkgname")
 options=('!makeflags')
-source=(http://www.nico.schottelius.org/software/gpm/archives/${_pkgname}-${pkgver}.tar.lzma)
-sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369')
+source=(http://www.nico.schottelius.org/software/gpm/archives/${_pkgname}-${pkgver}.tar.lzma
+gpm-glibc-2.26.patch)
+sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369'
+  '57d98a5ed864ead76290d32a6899caaed0b55959')
 
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -p1 -i ../gpm-glibc-2.26.patch # Fix build with glibc 2.26 (Debian)
+}
+
 build() {
   export CC='gcc -m32'
   export CXX='g++ -m32'

Added: gpm-glibc-2.26.patch
===
--- gpm-glibc-2.26.patch(rev 0)
+++ gpm-glibc-2.26.patch2018-06-09 06:32:09 UTC (rev 342116)
@@ -0,0 +1,64 @@
+Origin: 
http://downloads.nutyx.org/x86_64/development/base/gpm/gpm-1.20.7-glibc-2.26-1.patch
+Bug: https://github.com/telmich/gpm/issues/21
+Bug-Debian: https://bugs.debian.org/886903
+Bug-LFS: http://wiki.linuxfromscratch.org/blfs/ticket/9616#ticket
+Author: tnut from nutyx.org, https://github.com/tnut
+Description: Fix FTBFS with glibc 2.26
+
+--- a/src/daemon/open_console.c
 b/src/daemon/open_console.c
+@@ -24,6 +24,10 @@
+ #include   /* ioctl */
+ #include   /* major()   */
+ 
++#ifdef HAVE_SYS_SYSMACROS_H
++#include   /* major() w/newer glibc */
++#endif
++
+ /* Linux specific (to be outsourced in gpm2 */
+ #include/* for serial console check */
+ #include /* for serial console check */
+--- a/src/prog/gpm-root.y
 b/src/prog/gpm-root.y
+@@ -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);
+ 
+