1 |
commit: 6706ede2c1adc7783e6ed9c58eb5847b7d00c635 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 30 08:54:48 2020 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 30 08:54:48 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6706ede2 |
7 |
|
8 |
x11-plugins/wmcube: fix build with -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/706892 |
11 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
13 |
|
14 |
x11-plugins/wmcube/files/wmcube-1.0.2-gcc-10.patch | 21 +++++++++++++++++++++ |
15 |
x11-plugins/wmcube/wmcube-1.0.2.ebuild | 9 ++++++++- |
16 |
2 files changed, 29 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/x11-plugins/wmcube/files/wmcube-1.0.2-gcc-10.patch b/x11-plugins/wmcube/files/wmcube-1.0.2-gcc-10.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..5beb4155256 |
21 |
--- /dev/null |
22 |
+++ b/x11-plugins/wmcube/files/wmcube-1.0.2-gcc-10.patch |
23 |
@@ -0,0 +1,21 @@ |
24 |
+--- a/wmgeneral/wmgeneral.c |
25 |
++++ b/wmgeneral/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/wmgeneral.h |
35 |
++++ b/wmgeneral/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/wmcube/wmcube-1.0.2.ebuild b/x11-plugins/wmcube/wmcube-1.0.2.ebuild |
47 |
index cca916b659a..1a9633dc99c 100644 |
48 |
--- a/x11-plugins/wmcube/wmcube-1.0.2.ebuild |
49 |
+++ b/x11-plugins/wmcube/wmcube-1.0.2.ebuild |
50 |
@@ -1,4 +1,4 @@ |
51 |
-# Copyright 1999-2019 Gentoo Authors |
52 |
+# Copyright 1999-2020 Gentoo Authors |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
|
55 |
EAPI=6 |
56 |
@@ -26,6 +26,13 @@ DOCS=( |
57 |
) |
58 |
S="${WORKDIR}/${P}/wmcube" |
59 |
|
60 |
+src_prepare() { |
61 |
+ default |
62 |
+ |
63 |
+ pushd "${WORKDIR}"/${P} || die |
64 |
+ eapply "${FILESDIR}"/${P}-gcc-10.patch |
65 |
+} |
66 |
+ |
67 |
src_compile() { |
68 |
emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" |
69 |
} |