public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmsysmon/, x11-plugins/wmsysmon/files/
@ 2020-03-01 15:25 Bernard Cafarelli
  0 siblings, 0 replies; only message in thread
From: Bernard Cafarelli @ 2020-03-01 15:25 UTC (permalink / raw
  To: gentoo-commits

commit:     47ccf9e869ba4e2c45d7c97aca8345d7981f341a
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  1 15:05:58 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Mar  1 15:12:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47ccf9e8

x11-plugins/wmsysmon: fix build with -fno-common

Closes: https://bugs.gentoo.org/707178
Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 .../wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch     | 23 ++++++++++++++++++++++
 x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild         |  1 +
 2 files changed, 24 insertions(+)

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
new file mode 100644
index 00000000000..e9477899b1b
--- /dev/null
+++ b/x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch
@@ -0,0 +1,23 @@
+diff -Naur src.orig/wmgeneral.h src/wmgeneral.h
+--- src.orig/wmgeneral.h	2017-12-06 15:00:16.000000000 +0100
++++ src/wmgeneral.h	2020-03-01 16:03:18.293199660 +0100
+@@ -38,7 +38,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
+diff -Naur src.orig/wmsysmon.c src/wmsysmon.c
+--- src.orig/wmsysmon.c	2017-12-06 15:00:16.000000000 +0100
++++ src/wmsysmon.c	2020-03-01 16:03:32.992203044 +0100
+@@ -138,6 +138,7 @@
+ time_t	curtime;
+ time_t	prevtime;
+ 
++Display		*display;
+ 
+ kernel_versions Get_Kernel_version(void);
+ void usage(void);

diff --git a/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
index b01c8bde491..4a1faee41b2 100644
--- a/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
+++ b/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
@@ -18,6 +18,7 @@ DEPEND="x11-libs/libX11
 	x11-libs/libXpm"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
 DOCS=( ../ChangeLog ../README )
 S=${WORKDIR}/${P}/src
 


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2020-03-01 15:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-01 15:25 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmsysmon/, x11-plugins/wmsysmon/files/ Bernard Cafarelli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox