1 |
commit: 0350cf07cd09845a3a6f8675034bac59d178fd67 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 29 11:30:21 2020 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 29 11:35:25 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0350cf07 |
7 |
|
8 |
x11-plugins/wmifinfo: fix build with -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/708034 |
11 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
13 |
|
14 |
.../wmifinfo/files/wmifinfo-0.10-fno-common.patch | 35 ++++++++++++++++++++++ |
15 |
x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild | 4 ++- |
16 |
2 files changed, 38 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/x11-plugins/wmifinfo/files/wmifinfo-0.10-fno-common.patch b/x11-plugins/wmifinfo/files/wmifinfo-0.10-fno-common.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..296c88a3541 |
21 |
--- /dev/null |
22 |
+++ b/x11-plugins/wmifinfo/files/wmifinfo-0.10-fno-common.patch |
23 |
@@ -0,0 +1,35 @@ |
24 |
+diff -Naur dockapps.orig/xutils.c dockapps/xutils.c |
25 |
+--- dockapps.orig/xutils.c 2014-12-09 20:31:13.000000000 +0100 |
26 |
++++ dockapps/xutils.c 2020-03-29 13:29:01.027698381 +0200 |
27 |
+@@ -54,6 +54,11 @@ |
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 |
+diff -Naur dockapps.orig/xutils.h dockapps/xutils.h |
40 |
+--- dockapps.orig/xutils.h 2014-12-09 20:31:13.000000000 +0100 |
41 |
++++ dockapps/xutils.h 2020-03-29 13:29:10.728695410 +0200 |
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/wmifinfo/wmifinfo-0.10-r1.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild |
61 |
index a8cc36e93ef..f02294e77cd 100644 |
62 |
--- a/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild |
63 |
+++ b/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild |
64 |
@@ -1,4 +1,4 @@ |
65 |
-# Copyright 1999-2018 Gentoo Foundation |
66 |
+# Copyright 1999-2020 Gentoo Authors |
67 |
# Distributed under the terms of the GNU General Public License v2 |
68 |
|
69 |
EAPI=7 |
70 |
@@ -18,6 +18,8 @@ RDEPEND="x11-libs/libX11 |
71 |
DEPEND="${RDEPEND} |
72 |
x11-base/xorg-proto" |
73 |
|
74 |
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) |
75 |
+ |
76 |
S="${WORKDIR}/dockapps" |
77 |
|
78 |
src_compile() { |