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

[Christian Hesse]

    Date: Tuesday, September 15, 2020 @ 06:47:22
  Author: eworm
Revision: 396143

upgpkg: gpm 1.20.7.r38.ge82d1a6-1: build from current git

This includes a build fix for GCC 10.x (FS#67899)

Modified:
  gpm/trunk/PKGBUILD
Deleted:
  gpm/trunk/0001-glibc-sigemptyset.patch

------------------------------+
 0001-glibc-sigemptyset.patch |   29 -----------------------------
 PKGBUILD                     |   10 +++-------
 2 files changed, 3 insertions(+), 36 deletions(-)

Deleted: 0001-glibc-sigemptyset.patch
===================================================================
--- 0001-glibc-sigemptyset.patch	2020-09-15 06:15:01 UTC (rev 396142)
+++ 0001-glibc-sigemptyset.patch	2020-09-15 06:47:22 UTC (rev 396143)
@@ -1,29 +0,0 @@
-From fdc42770596e25749f7e2ce0ea97882177397167 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Sun, 25 Jun 2017 07:25:33 -0700
-Subject: [PATCH] Use sigemptyset API instead of __sigemptyset
-
-__sigemptyset has been removed from glibc public
-API headers in upcoming (2.26) release onwards
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
----
- src/prog/gpm-root.y | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
-index 5126c65..76c896c 100644
---- a/src/prog/gpm-root.y
-+++ b/src/prog/gpm-root.y
-@@ -1196,11 +1196,7 @@ int main(int argc, char **argv)
-                                                         LOG_DAEMON : LOG_USER);
-    /* reap your zombies */
-    childaction.sa_handler=reap_children;
--#if defined(__GLIBC__)
--   __sigemptyset(&childaction.sa_mask);
--#else /* __GLIBC__ */
-    sigemptyset(&childaction.sa_mask);
--#endif /* __GLIBC__ */
-    childaction.sa_flags=0;
-    sigaction(SIGCHLD,&childaction,NULL);
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-15 06:15:01 UTC (rev 396142)
+++ PKGBUILD	2020-09-15 06:47:22 UTC (rev 396143)
@@ -1,9 +1,9 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=gpm
-pkgver=1.20.7.r27.g1fd1941
-_commit='1fd19417b8a4dd9945347e98dfa97e4cfd798d77'
-pkgrel=2
+pkgver=1.20.7.r38.ge82d1a6
+_commit='e82d1a653ca94aa4ed12441424da6ce780b1e530'
+pkgrel=1
 pkgdesc='A mouse server for the console and xterm'
 arch=('x86_64')
 url='https://www.nico.schottelius.org/software/gpm/'
@@ -12,11 +12,9 @@
 makedepends=('git')
 options=('!makeflags')
 source=("git+https://github.com/telmich/gpm.git#commit=${_commit}"
-        '0001-glibc-sigemptyset.patch'
         'gpm.sh'
         'gpm.service')
 sha256sums=('SKIP'
-            '61f901aae46ff79679a058758151dc93901dcd9ea938fabb0765554993b8cb09'
             'f41e90dcf6c0c6c4b8eff1c69039a20eb6b38ea851ffd1fa47ba311bf83d6ed8'
             'dc7d2463f6670ff2c1646a571ffad51f7c603793c25c6f685efad13cbb444034')
 
@@ -33,8 +31,6 @@
 prepare() {
   cd "${srcdir}/${pkgname}"
 
-  patch -Np1 < ../0001-glibc-sigemptyset.patch
-
   ./autogen.sh
 }