1 |
commit: 59f3ded139d77e75745a3fd95f9999bdb3668a9c |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 1 15:12:33 2020 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 1 15:12:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59f3ded1 |
7 |
|
8 |
x11-plugins/wmdots: fix build with -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/707532 |
11 |
Package-Manager: Portage-2.3.90, Repoman-2.3.20 |
12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
13 |
|
14 |
.../wmdots/files/wmdots-0.2_beta-gcc-10.patch | 27 ++++++++++++++++++++++ |
15 |
x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild | 4 ++++ |
16 |
2 files changed, 31 insertions(+) |
17 |
|
18 |
diff --git a/x11-plugins/wmdots/files/wmdots-0.2_beta-gcc-10.patch b/x11-plugins/wmdots/files/wmdots-0.2_beta-gcc-10.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..f4e522fe5cf |
21 |
--- /dev/null |
22 |
+++ b/x11-plugins/wmdots/files/wmdots-0.2_beta-gcc-10.patch |
23 |
@@ -0,0 +1,27 @@ |
24 |
+diff -Naur wmdots.orig/wmdots/wmdots.c wmdots/wmdots/wmdots.c |
25 |
+--- wmdots.orig/wmdots/wmdots.c 1999-10-11 21:39:11.000000000 +0200 |
26 |
++++ wmdots/wmdots/wmdots.c 2020-03-01 16:08:39.492275206 +0100 |
27 |
+@@ -315,6 +315,9 @@ |
28 |
+ // 10,30,&y_off,-5,30,10 |
29 |
+ // }; |
30 |
+ |
31 |
++Display *display; |
32 |
++Window Root, iconwin, win; |
33 |
++ |
34 |
+ // ----------------------------------------------------------------------- |
35 |
+ // draw a point at x/y in specified colour |
36 |
+ |
37 |
+diff -Naur wmdots.orig/wmgeneral/wmgeneral.h wmdots/wmgeneral/wmgeneral.h |
38 |
+--- wmdots.orig/wmgeneral/wmgeneral.h 1998-10-16 02:16:59.000000000 +0200 |
39 |
++++ wmdots/wmgeneral/wmgeneral.h 2020-03-01 16:08:45.412276631 +0100 |
40 |
+@@ -36,8 +36,8 @@ |
41 |
+ /* Global variable */ |
42 |
+ /*******************/ |
43 |
+ |
44 |
+-Display *display; |
45 |
+-Window Root, iconwin, win; |
46 |
++extern Display *display; |
47 |
++extern Window Root, iconwin, win; |
48 |
+ |
49 |
+ |
50 |
+ /***********************/ |
51 |
|
52 |
diff --git a/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild |
53 |
index 5aaba6401e1..7c4b91c7072 100644 |
54 |
--- a/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild |
55 |
+++ b/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild |
56 |
@@ -21,6 +21,10 @@ DEPEND="${RDEPEND}" |
57 |
S="${WORKDIR}/${PN}" |
58 |
|
59 |
src_prepare() { |
60 |
+ pushd "${WORKDIR}" || die |
61 |
+ eapply "${FILESDIR}"/${P}-gcc-10.patch |
62 |
+ popd || die |
63 |
+ |
64 |
default |
65 |
eapply "${FILESDIR}"/${P}-stringh.patch |
66 |
sed -e "s|cc|$(tc-getCC)|g" \ |