summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolic <jakov.smolic@sartura.hr>2020-11-27 18:36:43 +0100
committerDavid Seifert <soap@gentoo.org>2020-11-27 18:36:43 +0100
commitca6c3228fe0497ccbafef790f2a60b9d5aadff1a (patch)
treee4bd98e7270ba93665b48c6220b95aa8b9bce019
parentdev-util/difffilter: fix build with gcc-10 (diff)
downloadgentoo-ca6c3228fe0497ccbafef790f2a60b9d5aadff1a.tar.gz
gentoo-ca6c3228fe0497ccbafef790f2a60b9d5aadff1a.tar.bz2
gentoo-ca6c3228fe0497ccbafef790f2a60b9d5aadff1a.zip
x11-plugins/gkrellmss: fix build with gcc-10
* Thanks to Jack Ostroff <ostroffjh@users.sourceforge.net> 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 <jakov.smolic@sartura.hr> Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--x11-plugins/gkrellmss/files/gkrellmss-2.6-fno-common.patch12
-rw-r--r--x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild7
2 files changed, 17 insertions, 2 deletions
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 )