gentoo resync : 05.02.2020

3 files changed, 44 insertions, 3 deletions

diff --git a/x11-plugins/wmMatrix/Manifest b/x11-plugins/wmMatrix/Manifest
index 5e5aaae21838..c05cdcec3381 100644
--- a/x11-plugins/wmMatrix/Manifest
+++ b/x11-plugins/wmMatrix/Manifest
@@ -1,4 +1,5 @@
+AUX wmMatrix-0.2-fno-common.patch 649 BLAKE2B 0f6e6be7158c25257823177129feeaa363bc6bbb5e832a14d935328409cd59515be2a91b08291e07202e8595815c9ab94685c2d48448ccb9e8fc77601006e44a SHA512 72ec0ff631804b49cc0de2a1506927d9eba6e0d8c6453893786b2665e1e875ef880fc836f9c860f620440fa2288388534dbd5c7bde01703589052ac41bb2359a
 AUX wmMatrix-0.2-makefile.patch 866 BLAKE2B 1c57ef78dc72af8f9ec41830e3109b6958e4d834191134e0d04877d98864d605668d89c894ef1d4360ed7e2eaa98a2666d5fb9b720c77dc40c11881c7165a348 SHA512 1e843e3699c634f9f9f42ba850d0552afddaff45e36e89cd15511cc9c1cb57822d354d8d6bd2d3eb56564c4e225025280ebc8686e48e9e0f70c38e294397d43c
 DIST wmMatrix-0.2.tar.gz 225343 BLAKE2B 4d649ac8e9691a75c7e9a32266074a5624ef83e4f91a6474bfef67df1e3d5b653b63b5909a5bb5460312b36ea661404aa843e2d7ba56a39e43b9a815e734d121 SHA512 4cc65c90e5279645163833f6c8a57bce0d81428c1e5106a98dd74c1b0d693f2dfd3b230e49f9ce710ecc8073477750db94dd9b3c2b96ee026ef0c666f4bc3c4c
-EBUILD wmMatrix-0.2-r2.ebuild 738 BLAKE2B 7f6bb4093bee694a7e3d67d2905459a1ba6d5802edb063766a360c3bbc16fad7108f66b156e3c6c7f5b57beb6ddd510ee44e90053c814e7da41e8cc024559059 SHA512 d57a4a69f31ea15c4a3de95c760507d1508353ee4102c57932f03710333761aa02aab825b94196122efd724fed76b6ec4bfde24ccafb7dff75844bc8cdaf9a48
+EBUILD wmMatrix-0.2-r2.ebuild 777 BLAKE2B 3254804d6b48e0c0ca31eb2c1301f4bcd63736f423a018c19217159b8ca88586bdd3c5a0d2b0bb9e2518b26a16374b752b7c4a0f17d2fda198b10a3d02c7740c SHA512 7345a641467c8756ab15e80517a32ddbeae75f2edd5279a8d9381850d116d5b396a2fde53541b1f61d57228ea6137fc105f11d1fd88b43642028956c204fea1f
 MISC metadata.xml 399 BLAKE2B 6bfd19f3c2d730bf940451fc81183a61fc8ec623a7d50d5873b0209a66a0c529fe1a04e41f87ccb63f3dcf8fd4c53b188fc16c200c2dd11b6be0ec348626d036 SHA512 88cc0fb5ea844bfe955eb9af1d8d10e333ddce44e27bb10d8cc538c2a662b990ec001e25d86475f26720b76eea8fcbd70885593744395f0e99f33ee6352770c3
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
index 000000000000..1bb92d66a6c2
--- /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 e66928258312..5b686f451ee5 100644
--- 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!