Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmwork/files/, x11-plugins/wmwork/
Date: Wed, 29 Jan 2020 18:28:11
Message-Id: 1580322419.ba94180ee142466df4de1c45f9b2f15fe6428b67.voyageur@gentoo
1 commit: ba94180ee142466df4de1c45f9b2f15fe6428b67
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 29 18:00:10 2020 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 29 18:26:59 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba94180e
7
8 x11-plugins/wmwork: fix build with -fno-common
9
10 Closes: https://bugs.gentoo.org/706688
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/wmwork/files/wmwork-0.2.5-gcc-10.patch | 21 +++++++++++++++++++++
15 x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild | 3 ++-
16 2 files changed, 23 insertions(+), 1 deletion(-)
17
18 diff --git a/x11-plugins/wmwork/files/wmwork-0.2.5-gcc-10.patch b/x11-plugins/wmwork/files/wmwork-0.2.5-gcc-10.patch
19 new file mode 100644
20 index 00000000000..3ed8b82f29e
21 --- /dev/null
22 +++ b/x11-plugins/wmwork/files/wmwork-0.2.5-gcc-10.patch
23 @@ -0,0 +1,21 @@
24 +--- a/wmgeneral.c
25 ++++ b/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.h
35 ++++ b/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/wmwork/wmwork-0.2.5-r1.ebuild b/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
47 index a7d81d4d1ae..e8fd4e681e8 100644
48 --- a/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
49 +++ b/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
50 @@ -1,4 +1,4 @@
51 -# Copyright 1999-2018 Gentoo Foundation
52 +# Copyright 1999-2020 Gentoo Authors
53 # Distributed under the terms of the GNU General Public License v2
54
55 EAPI=7
56 @@ -20,3 +20,4 @@ DEPEND="${RDEPEND}
57 S="${WORKDIR}/${P}/src"
58
59 DOCS=( ../{CHANGES,README} )
60 +PATCHES=( ${FILESDIR}/${P}-gcc-10.patch )