From 15af887b032096ed8b0a539e3dde8068ed785fb612c95119bf9582a3e9268b63 Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Tue, 1 Aug 2017 11:15:35 +0000
Subject: [PATCH 1/2] Accepting request 513174 from
 home:Andreas_Schwab:glibc:rebuild

- decls.patch: fix missing declarations

OBS-URL: https://build.opensuse.org/request/show/513174
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpm?expand=0&rev=46
---
 decls.patch | 25 +++++++++++++++++++++++++
 gpm.changes |  5 +++++
 gpm.spec    |  3 +++
 3 files changed, 33 insertions(+)
 create mode 100644 decls.patch

diff --git a/decls.patch b/decls.patch
new file mode 100644
index 0000000..4caca07
--- /dev/null
+++ b/decls.patch
@@ -0,0 +1,25 @@
+Index: gpm-1.20.7/src/daemon/open_console.c
+===================================================================
+--- gpm-1.20.7.orig/src/daemon/open_console.c
++++ gpm-1.20.7/src/daemon/open_console.c
+@@ -22,6 +22,7 @@
+ #include <fcntl.h>                  /* open and co.      */
+ #include <sys/stat.h>               /* stat()            */
+ #include <sys/ioctl.h>              /* ioctl             */
++#include <sys/sysmacros.h>	    /* major */
+ 
+ /* Linux specific (to be outsourced in gpm2 */
+ #include <linux/serial.h>           /* for serial console check */
+Index: gpm-1.20.7/src/prog/gpm-root.y
+===================================================================
+--- gpm-1.20.7.orig/src/prog/gpm-root.y
++++ gpm-1.20.7/src/prog/gpm-root.y
+@@ -1196,7 +1196,7 @@ int main(int argc, char **argv)
+    /* 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/gpm.changes b/gpm.changes
index e5b8b9b..1004bde 100644
--- a/gpm.changes
+++ b/gpm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul  5 13:10:44 UTC 2017 - schwab@suse.de
+
+- decls.patch: fix missing declarations
+
 -------------------------------------------------------------------
 Mon Jun 12 16:55:57 UTC 2017 - adam.majer@suse.de
 
diff --git a/gpm.spec b/gpm.spec
index ad40669..562eefa 100644
--- a/gpm.spec
+++ b/gpm.spec
@@ -55,6 +55,8 @@ Patch28:        gpm-dependencies.patch
 Patch29:        gpm-do_create_symlink.patch
 #PATCH-FIX-UPSTREAM Copy the current licence text from gpl-2.0+ to gpm.h
 Patch30:        gpm-fix_fsf_addess.patch
+#PATCH-FIX-UPSTREAM Fix missing declarations
+Patch31:        decls.patch
 BuildRequires:  bison
 BuildRequires:  libtool
 BuildRequires:  lzma
@@ -118,6 +120,7 @@ Development files for the gpm (general purpose mouse) package.
 %patch28
 %patch29
 %patch30
+%patch31 -p1
 cp %{S:2} %{S:3} %{S:4} .
 cp %{S:7} COPYING
 

From c32ccecf9546e71091c59764145c5fb9e1c02d496d59c5075c32f438251ec341 Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Tue, 1 Aug 2017 11:17:22 +0000
Subject: [PATCH 2/2] Add references to upstream PR for added patch.

OBS-URL: https://build.opensuse.org/package/show/Base:System/gpm?expand=0&rev=47
---
 decls.patch | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/decls.patch b/decls.patch
index 4caca07..c32045f 100644
--- a/decls.patch
+++ b/decls.patch
@@ -1,3 +1,8 @@
+__sigemptyset has been removed from glibc public
+API headers in upcoming (2.26) release onwards
+
+Upstream-PR: https://github.com/telmich/gpm/pull/20
+
 Index: gpm-1.20.7/src/daemon/open_console.c
 ===================================================================
 --- gpm-1.20.7.orig/src/daemon/open_console.c