diff --git a/srcpkgs/gpm/patches/musl-fcntl.patch b/srcpkgs/gpm/patches/musl-fcntl.patch deleted file mode 100644 index 3117476f5c8..00000000000 --- a/srcpkgs/gpm/patches/musl-fcntl.patch +++ /dev/null @@ -1,24 +0,0 @@ -The location is wrong, it is just - ---- a/src/lib/liblow.c 2012-10-26 23:21:38.000000000 +0200 -+++ b/src/lib/liblow.c 2015-06-22 15:36:38.956046661 +0200 -@@ -33,7 +33,7 @@ - #include /* socket() */ - #include /* socket() */ - #include /* struct sockaddr_un */ --#include /* O_RDONLY */ -+#include /* O_RDONLY */ - #include /* stat() */ - - #ifdef SIGTSTP /* true if BSD system */ ---- a/src/daemon/gpm.c 2012-10-26 23:21:38.000000000 +0200 -+++ b/src/daemon/gpm.c 2015-06-22 15:44:46.825020280 +0200 -@@ -29,7 +29,7 @@ - #include /* SIGPIPE */ - #include /* time() */ - #include --#include /* O_RDONLY */ -+#include /* O_RDONLY */ - #include /* wait() */ - #include /* mkdir() */ - #include /* timeval */ diff --git a/srcpkgs/gpm/patches/musl-includes.patch b/srcpkgs/gpm/patches/musl-includes.patch new file mode 100644 index 00000000000..3b34bfdb5b9 --- /dev/null +++ b/srcpkgs/gpm/patches/musl-includes.patch @@ -0,0 +1,120 @@ +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 /* SIGPIPE */ + #include /* time() */ + #include +-#include /* O_RDONLY */ ++#include /* O_RDONLY */ + #include /* wait() */ + #include /* mkdir() */ + #include /* 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 + +Added + line 28, #include /* 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 /* guess again */ + #include /* guess again */ + #include /* unlink */ ++#include /* strcpy, bzero */ + #include /* chmod */ + + #include /* 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 to #include +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 /* socket() */ + #include /* socket() */ + #include /* struct sockaddr_un */ +-#include /* O_RDONLY */ ++#include /* O_RDONLY */ + #include /* 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 /* strncmp */ + #include /* select(); */ + #include ++#include /* O_RDONLY */ ++ + #include /* timeval */ + #include /* socket() */ + #include /* socket() */ + #include /* struct sockaddr_un */ +-#include /* O_RDONLY */ + #include /* stat() */ + + #ifdef SIGTSTP /* true if BSD system */ diff --git a/srcpkgs/gpm/template b/srcpkgs/gpm/template index 360f58668c5..fd060bd6c8a 100644 --- a/srcpkgs/gpm/template +++ b/srcpkgs/gpm/template @@ -1,15 +1,15 @@ # Template file for 'gpm' pkgname=gpm version=1.20.7 -revision=10 +revision=11 build_style=gnu-configure hostmakedepends="automake libtool flex texinfo" makedepends="ncurses-devel libfl-devel" short_desc="Mouse server for the console and xterm" maintainer="Orphaned " license="GPL-2.0-or-later" -homepage="http://www.nico.schottelius.org/software/gpm/" -distfiles="http://www.nico.schottelius.org/software/gpm/archives/gpm-${version}.tar.lzma" +homepage="https://www.nico.schottelius.org/software/gpm/" +distfiles="https://www.nico.schottelius.org/software/gpm/archives/gpm-${version}.tar.lzma" checksum=a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c CFLAGS="-fcommon"