summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2020-01-27 05:27:54 +0100
committerJeroen Roovers <jer@gentoo.org>2020-01-27 05:29:02 +0100
commit4c0a71cc4d4a4ce8b123112c691d7677dee25cf2 (patch)
tree6a5d789c57530eff6d83b9b3853f3df043aacf16
parentx11-misc/xmountains: Fix CFLAGS=-fno-common (diff)
downloadgentoo-4c0a71cc4d4a4ce8b123112c691d7677dee25cf2.tar.gz
gentoo-4c0a71cc4d4a4ce8b123112c691d7677dee25cf2.tar.bz2
gentoo-4c0a71cc4d4a4ce8b123112c691d7677dee25cf2.zip
x11-misc/xmountains: Replace local patch with upstream patch
Upstream commit at https://github.com/spbooth/xmountains/commit/e530b35948da644a190847b2e6ebe08fd38f6d4a Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
-rw-r--r--x11-misc/xmountains/files/xmountains-2.9-global.patch2
-rw-r--r--x11-misc/xmountains/files/xmountains-2.9-string.patch11
2 files changed, 8 insertions, 5 deletions
diff --git a/x11-misc/xmountains/files/xmountains-2.9-global.patch b/x11-misc/xmountains/files/xmountains-2.9-global.patch
index 77ce47ac4eb2..65ef65fa2040 100644
--- a/x11-misc/xmountains/files/xmountains-2.9-global.patch
+++ b/x11-misc/xmountains/files/xmountains-2.9-global.patch
@@ -1,4 +1,4 @@
---- a/Makefile.alt.JeR
+--- a/Makefile.alt
+++ b/Makefile.alt
@@ -8,17 +8,17 @@
diff --git a/x11-misc/xmountains/files/xmountains-2.9-string.patch b/x11-misc/xmountains/files/xmountains-2.9-string.patch
index c78569a2116a..97540b2792e7 100644
--- a/x11-misc/xmountains/files/xmountains-2.9-string.patch
+++ b/x11-misc/xmountains/files/xmountains-2.9-string.patch
@@ -1,8 +1,11 @@
---- a/xmountains.c.JeR
+--- a/xmountains.c
+++ b/xmountains.c
-@@ -1,4 +1,5 @@
+@@ -1,7 +1,7 @@
-+#include <string.h> /* strcmp() */
#include <stdio.h>
#include <stdlib.h>
- #include <strings.h>
+-#include <strings.h>
++#include <string.h>
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <unistd.h>