gentoo resync : 14.05.2020

3 files changed, 39 insertions, 3 deletions

diff --git a/x11-plugins/wmmp3/Manifest b/x11-plugins/wmmp3/Manifest
index b6b7975922c7..51e0bbe5b1a8 100644
--- a/x11-plugins/wmmp3/Manifest
+++ b/x11-plugins/wmmp3/Manifest
@@ -1,4 +1,5 @@
+AUX wmmp3-0.12-fno-common.patch 884 BLAKE2B 421642a5979b66bbbc133960955b3d9c44cece6a3355bef9a63438179820fe616b9332c0aa42dbfb3083aaa38a8eecbf262950c517969d6b22281ffbd46b9055 SHA512 efd0b0870d6cebbde47b28d9e6ec026eed8d8fc969f40a37450c92da29156dccdb9b49f90a3809f4e2c9a9f4d7d9ae6bf3a6f8899a622c6a058302fdea790200
 AUX wmmp3-0.12-x_includes_n_libraries.patch 581 BLAKE2B 63f7bd5c835a9c63de4c8bd5edbbcf5ee76cb1a7e4e60fa48ee5b0cd86cb966e051966db40022e5656f7a7cea6bf9f2dd972cbdb53d1db0fa2cda587c0ff4b17 SHA512 f3f49b0c2469283401b26c1b5a5436f442d48e9aebf918a5357aaa979378d54d10f634167b6340769a700973a6bda01de1439c55290b33120fd43cb9728b6e5f
 DIST wmmp3-0.12.tar.gz 43977 BLAKE2B bde74194020e65dfea27e94f5a4e937e0811da12c3af28b8d7902c3d08adc27499cd5414ee4826e6f5b25709bf784e6b27d1df07e8079953ec2a602b332b17bf SHA512 6cc06f109d6ab6c69ed3b8175010a2f38053138291f02e59780fc7394c35cc629ddd6b982bd5069e20a3cb81d81b3d08b9e10d1f7984f783f22c9b012c933740
-EBUILD wmmp3-0.12-r1.ebuild 743 BLAKE2B ba5481e3c6159b678f91f751777b237a3594b318051fcce193649c6a34f7325b855961e019d2eda62f6f4eda3af9b9209d7a2988b64ee08887b3c75525269bed SHA512 3380ee2237df5e1cf3a4b08fdc6818e43e04193d20d5120a066f34bcddccd4904c4554fc8c7410557ed72388e4175a0c8643f4dce7b9042a4e6bf16c3dd68315
+EBUILD wmmp3-0.12-r1.ebuild 778 BLAKE2B e64e2ff57e413cfafd25365fe63755ba1a6b944ed809d655f9e8a174ad338693445aece93159255db1ac5ebd5edf94bea9794372aeb9ba74c1da6c8d23db4a2a SHA512 a982464a450d75caba651700234f6e811b819cba884bc8af85a162e71a271aa68a79dba7cc7a0d0d0ffef5c294d606ad3d744b7080a034ca73c22c106e014c03
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmp3/files/wmmp3-0.12-fno-common.patch b/x11-plugins/wmmp3/files/wmmp3-0.12-fno-common.patch
new file mode 100644
index 000000000000..2179b9e30dd2
--- /dev/null
+++ b/x11-plugins/wmmp3/files/wmmp3-0.12-fno-common.patch
@@ -0,0 +1,33 @@
+diff -Naur wmmp3-0.12.orig/wmgeneral.c wmmp3-0.12/wmgeneral.c
+--- wmmp3-0.12.orig/wmgeneral.c	1999-10-08 07:58:16.000000000 +0200
++++ wmmp3-0.12/wmgeneral.c	2020-05-08 19:16:45.911950119 +0200
+@@ -58,6 +58,11 @@
+  /* X11 Variables */
+ /*****************/
+ 
++Display *display;
++Window Root, iconwin, win;
++XpmIcon wmgen;
++XpmIcon wmfont;
++
+ int screen;
+ int x_fd;
+ int d_depth;
+diff -Naur wmmp3-0.12.orig/wmgeneral.h wmmp3-0.12/wmgeneral.h
+--- wmmp3-0.12.orig/wmgeneral.h	1999-10-08 07:58:18.000000000 +0200
++++ wmmp3-0.12/wmgeneral.h	2020-05-08 19:16:53.693959618 +0200
+@@ -41,10 +41,10 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display *display;
+-Window Root, iconwin, win;
+-XpmIcon wmgen;
+-XpmIcon wmfont;
++extern Display *display;
++extern Window Root, iconwin, win;
++extern XpmIcon wmgen;
++extern XpmIcon wmfont;
+ 
+ /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild b/x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild
index 23fc74a48c46..ce5131e34556 100644
--- a/x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild
+++ b/x11-plugins/wmmp3/wmmp3-0.12-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
@@ -19,7 +19,9 @@ DEPEND="${RDEPEND}
 	media-sound/mpg123
 	x11-base/xorg-proto"
 
-PATCHES=( "${FILESDIR}"/${P}-x_includes_n_libraries.patch )
+PATCHES=( "${FILESDIR}"/${P}-x_includes_n_libraries.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
 
 DOCS=( AUTHORS ChangeLog sample.wmmp3 README TODO )