1 |
commit: df47d5f58ec12b03055b520b98d921b1e202618e |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 1 15:20:58 2020 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 1 15:20:58 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df47d5f5 |
7 |
|
8 |
x11-plugins/wmSpaceWeather: fix build with -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/707600 |
11 |
Package-Manager: Portage-2.3.90, Repoman-2.3.20 |
12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
13 |
|
14 |
.../files/wmSpaceWeather-1.04_p19-gcc-10.patch | 23 ++++++++++++++++++++++ |
15 |
.../wmSpaceWeather-1.04_p19-r1.ebuild | 3 ++- |
16 |
2 files changed, 25 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..f95e7e5ccbe |
21 |
--- /dev/null |
22 |
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch |
23 |
@@ -0,0 +1,23 @@ |
24 |
+diff -Naur wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h wmspaceweather-1.04.orig/wmgeneral/wmgeneral.h |
25 |
+--- wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h 1999-04-11 07:35:53.000000000 +0200 |
26 |
++++ wmspaceweather-1.04.orig/wmgeneral/wmgeneral.h 2020-03-01 16:13:29.843346352 +0100 |
27 |
+@@ -28,7 +28,7 @@ |
28 |
+ /* Global variable */ |
29 |
+ /*******************/ |
30 |
+ |
31 |
+-Display *display; |
32 |
++extern Display *display; |
33 |
+ |
34 |
+ /***********************/ |
35 |
+ /* Function Prototypes */ |
36 |
+diff -Naur wmspaceweather-1.04.orig.orig/wmSpaceWeather/wmSpaceWeather.c wmspaceweather-1.04.orig/wmSpaceWeather/wmSpaceWeather.c |
37 |
+--- wmspaceweather-1.04.orig.orig/wmSpaceWeather/wmSpaceWeather.c 1999-04-11 07:35:53.000000000 +0200 |
38 |
++++ wmspaceweather-1.04.orig/wmSpaceWeather/wmSpaceWeather.c 2020-03-01 16:13:38.172348429 +0100 |
39 |
+@@ -91,6 +91,7 @@ |
40 |
+ char URL[1024]; |
41 |
+ int ForceUpdate2; |
42 |
+ |
43 |
++Display *display; |
44 |
+ |
45 |
+ void ParseCMDLine(int argc, char *argv[]); |
46 |
+ void pressEvent(XButtonEvent *xev); |
47 |
|
48 |
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild |
49 |
index 568c3f7524f..9bd5996db7f 100644 |
50 |
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild |
51 |
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild |
52 |
@@ -1,4 +1,4 @@ |
53 |
-# Copyright 1999-2018 Gentoo Authors |
54 |
+# Copyright 1999-2020 Gentoo Authors |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
|
57 |
EAPI=6 |
58 |
@@ -36,6 +36,7 @@ S="${WORKDIR}/${MY_P_ORIG/_/-}/${PN}" |
59 |
src_unpack() { |
60 |
unpack ${MY_P_ORIG}.tar.gz |
61 |
epatch "${DISTDIR}"/${MY_P_PATCH}.gz |
62 |
+ epatch "${FILESDIR}"/${P}-gcc-10.patch |
63 |
|
64 |
# need to apply patches from Debian first, do NOT change the order |
65 |
cd "${S}" || die |