1 |
commit: 33bd5a1471ad32f607d7b90a9207de21fd4019f6 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 29 17:47:33 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=33bd5a14 |
7 |
|
8 |
x11-plugins/wmxres: fix build with -fno-common |
9 |
|
10 |
Thanks slyfox for patch |
11 |
|
12 |
Closes: https://bugs.gentoo.org/706444 |
13 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
14 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
15 |
|
16 |
x11-plugins/wmxres/files/wmxres-1.2-gcc-10.patch | 21 +++++++++++++++++++++ |
17 |
x11-plugins/wmxres/wmxres-1.2-r1.ebuild | 3 ++- |
18 |
2 files changed, 23 insertions(+), 1 deletion(-) |
19 |
|
20 |
diff --git a/x11-plugins/wmxres/files/wmxres-1.2-gcc-10.patch b/x11-plugins/wmxres/files/wmxres-1.2-gcc-10.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..5beb4155256 |
23 |
--- /dev/null |
24 |
+++ b/x11-plugins/wmxres/files/wmxres-1.2-gcc-10.patch |
25 |
@@ -0,0 +1,21 @@ |
26 |
+--- a/wmgeneral/wmgeneral.c |
27 |
++++ b/wmgeneral/wmgeneral.c |
28 |
+@@ -45,6 +45,7 @@ Window iconwin, win; |
29 |
+ GC NormalGC; |
30 |
+ XpmIcon wmgen; |
31 |
+ Pixmap pixmask; |
32 |
++Display *display; |
33 |
+ |
34 |
+ /*****************/ |
35 |
+ /* Mouse Regions */ |
36 |
+--- a/wmgeneral/wmgeneral.h |
37 |
++++ b/wmgeneral/wmgeneral.h |
38 |
+@@ -21,7 +21,7 @@ typedef struct { |
39 |
+ /* Global variable */ |
40 |
+ /*******************/ |
41 |
+ |
42 |
+-Display *display; |
43 |
++extern Display *display; |
44 |
+ |
45 |
+ /***********************/ |
46 |
+ /* Function Prototypes */ |
47 |
|
48 |
diff --git a/x11-plugins/wmxres/wmxres-1.2-r1.ebuild b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild |
49 |
index 993a4f040d4..763a7d022d4 100644 |
50 |
--- a/x11-plugins/wmxres/wmxres-1.2-r1.ebuild |
51 |
+++ b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild |
52 |
@@ -1,4 +1,4 @@ |
53 |
-# Copyright 1999-2018 Gentoo Foundation |
54 |
+# Copyright 1999-2020 Gentoo Authors |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
|
57 |
EAPI=7 |
58 |
@@ -25,6 +25,7 @@ S="${WORKDIR}/${PN}.app" |
59 |
PATCHES=( |
60 |
"${FILESDIR}"/${PN}-debian-1.1-1.2.patch |
61 |
"${FILESDIR}"/${PN}-1.2-r1-fix-build-system.patch |
62 |
+ "${FILESDIR}"/${P}-gcc-10.patch |
63 |
) |
64 |
|
65 |
src_configure() { |