From: Jeroen Roovers Date: Sat, 1 Feb 2020 14:03:43 +0000 (+0100) Subject: x11-misc/fbpanel: Fix CFLAGS=-fno-common X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9cd2c526d77f0e7a7ab5bb10111b82095f0d0883;p=gentoo.git x11-misc/fbpanel: Fix CFLAGS=-fno-common Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Jeroen Roovers --- diff --git a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild index 9acb74d5c5ff..b468b2a537e8 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 000000000000..aafd8c4cc67b --- /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 + #include "panel.h" + +-struct _plugin_instance *stam; ++extern struct _plugin_instance *stam; + + typedef struct { + /* common */