1 |
commit: d9ae948f79aedcb2f8fffc080afd8f9a67605881 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 2 23:18:32 2020 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 2 23:23:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9ae948f |
7 |
|
8 |
x11-plugins/wmping: fix build with -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/706920 |
11 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
13 |
|
14 |
x11-plugins/wmping/files/wmping-0.2.1-gcc-10.patch | 21 +++++++++++++++++++++ |
15 |
x11-plugins/wmping/wmping-0.2.1-r1.ebuild | 7 +++++-- |
16 |
2 files changed, 26 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/x11-plugins/wmping/files/wmping-0.2.1-gcc-10.patch b/x11-plugins/wmping/files/wmping-0.2.1-gcc-10.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..3ed8b82f29e |
21 |
--- /dev/null |
22 |
+++ b/x11-plugins/wmping/files/wmping-0.2.1-gcc-10.patch |
23 |
@@ -0,0 +1,21 @@ |
24 |
+--- a/wmgeneral.c |
25 |
++++ b/wmgeneral.c |
26 |
+@@ -45,6 +45,7 @@ Window iconwin, win; |
27 |
+ GC NormalGC; |
28 |
+ XpmIcon wmgen; |
29 |
+ Pixmap pixmask; |
30 |
++Display *display; |
31 |
+ |
32 |
+ /*****************/ |
33 |
+ /* Mouse Regions */ |
34 |
+--- a/wmgeneral.h |
35 |
++++ b/wmgeneral.h |
36 |
+@@ -21,7 +21,7 @@ typedef struct { |
37 |
+ /* Global variable */ |
38 |
+ /*******************/ |
39 |
+ |
40 |
+-Display *display; |
41 |
++extern Display *display; |
42 |
+ |
43 |
+ /***********************/ |
44 |
+ /* Function Prototypes */ |
45 |
|
46 |
diff --git a/x11-plugins/wmping/wmping-0.2.1-r1.ebuild b/x11-plugins/wmping/wmping-0.2.1-r1.ebuild |
47 |
index ab211f81e7b..489881f2407 100644 |
48 |
--- a/x11-plugins/wmping/wmping-0.2.1-r1.ebuild |
49 |
+++ b/x11-plugins/wmping/wmping-0.2.1-r1.ebuild |
50 |
@@ -1,4 +1,4 @@ |
51 |
-# Copyright 1999-2018 Gentoo Foundation |
52 |
+# Copyright 1999-2020 Gentoo Authors |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
|
55 |
EAPI=7 |
56 |
@@ -20,7 +20,10 @@ DEPEND="${RDEPEND} |
57 |
x11-libs/libICE |
58 |
x11-libs/libXt" |
59 |
|
60 |
-PATCHES=( "${FILESDIR}"/${P}-format-security.patch ) |
61 |
+PATCHES=( |
62 |
+ "${FILESDIR}"/${P}-format-security.patch |
63 |
+ "${FILESDIR}"/${P}-gcc-10.patch |
64 |
+ ) |
65 |
|
66 |
DOCS=( AUTHORS CHANGES README ) |