| 1 |
commit: a2f3c2b38d2d8d85e5f2c0a5d781bab0a2046415 |
| 2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 27 10:43:50 2020 +0000 |
| 4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 27 10:44:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2f3c2b3 |
| 7 |
|
| 8 |
x11-plugins/wmmoonclock: fix build with -fno-common |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/707152 |
| 11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/wmmoonclock-1.29-gcc-10.patch | 37 ++++++++++++++++++++++ |
| 15 |
x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild | 4 ++- |
| 16 |
2 files changed, 40 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch b/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..9554254e623 |
| 21 |
--- /dev/null |
| 22 |
+++ b/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch |
| 23 |
@@ -0,0 +1,37 @@ |
| 24 |
+diff -Naur wmmoonclock-1.29.orig/src/xutils.c wmmoonclock-1.29/src/xutils.c |
| 25 |
+--- wmmoonclock-1.29.orig/src/xutils.c 2017-08-15 00:32:44.000000000 +0200 |
| 26 |
++++ wmmoonclock-1.29/src/xutils.c 2020-02-27 11:42:33.266076617 +0100 |
| 27 |
+@@ -52,6 +52,13 @@ |
| 28 |
+ XpmIcon wmgen; |
| 29 |
+ Pixmap pixmask; |
| 30 |
+ |
| 31 |
++Display *display; |
| 32 |
++Window Root; |
| 33 |
++Window iconwin, win; |
| 34 |
++int screen; |
| 35 |
++int DisplayDepth; |
| 36 |
++ |
| 37 |
++ |
| 38 |
+ |
| 39 |
+ |
| 40 |
+ |
| 41 |
+diff -Naur wmmoonclock-1.29.orig/src/xutils.h wmmoonclock-1.29/src/xutils.h |
| 42 |
+--- wmmoonclock-1.29.orig/src/xutils.h 2017-08-15 00:31:51.000000000 +0200 |
| 43 |
++++ wmmoonclock-1.29/src/xutils.h 2020-02-27 11:41:58.180058348 +0100 |
| 44 |
+@@ -20,11 +20,11 @@ |
| 45 |
+ /* |
| 46 |
+ * Global variable |
| 47 |
+ */ |
| 48 |
+-Display *display; |
| 49 |
+-Window Root; |
| 50 |
+-Window iconwin, win; |
| 51 |
+-int screen; |
| 52 |
+-int DisplayDepth; |
| 53 |
++extern Display *display; |
| 54 |
++extern Window Root; |
| 55 |
++extern Window iconwin, win; |
| 56 |
++extern int screen; |
| 57 |
++extern int DisplayDepth; |
| 58 |
+ |
| 59 |
+ |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild |
| 63 |
index 0345f7cf9a5..9530051db95 100644 |
| 64 |
--- a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild |
| 65 |
+++ b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild |
| 66 |
@@ -1,4 +1,4 @@ |
| 67 |
-# Copyright 1999-2019 Gentoo Authors |
| 68 |
+# Copyright 1999-2020 Gentoo Authors |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
EAPI=6 |
| 72 |
@@ -17,3 +17,5 @@ RDEPEND="x11-libs/libX11 |
| 73 |
x11-libs/libXpm" |
| 74 |
DEPEND="${RDEPEND} |
| 75 |
x11-base/xorg-proto" |
| 76 |
+ |
| 77 |
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch ) |
Archives