1 |
commit: 4ec16dadd7e0706acc995aaac31525ef4a205e99 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 8 11:27:17 2020 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 8 11:27:32 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ec16dad |
7 |
|
8 |
x11-plugins/wmbiff: fix build with -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/707250 |
11 |
Package-Manager: Portage-2.3.93, Repoman-2.3.20 |
12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
13 |
|
14 |
.../wmbiff/files/wmbiff-0.4.35-fno-common.patch | 24 ++++++++++++++++++++++ |
15 |
x11-plugins/wmbiff/wmbiff-0.4.35.ebuild | 7 +++++-- |
16 |
2 files changed, 29 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..2320f17143d |
21 |
--- /dev/null |
22 |
+++ b/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch |
23 |
@@ -0,0 +1,24 @@ |
24 |
+diff -Naur wmbiff-0.4.35.orig/wmbiff/wmbiff.c wmbiff-0.4.35/wmbiff/wmbiff.c |
25 |
+--- wmbiff-0.4.35.orig/wmbiff/wmbiff.c 2019-07-23 15:58:58.000000000 +0200 |
26 |
++++ wmbiff-0.4.35/wmbiff/wmbiff.c 2020-03-08 12:25:32.766264038 +0100 |
27 |
+@@ -104,6 +104,8 @@ |
28 |
+ |
29 |
+ Cursor busy_cursor, ready_cursor; |
30 |
+ |
31 |
++Display *display; |
32 |
++ |
33 |
+ static __inline /*@out@ */ void * |
34 |
+ malloc_ordie(size_t len) |
35 |
+ { |
36 |
+diff -Naur wmbiff-0.4.35.orig/wmgeneral/wmgeneral.h wmbiff-0.4.35/wmgeneral/wmgeneral.h |
37 |
+--- wmbiff-0.4.35.orig/wmgeneral/wmgeneral.h 2019-07-23 15:57:57.000000000 +0200 |
38 |
++++ wmbiff-0.4.35/wmgeneral/wmgeneral.h 2020-03-08 12:25:16.223256712 +0100 |
39 |
+@@ -36,7 +36,7 @@ |
40 |
+ /* Global variable */ |
41 |
+ /*******************/ |
42 |
+ |
43 |
+-Display *display; |
44 |
++extern Display *display; |
45 |
+ |
46 |
+ /***********************/ |
47 |
+ /* Function Prototypes */ |
48 |
|
49 |
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild |
50 |
index 4c3609d5797..9200caafc51 100644 |
51 |
--- a/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild |
52 |
+++ b/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild |
53 |
@@ -1,4 +1,4 @@ |
54 |
-# Copyright 1999-2019 Gentoo Authors |
55 |
+# Copyright 1999-2020 Gentoo Authors |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
|
58 |
EAPI=7 |
59 |
@@ -25,10 +25,13 @@ DEPEND="${RDEPEND} |
60 |
BDEPEND="virtual/pkgconfig" |
61 |
|
62 |
DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc" |
63 |
+PATCHES=( |
64 |
+ "${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch |
65 |
+ "${FILESDIR}"/${P}-fno-common.patch |
66 |
+ ) |
67 |
|
68 |
src_prepare() { |
69 |
default |
70 |
- eapply "${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch |
71 |
eautoreconf |
72 |
} |