Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xmountains/files/
Date: Mon, 27 Jan 2020 04:29:08
Message-Id: 1580099342.4c0a71cc4d4a4ce8b123112c691d7677dee25cf2.jer@gentoo
1 commit: 4c0a71cc4d4a4ce8b123112c691d7677dee25cf2
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 27 04:27:54 2020 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 27 04:29:02 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0a71cc
7
8 x11-misc/xmountains: Replace local patch with upstream patch
9
10 Upstream commit at
11 https://github.com/spbooth/xmountains/commit/e530b35948da644a190847b2e6ebe08fd38f6d4a
12 Package-Manager: Portage-2.3.85, Repoman-2.3.20
13
14 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
15
16 x11-misc/xmountains/files/xmountains-2.9-global.patch | 2 +-
17 x11-misc/xmountains/files/xmountains-2.9-string.patch | 11 +++++++----
18 2 files changed, 8 insertions(+), 5 deletions(-)
19
20 diff --git a/x11-misc/xmountains/files/xmountains-2.9-global.patch b/x11-misc/xmountains/files/xmountains-2.9-global.patch
21 index 77ce47ac4eb..65ef65fa204 100644
22 --- a/x11-misc/xmountains/files/xmountains-2.9-global.patch
23 +++ b/x11-misc/xmountains/files/xmountains-2.9-global.patch
24 @@ -1,4 +1,4 @@
25 ---- a/Makefile.alt.JeR
26 +--- a/Makefile.alt
27 +++ b/Makefile.alt
28 @@ -8,17 +8,17 @@
29
30
31 diff --git a/x11-misc/xmountains/files/xmountains-2.9-string.patch b/x11-misc/xmountains/files/xmountains-2.9-string.patch
32 index c78569a2116..97540b2792e 100644
33 --- a/x11-misc/xmountains/files/xmountains-2.9-string.patch
34 +++ b/x11-misc/xmountains/files/xmountains-2.9-string.patch
35 @@ -1,8 +1,11 @@
36 ---- a/xmountains.c.JeR
37 +--- a/xmountains.c
38 +++ b/xmountains.c
39 -@@ -1,4 +1,5 @@
40 +@@ -1,7 +1,7 @@
41
42 -+#include <string.h> /* strcmp() */
43 #include <stdio.h>
44 #include <stdlib.h>
45 - #include <strings.h>
46 +-#include <strings.h>
47 ++#include <string.h>
48 + #include <signal.h>
49 + #include <sys/types.h>
50 + #include <unistd.h>