summaryrefslogtreecommitdiffstats
path: root/source/a/gpm/gpm.gcc7.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/a/gpm/gpm.gcc7.diff
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-757ad84157c5b53ac4faf6580898f4b34fde5081.tar.gz
current-757ad84157c5b53ac4faf6580898f4b34fde5081.tar.xz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/gpm/gpm.gcc7.diff')
-rw-r--r--source/a/gpm/gpm.gcc7.diff28
1 files changed, 28 insertions, 0 deletions
diff --git a/source/a/gpm/gpm.gcc7.diff b/source/a/gpm/gpm.gcc7.diff
new file mode 100644
index 000000000..b53d4ca66
--- /dev/null
+++ b/source/a/gpm/gpm.gcc7.diff
@@ -0,0 +1,28 @@
+--- ./src/prog/gpm-root.y.orig 2012-10-26 16:21:38.000000000 -0500
++++ ./src/prog/gpm-root.y 2018-02-03 14:52:27.229309044 -0600
+@@ -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);
+
+--- ./src/daemon/open_console.c.orig 2018-02-03 14:49:24.586310986 -0600
++++ ./src/daemon/open_console.c 2018-02-03 14:53:03.347308660 -0600
+@@ -24,6 +24,10 @@
+ #include <sys/ioctl.h> /* ioctl */
+ #include <sys/types.h>
+
++#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 */