[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmss/files/, x11-plugins/gkrellmss/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmss/files/, x11-plugins/gkrellmss/

[David Seifert]

commit:     ca6c3228fe0497ccbafef790f2a60b9d5aadff1a
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Fri Nov 27 17:36:43 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 17:36:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca6c3228

x11-plugins/gkrellmss: fix build with gcc-10

* Thanks to Jack Ostroff <ostroffjh <AT> 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 <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 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(-)

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 00000000000..8cb9c9e21e1
--- /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 473087da140..e038708f288 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 )

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmss/files/, x11-plugins/gkrellmss/

[Sam James]

commit:     88600308428e39956e4ed42d0bc1fc0bab3e0028
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  3 05:01:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 05:10:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88600308

x11-plugins/gkrellmss: scrub patches

Bug: https://bugs.gentoo.org/892251
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch | 6 ------
 x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild                   | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch b/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch
index 59f1d0a200f9..83bcb283ff0e 100644
--- a/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch
+++ b/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch
@@ -3,12 +3,6 @@ From: Jim Ramsay <lack@gentoo.org>
 Date: Wed, 11 Aug 2010 08:37:20 -0400
 Subject: [PATCH] Respect LDFLAGS
 
----
- src/Makefile |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index e618bd4..35a1453 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -78,6 +78,8 @@ LFLAGS = -shared

diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
index 44913edd1d6b..889ef6c0d0f7 100644
--- a/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
+++ b/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit gkrellm-plugin
+inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="A plugin for GKrellM2 that has a VU meter and a sound chart"
 HOMEPAGE="http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html"