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/wmsysmon/, x11-plugins/wmsysmon/files/
Date: Sun, 01 Mar 2020 15:25:42
Message-Id: 1583075563.47ccf9e869ba4e2c45d7c97aca8345d7981f341a.voyageur@gentoo
1 commit: 47ccf9e869ba4e2c45d7c97aca8345d7981f341a
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 1 15:05:58 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=47ccf9e8
7
8 x11-plugins/wmsysmon: fix build with -fno-common
9
10 Closes: https://bugs.gentoo.org/707178
11 Package-Manager: Portage-2.3.90, Repoman-2.3.20
12 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
13
14 .../wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch | 23 ++++++++++++++++++++++
15 x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild | 1 +
16 2 files changed, 24 insertions(+)
17
18 diff --git a/x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch b/x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch
19 new file mode 100644
20 index 00000000000..e9477899b1b
21 --- /dev/null
22 +++ b/x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch
23 @@ -0,0 +1,23 @@
24 +diff -Naur src.orig/wmgeneral.h src/wmgeneral.h
25 +--- src.orig/wmgeneral.h 2017-12-06 15:00:16.000000000 +0100
26 ++++ src/wmgeneral.h 2020-03-01 16:03:18.293199660 +0100
27 +@@ -38,7 +38,7 @@
28 + /* Global variable */
29 + /*******************/
30 +
31 +-Display *display;
32 ++extern Display *display;
33 +
34 + /***********************/
35 + /* Function Prototypes */
36 +diff -Naur src.orig/wmsysmon.c src/wmsysmon.c
37 +--- src.orig/wmsysmon.c 2017-12-06 15:00:16.000000000 +0100
38 ++++ src/wmsysmon.c 2020-03-01 16:03:32.992203044 +0100
39 +@@ -138,6 +138,7 @@
40 + time_t curtime;
41 + time_t prevtime;
42 +
43 ++Display *display;
44 +
45 + kernel_versions Get_Kernel_version(void);
46 + void usage(void);
47
48 diff --git a/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
49 index b01c8bde491..4a1faee41b2 100644
50 --- a/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
51 +++ b/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
52 @@ -18,6 +18,7 @@ DEPEND="x11-libs/libX11
53 x11-libs/libXpm"
54 RDEPEND="${DEPEND}"
55
56 +PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
57 DOCS=( ../ChangeLog ../README )
58 S=${WORKDIR}/${P}/src