1 |
commit: 74c7bfa57715e302930f9c3a9989f312b34ffb79 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 1 15:24:59 2020 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 1 15:24:59 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74c7bfa5 |
7 |
|
8 |
games-puzzle/wmpuzzle: fix build with -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/707160 |
11 |
Package-Manager: Portage-2.3.90, Repoman-2.3.20 |
12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
13 |
|
14 |
.../wmpuzzle/files/wmpuzzle-0.5.2-gcc-10.patch | 24 ++++++++++++++++++++++ |
15 |
games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild | 3 ++- |
16 |
2 files changed, 26 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/games-puzzle/wmpuzzle/files/wmpuzzle-0.5.2-gcc-10.patch b/games-puzzle/wmpuzzle/files/wmpuzzle-0.5.2-gcc-10.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..25b98e1dfc5 |
21 |
--- /dev/null |
22 |
+++ b/games-puzzle/wmpuzzle/files/wmpuzzle-0.5.2-gcc-10.patch |
23 |
@@ -0,0 +1,24 @@ |
24 |
+diff -Naur src.orig/wmgeneral.h src/wmgeneral.h |
25 |
+--- src.orig/wmgeneral.h 2002-10-19 11:33:41.000000000 +0200 |
26 |
++++ src/wmgeneral.h 2020-03-01 16:22:30.891485480 +0100 |
27 |
+@@ -36,7 +36,7 @@ |
28 |
+ /* Global variable */ |
29 |
+ /*******************/ |
30 |
+ |
31 |
+-Display *display; |
32 |
++extern Display *display; |
33 |
+ |
34 |
+ /***********************/ |
35 |
+ /* Function Prototypes */ |
36 |
+diff -Naur src.orig/wmpuzzle.c src/wmpuzzle.c |
37 |
+--- src.orig/wmpuzzle.c 2013-06-27 20:42:26.000000000 +0200 |
38 |
++++ src/wmpuzzle.c 2020-03-01 16:22:28.716484905 +0100 |
39 |
+@@ -41,6 +41,8 @@ |
40 |
+ int blank = 15, |
41 |
+ puzzle[16] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}; |
42 |
+ |
43 |
++Display *display; |
44 |
++ |
45 |
+ int main(int argc, char *argv[]) |
46 |
+ { |
47 |
+ int n, |
48 |
|
49 |
diff --git a/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild b/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild |
50 |
index 314b27ac091..46f9171fc91 100644 |
51 |
--- a/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild |
52 |
+++ b/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild |
53 |
@@ -1,4 +1,4 @@ |
54 |
-# Copyright 1999-2017 Gentoo Foundation |
55 |
+# Copyright 1999-2020 Gentoo Authors |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
|
58 |
EAPI=6 |
59 |
@@ -18,6 +18,7 @@ RDEPEND="x11-libs/libX11 |
60 |
x11-libs/libXpm" |
61 |
DEPEND="${RDEPEND}" |
62 |
|
63 |
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch ) |
64 |
S=${WORKDIR}/${P}/src |
65 |
|
66 |
src_install() { |