From ca6c3228fe0497ccbafef790f2a60b9d5aadff1a Mon Sep 17 00:00:00 2001 From: Jakov Smolic Date: Fri, 27 Nov 2020 18:36:43 +0100 Subject: x11-plugins/gkrellmss: fix build with gcc-10 * Thanks to Jack Ostroff for submitting the original patch Closes: https://bugs.gentoo.org/708804 Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: Jakov Smolic Signed-off-by: David Seifert --- x11-plugins/gkrellmss/files/gkrellmss-2.6-fno-common.patch | 12 ++++++++++++ x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild | 7 +++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 x11-plugins/gkrellmss/files/gkrellmss-2.6-fno-common.patch (limited to 'x11-plugins/gkrellmss') diff --git a/x11-plugins/gkrellmss/files/gkrellmss-2.6-fno-common.patch b/x11-plugins/gkrellmss/files/gkrellmss-2.6-fno-common.patch new file mode 100644 index 000000000000..8cb9c9e21e19 --- /dev/null +++ b/x11-plugins/gkrellmss/files/gkrellmss-2.6-fno-common.patch @@ -0,0 +1,12 @@ +--- a/src/gkrellmss.h ++++ b/src/gkrellmss.h +@@ -212,7 +212,7 @@ + #define DRAW_GRID 1 + + +-SoundMonitor *gkrellmss; ++extern SoundMonitor *gkrellmss; + + + void gkrellmss_add_sound_sources(void); + diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild index 473087da1408..e038708f288a 100644 --- a/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild +++ b/x11-plugins/gkrellmss/gkrellmss-2.6-r4.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=6 @@ -20,7 +20,10 @@ RDEPEND=" sci-libs/fftw:3.0=" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${P}-Respect-LDFLAGS.patch ) +PATCHES=( + "${FILESDIR}"/${P}-Respect-LDFLAGS.patch + "${FILESDIR}"/${P}-fno-common.patch +) PLUGIN_SO=( src/gkrellmss$(get_modname) ) PLUGIN_DOCS=( Themes ) -- cgit v1.2.3-65-gdbad