Date: Tuesday, December 6, 2022 @ 18:24:34
Author: arojas
Revision: 1356861
archrelease: copy trunk to multilib-x86_64
Added:
lib32-gpm/repos/multilib-x86_64/PKGBUILD
(from rev 1356860, lib32-gpm/trunk/PKGBUILD)
lib32-gpm/repos/multilib-x86_64/gpm-glibc-2.26.patch
(from rev 1356860, lib32-gpm/trunk/gpm-glibc-2.26.patch)
Deleted:
lib32-gpm/repos/multilib-x86_64/PKGBUILD
lib32-gpm/repos/multilib-x86_64/gpm-glibc-2.26.patch
----------------------+
PKGBUILD | 97 +++++++++++++++++++------------------
gpm-glibc-2.26.patch | 128 ++++++++++++++++++++++++-------------------------
2 files changed, 115 insertions(+), 110 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-06 18:24:24 UTC (rev 1356860)
+++ PKGBUILD 2022-12-06 18:24:34 UTC (rev 1356861)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: Eric Bélanger <[email protected]>
-
-_pkgname=gpm
-pkgname=lib32-$_pkgname
-pkgver=1.20.7
-pkgrel=2
-pkgdesc="A mouse server for the console and xterm (32 bit)"
-arch=('x86_64')
-url="http://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
- 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'
- export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
- cd "${srcdir}/${_pkgname}-${pkgver}"
- ./autogen.sh
- ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
--libdir=/usr/lib32
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
-# library fixes
- cd "${pkgdir}/usr/lib32/"
- ln -s libgpm.so.2.* libgpm.so
- chmod 755 "${pkgdir}"/usr/lib32/libgpm.so.*
-
- rm -rf "${pkgdir}"/usr/{bin,include,share} "$pkgdir"/etc
-}
Copied: lib32-gpm/repos/multilib-x86_64/PKGBUILD (from rev 1356860,
lib32-gpm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-12-06 18:24:34 UTC (rev 1356861)
@@ -0,0 +1,51 @@
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Eric Bélanger <[email protected]>
+
+_pkgname=gpm
+pkgname=lib32-$_pkgname
+pkgver=1.20.7.r38.ge82d1a6
+pkgrel=1
+_commit='e82d1a653ca94aa4ed12441424da6ce780b1e530'
+pkgdesc="A mouse server for the console and xterm (32 bit)"
+arch=('x86_64')
+url="https://www.nico.schottelius.org/software/gpm/";
+license=('GPL')
+depends=('lib32-ncurses' "$_pkgname")
+makedepends=('git')
+options=('!makeflags')
+source=("git+https://github.com/telmich/gpm.git#commit=${_commit}";)
+sha1sums=('SKIP')
+sha256sums=('SKIP')
+
+pkgver() {
+ cd $_pkgname
+
+ GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"
+ printf '%s.r%s.g%s' \
+ "${GITTAG}" \
+ "$(git rev-list --count ${GITTAG}..)" \
+ "$(git rev-parse --short HEAD)"
+}
+
+build() {
+ export CC='gcc -m32'
+ export CXX='g++ -m32'
+ export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+ cd ${_pkgname}
+ ./autogen.sh
+ ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
--libdir=/usr/lib32
+ make
+}
+
+package() {
+ cd ${_pkgname}
+ make DESTDIR="${pkgdir}" install
+
+# library fixes
+ cd "${pkgdir}/usr/lib32/"
+ ln -s libgpm.so.2.* libgpm.so
+ chmod 755 "${pkgdir}"/usr/lib32/libgpm.so.*
+
+ rm -rf "${pkgdir}"/usr/{bin,include,share} "$pkgdir"/etc
+}
Deleted: gpm-glibc-2.26.patch
===================================================================
--- gpm-glibc-2.26.patch 2022-12-06 18:24:24 UTC (rev 1356860)
+++ gpm-glibc-2.26.patch 2022-12-06 18:24:34 UTC (rev 1356861)
@@ -1,64 +0,0 @@
-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 <sys/ioctl.h> /* ioctl */
- #include <sys/types.h> /* major() */
-
-+#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 */
---- 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);
-
-
Copied: lib32-gpm/repos/multilib-x86_64/gpm-glibc-2.26.patch (from rev 1356860,
lib32-gpm/trunk/gpm-glibc-2.26.patch)
===================================================================
--- gpm-glibc-2.26.patch (rev 0)
+++ gpm-glibc-2.26.patch 2022-12-06 18:24:34 UTC (rev 1356861)
@@ -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 <sys/ioctl.h> /* ioctl */
+ #include <sys/types.h> /* major() */
+
++#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 */
+--- 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);
+
+
