mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2024-09-20 11:23:16 +00:00
main/gpm: backport upstream patch fixing build with gcc14
This aport no longer builds on GCC 14 without including `string.h` in `src/daemon/old_main.c`, which this upstream patch includes.
This commit is contained in:
Celeste
Natanael Copa
parent
ef26bb4fa4
commit
e202d60818
2 changed files with 123 additions and 1 deletions
|
|
@ -2,7 +2,7 @@
|
|||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=gpm
|
||||
pkgver=1.20.7
|
||||
pkgrel=4
|
||||
pkgrel=5
|
||||
pkgdesc="A mouse server for the console"
|
||||
options="!check" # No testsuite
|
||||
url="https://www.nico.schottelius.org/software/gpm/"
|
||||
|
|
@ -20,6 +20,7 @@ source="http://www.nico.schottelius.org/software/gpm/archives/gpm-$pkgver.tar.bz
|
|||
install-shared-libs-with-+x-perms.patch
|
||||
install-unversioned-solibrary.patch
|
||||
musl-fixes.patch
|
||||
musl-fixes-2.patch
|
||||
constify-format-strings.patch
|
||||
gpm-include-sysmacros.patch
|
||||
gcc-10.patch
|
||||
|
|
@ -78,6 +79,7 @@ db7e02b50bb02726ca743d2c7bef7d49edb359bb1594cc18f371662471d425a32f5c9f99743f2370
|
|||
ec21b7029e0880b342bca5a70522e33d5cabbf77c44c1dd23b16d829d8fcc6cadcdf77b01724a91a6640916673f6d5ab91d18db4cd709ed77f9ce22dec723a13 install-shared-libs-with-+x-perms.patch
|
||||
05bdf6a03870175dcee5414d6d2d434b6cd3e06686f0be22d70fc7f9759db8ccea0bf9ae900d95e6d2872845cd66ee0a794afc5ece78c6640be163cad2065c58 install-unversioned-solibrary.patch
|
||||
45d3a20a8f9f00f78b21c10143e138add17d414e9b5ecc28d9efee9c2190450c79dca00b13a8247ee7753ff778b09bc88fe8c512366d5b1622981bb5d612f933 musl-fixes.patch
|
||||
2ebd037471c370d3e218944fed0e1b1a65a4281a8e98926f57b507838ea457a11ddbb86a53e16e27e8bb20711221f9e4bd4fbd467a93dfebc2e0da0cef24c382 musl-fixes-2.patch
|
||||
36a5059c6336010b504ec6fc53c2d3df0811b1f1249c0e04c13066db06667119377a21e58121aaa8d4b620be2a5c21da0b018f168e36a44f85802cc50c936ba5 constify-format-strings.patch
|
||||
62d294f900ba1922119ebc87f97e86b1653647e03576c982011bf4f629332cc703f3994d5cc4b9bf2dac3c18636a61e420000d16cfdc7c284185c9442cce5b64 gpm-include-sysmacros.patch
|
||||
8de69783f14a2f686eb96d91d2761c879367b14f68801283cd415849f05253686cd11170971f21e5ddc932c02b0621d4aa528ff497a69d27daf29debf896f3ea gcc-10.patch
|
||||
|
|
|
|||
120
main/gpm/musl-fixes-2.patch
Normal file
120
main/gpm/musl-fixes-2.patch
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
Patch-Source: https://github.com/telmich/gpm/commit/4a938233fbe6de7af05aabc74891b68d4bae40f8
|
||||
--
|
||||
From 21f4f4aede1cae705fa0c9112ef34afbe38413d2 Mon Sep 17 00:00:00 2001
|
||||
From: Kurt Nalty <46026992+kurtnalty@users.noreply.github.com>
|
||||
Date: Sat, 29 Dec 2018 23:44:24 -0600
|
||||
Subject: [PATCH 1/4] Update gpm.c
|
||||
|
||||
---
|
||||
src/daemon/gpm.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/daemon/gpm.c b/src/daemon/gpm.c
|
||||
index 771da5c..6806dce 100644
|
||||
--- a/src/daemon/gpm.c
|
||||
+++ b/src/daemon/gpm.c
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <signal.h> /* SIGPIPE */
|
||||
#include <time.h> /* time() */
|
||||
#include <sys/param.h>
|
||||
-#include <sys/fcntl.h> /* O_RDONLY */
|
||||
+#include <fcntl.h> /* O_RDONLY */
|
||||
#include <sys/wait.h> /* wait() */
|
||||
#include <sys/stat.h> /* mkdir() */
|
||||
#include <sys/time.h> /* timeval */
|
||||
|
||||
From 2085cab74a0a84df8b965addf007775a7225c9ec Mon Sep 17 00:00:00 2001
|
||||
From: Kurt Nalty <46026992+kurtnalty@users.noreply.github.com>
|
||||
Date: Sat, 29 Dec 2018 23:47:17 -0600
|
||||
Subject: [PATCH 2/4] Add include <string.h>
|
||||
|
||||
Added
|
||||
line 28, #include <string.h> /* strcpy, bzero */
|
||||
for musl compilation
|
||||
---
|
||||
src/daemon/old_main.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/daemon/old_main.c b/src/daemon/old_main.c
|
||||
index 2581e26..ab7a87f 100644
|
||||
--- a/src/daemon/old_main.c
|
||||
+++ b/src/daemon/old_main.c
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <signal.h> /* guess again */
|
||||
#include <errno.h> /* guess again */
|
||||
#include <unistd.h> /* unlink */
|
||||
+#include <string.h> /* strcpy, bzero */
|
||||
#include <sys/stat.h> /* chmod */
|
||||
|
||||
#include <linux/kd.h> /* linux hd* */
|
||||
|
||||
From afe69339e311a498eba4c978a865839f33b66e7a Mon Sep 17 00:00:00 2001
|
||||
From: Kurt Nalty <46026992+kurtnalty@users.noreply.github.com>
|
||||
Date: Sat, 29 Dec 2018 23:52:58 -0600
|
||||
Subject: [PATCH 3/4] Update liblow.c for musl compatible
|
||||
|
||||
Changed #include <sys/fcntl.h> to #include <fcntl.h>
|
||||
Changed SA_NOMASK to SA_NODEFER on lines 176, 367
|
||||
---
|
||||
src/lib/liblow.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/lib/liblow.c b/src/lib/liblow.c
|
||||
index e789d09..8d6ba34 100644
|
||||
--- a/src/lib/liblow.c
|
||||
+++ b/src/lib/liblow.c
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <sys/types.h> /* socket() */
|
||||
#include <sys/socket.h> /* socket() */
|
||||
#include <sys/un.h> /* struct sockaddr_un */
|
||||
-#include <sys/fcntl.h> /* O_RDONLY */
|
||||
+#include <fcntl.h> /* O_RDONLY */
|
||||
#include <sys/stat.h> /* stat() */
|
||||
|
||||
#ifdef SIGTSTP /* true if BSD system */
|
||||
@@ -173,7 +173,7 @@ static void gpm_suspend_hook (int signum)
|
||||
/* Reincarnation. Prepare for another death early. */
|
||||
sigemptyset(&sa.sa_mask);
|
||||
sa.sa_handler = gpm_suspend_hook;
|
||||
- sa.sa_flags = SA_NOMASK;
|
||||
+ sa.sa_flags = SA_NODEFER;
|
||||
sigaction (SIGTSTP, &sa, 0);
|
||||
|
||||
/* Pop the gpm stack by closing the useless connection */
|
||||
@@ -364,7 +364,7 @@ int Gpm_Open(Gpm_Connect *conn, int flag)
|
||||
|
||||
/* if signal was originally ignored, job control is not supported */
|
||||
if (gpm_saved_suspend_hook.sa_handler != SIG_IGN) {
|
||||
- sa.sa_flags = SA_NOMASK;
|
||||
+ sa.sa_flags = SA_NODEFER;
|
||||
sa.sa_handler = gpm_suspend_hook;
|
||||
sigaction(SIGTSTP, &sa, 0);
|
||||
}
|
||||
|
||||
From 668445350055e4bbeec9c15bd4db14a7f07abc45 Mon Sep 17 00:00:00 2001
|
||||
From: Kurt Nalty <46026992+kurtnalty@users.noreply.github.com>
|
||||
Date: Mon, 31 Dec 2018 18:41:19 -0600
|
||||
Subject: [PATCH 4/4] Aligned comments
|
||||
|
||||
---
|
||||
src/lib/liblow.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/lib/liblow.c b/src/lib/liblow.c
|
||||
index 8d6ba34..8b40b71 100644
|
||||
--- a/src/lib/liblow.c
|
||||
+++ b/src/lib/liblow.c
|
||||
@@ -29,11 +29,12 @@
|
||||
#include <string.h> /* strncmp */
|
||||
#include <unistd.h> /* select(); */
|
||||
#include <errno.h>
|
||||
+#include <fcntl.h> /* O_RDONLY */
|
||||
+
|
||||
#include <sys/time.h> /* timeval */
|
||||
#include <sys/types.h> /* socket() */
|
||||
#include <sys/socket.h> /* socket() */
|
||||
#include <sys/un.h> /* struct sockaddr_un */
|
||||
-#include <fcntl.h> /* O_RDONLY */
|
||||
#include <sys/stat.h> /* stat() */
|
||||
|
||||
#ifdef SIGTSTP /* true if BSD system */
|
||||
Loading…
Reference in a new issue