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

Thanks jer for patch

Closes: https://bugs.gentoo.org/707970
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>

diff --git a/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch b/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch
new file mode 100644 (file)
index 0000000..1bb92d6
--- /dev/null
+++ b/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch
@@ -0,0 +1,37 @@
+--- a/xutils.h
++++ b/xutils.h
+@@ -18,11 +18,11 @@
+ /*
+  *   Global variable
+  */
+-Display               *display;
+-Window          Root;
+-Window          iconwin, win;
+-int             screen; 
+-int             DisplayDepth;
++extern Display                *display;
++extern Window          Root;
++extern Window          iconwin, win;
++extern int             screen; 
++extern int             DisplayDepth;
+ 
+ 
+ 
+--- a/xutils.c
++++ b/xutils.c
+@@ -42,6 +42,15 @@
+ #include "xutils.h"
+ 
+ 
++/*
++ *   Global variable
++ */
++Display               *display;
++Window          Root;
++Window          iconwin, win;
++int             screen; 
++int             DisplayDepth;
++
+ 
+ /*
+  *   X11 Variables 

diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
index e669282583126198f48c79635f1c368ca4f80ea3..5b686f451ee5a9ec4789b4e4c358c99ff3d1d3e6 100644 (file)
--- a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,10 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+PATCHES=(
+       "${FILESDIR}"/${P}-makefile.patch
+       "${FILESDIR}"/${P}-fno-common.patch
+       )
 
 src_compile() {
        # this version is distributed with compiled binaries!