[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/files/, x11-misc/fbpanel/

[Jeroen Roovers]

commit:     9cd2c526d77f0e7a7ab5bb10111b82095f0d0883
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  1 14:03:43 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb  1 14:03:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cd2c526

x11-misc/fbpanel: Fix CFLAGS=-fno-common

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/fbpanel/fbpanel-7.0-r1.ebuild              |  3 ++-
 x11-misc/fbpanel/files/fbpanel-7.0-fno-common.patch | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild
index 9acb74d5c5f..b468b2a537e 100644
--- a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild
+++ b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0-clang.patch
 	"${FILESDIR}"/${PN}-7.0-images.patch
 	"${FILESDIR}"/${PN}-7.0-shebangs.patch
+	"${FILESDIR}"/${PN}-7.0-fno-common.patch
 )
 
 src_configure() {

diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-fno-common.patch b/x11-misc/fbpanel/files/fbpanel-7.0-fno-common.patch
new file mode 100644
index 00000000000..aafd8c4cc67
--- /dev/null
+++ b/x11-misc/fbpanel/files/fbpanel-7.0-fno-common.patch
@@ -0,0 +1,21 @@
+--- a/panel/plugin.c
++++ b/panel/plugin.c
+@@ -22,6 +22,7 @@
+ /**************************************************************/
+ static GHashTable *class_ht;
+ 
++struct _plugin_instance *stam;
+ 
+ void
+ class_register(plugin_class *p)
+--- a/panel/plugin.h
++++ b/panel/plugin.h
+@@ -9,7 +9,7 @@
+ #include <stdio.h>
+ #include "panel.h"
+ 
+-struct _plugin_instance *stam;
++extern struct _plugin_instance *stam;
+ 
+ typedef struct {
+     /* common */