| 1 |
commit: cf12d7fd5d98f5209513bcc9b93388e98d785fd5 |
| 2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 2 23:28:08 2020 +0000 |
| 4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 2 23:28:52 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf12d7fd |
| 7 |
|
| 8 |
x11-plugins/wmMatrix: fix build with -fno-common |
| 9 |
|
| 10 |
Thanks jer for patch |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/707970 |
| 13 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
| 14 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
| 15 |
|
| 16 |
.../wmMatrix/files/wmMatrix-0.2-fno-common.patch | 37 ++++++++++++++++++++++ |
| 17 |
x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild | 7 ++-- |
| 18 |
2 files changed, 42 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch b/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..1bb92d66a6c |
| 23 |
--- /dev/null |
| 24 |
+++ b/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch |
| 25 |
@@ -0,0 +1,37 @@ |
| 26 |
+--- a/xutils.h |
| 27 |
++++ b/xutils.h |
| 28 |
+@@ -18,11 +18,11 @@ |
| 29 |
+ /* |
| 30 |
+ * Global variable |
| 31 |
+ */ |
| 32 |
+-Display *display; |
| 33 |
+-Window Root; |
| 34 |
+-Window iconwin, win; |
| 35 |
+-int screen; |
| 36 |
+-int DisplayDepth; |
| 37 |
++extern Display *display; |
| 38 |
++extern Window Root; |
| 39 |
++extern Window iconwin, win; |
| 40 |
++extern int screen; |
| 41 |
++extern int DisplayDepth; |
| 42 |
+ |
| 43 |
+ |
| 44 |
+ |
| 45 |
+--- a/xutils.c |
| 46 |
++++ b/xutils.c |
| 47 |
+@@ -42,6 +42,15 @@ |
| 48 |
+ #include "xutils.h" |
| 49 |
+ |
| 50 |
+ |
| 51 |
++/* |
| 52 |
++ * Global variable |
| 53 |
++ */ |
| 54 |
++Display *display; |
| 55 |
++Window Root; |
| 56 |
++Window iconwin, win; |
| 57 |
++int screen; |
| 58 |
++int DisplayDepth; |
| 59 |
++ |
| 60 |
+ |
| 61 |
+ /* |
| 62 |
+ * X11 Variables |
| 63 |
|
| 64 |
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild |
| 65 |
index e6692825831..5b686f451ee 100644 |
| 66 |
--- a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild |
| 67 |
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild |
| 68 |
@@ -1,4 +1,4 @@ |
| 69 |
-# Copyright 1999-2018 Gentoo Authors |
| 70 |
+# Copyright 1999-2020 Gentoo Authors |
| 71 |
# Distributed under the terms of the GNU General Public License v2 |
| 72 |
|
| 73 |
EAPI=7 |
| 74 |
@@ -22,7 +22,10 @@ LICENSE="GPL-2" |
| 75 |
KEYWORDS="amd64 ppc ppc64 ~sparc x86" |
| 76 |
IUSE="" |
| 77 |
|
| 78 |
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) |
| 79 |
+PATCHES=( |
| 80 |
+ "${FILESDIR}"/${P}-makefile.patch |
| 81 |
+ "${FILESDIR}"/${P}-fno-common.patch |
| 82 |
+ ) |
| 83 |
|
| 84 |
src_compile() { |
| 85 |
# this version is distributed with compiled binaries! |
Archives