[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmxres/files/, x11-plugins/wmxres/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmxres/files/, x11-plugins/wmxres/

[Bernard Cafarelli]

commit:     33bd5a1471ad32f607d7b90a9207de21fd4019f6
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 17:47:33 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 18:26:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33bd5a14

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

Thanks slyfox for patch

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

 x11-plugins/wmxres/files/wmxres-1.2-gcc-10.patch | 21 +++++++++++++++++++++
 x11-plugins/wmxres/wmxres-1.2-r1.ebuild          |  3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/x11-plugins/wmxres/files/wmxres-1.2-gcc-10.patch b/x11-plugins/wmxres/files/wmxres-1.2-gcc-10.patch
new file mode 100644
index 00000000000..5beb4155256
--- /dev/null
+++ b/x11-plugins/wmxres/files/wmxres-1.2-gcc-10.patch
@@ -0,0 +1,21 @@
+--- a/wmgeneral/wmgeneral.c
++++ b/wmgeneral/wmgeneral.c
+@@ -45,6 +45,7 @@ Window		iconwin, win;
+ GC			NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
+ 
+   /*****************/
+  /* Mouse Regions */
+--- a/wmgeneral/wmgeneral.h
++++ b/wmgeneral/wmgeneral.h
+@@ -21,7 +21,7 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */

diff --git a/x11-plugins/wmxres/wmxres-1.2-r1.ebuild b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild
index 993a4f040d4..763a7d022d4 100644
--- a/x11-plugins/wmxres/wmxres-1.2-r1.ebuild
+++ b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,7 @@ S="${WORKDIR}/${PN}.app"
 PATCHES=(
 	"${FILESDIR}"/${PN}-debian-1.1-1.2.patch
 	"${FILESDIR}"/${PN}-1.2-r1-fix-build-system.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
 )
 
 src_configure() {