| 1 |
commit: 66edbfc31b168de0d42a813e0c810d558b437a2c |
| 2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 29 17:57:29 2020 +0000 |
| 4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 29 18:26:59 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66edbfc3 |
| 7 |
|
| 8 |
x11-plugins/wmCalClock: fix build with -fno-common |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/706686 |
| 11 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
| 12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
| 13 |
|
| 14 |
.../wmCalClock/files/wmCalClock-1.25-gcc-10.patch | 35 ++++++++++++++++++++++ |
| 15 |
x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild | 7 +++-- |
| 16 |
2 files changed, 40 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-plugins/wmCalClock/files/wmCalClock-1.25-gcc-10.patch b/x11-plugins/wmCalClock/files/wmCalClock-1.25-gcc-10.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..c6a737e6b44 |
| 21 |
--- /dev/null |
| 22 |
+++ b/x11-plugins/wmCalClock/files/wmCalClock-1.25-gcc-10.patch |
| 23 |
@@ -0,0 +1,35 @@ |
| 24 |
+diff -Naur wmCalClock-1.25.orig/Src/xutils.c wmCalClock-1.25/Src/xutils.c |
| 25 |
+--- a/xutils.c 1999-03-27 07:46:38.000000000 +0100 |
| 26 |
++++ b/xutils.c 2020-01-29 18:55:05.062360592 +0100 |
| 27 |
+@@ -52,6 +52,11 @@ |
| 28 |
+ GC NormalGC; |
| 29 |
+ XpmIcon wmgen; |
| 30 |
+ Pixmap pixmask; |
| 31 |
++Display *display; |
| 32 |
++Window Root; |
| 33 |
++Window iconwin, win; |
| 34 |
++int screen; |
| 35 |
++int DisplayDepth; |
| 36 |
+ |
| 37 |
+ |
| 38 |
+ /* |
| 39 |
+diff -Naur wmCalClock-1.25.orig/Src/xutils.h wmCalClock-1.25/Src/xutils.h |
| 40 |
+--- a/xutils.h 1999-03-27 07:46:38.000000000 +0100 |
| 41 |
++++ b/xutils.h 2020-01-29 18:54:54.360359886 +0100 |
| 42 |
+@@ -18,11 +18,11 @@ |
| 43 |
+ /* |
| 44 |
+ * Global variable |
| 45 |
+ */ |
| 46 |
+-Display *display; |
| 47 |
+-Window Root; |
| 48 |
+-Window iconwin, win; |
| 49 |
+-int screen; |
| 50 |
+-int DisplayDepth; |
| 51 |
++extern Display *display; |
| 52 |
++extern Window Root; |
| 53 |
++extern Window iconwin, win; |
| 54 |
++extern int screen; |
| 55 |
++extern int DisplayDepth; |
| 56 |
+ |
| 57 |
+ |
| 58 |
+ |
| 59 |
|
| 60 |
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild |
| 61 |
index 3ace8130324..c7508ab5e8e 100644 |
| 62 |
--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild |
| 63 |
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild |
| 64 |
@@ -1,4 +1,4 @@ |
| 65 |
-# Copyright 1999-2018 Gentoo Authors |
| 66 |
+# Copyright 1999-2020 Gentoo Authors |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
|
| 69 |
EAPI=7 |
| 70 |
@@ -24,7 +24,10 @@ S="${WORKDIR}/${P}/Src" |
| 71 |
|
| 72 |
DOCS=( ../{BUGS,CHANGES,HINTS,README,TODO} ) |
| 73 |
|
| 74 |
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) |
| 75 |
+PATCHES=( |
| 76 |
+ "${FILESDIR}"/${P}-makefile.patch |
| 77 |
+ "${FILESDIR}"/${P}-gcc-10.patch |
| 78 |
+ ) |
| 79 |
|
| 80 |
src_compile() { |
| 81 |
emake CC="$(tc-getCC)" LIBDIR="-L/usr/$(get_libdir)/" |
Archives