[gentoo-commits] repo/gentoo:master commit in: media-sound/gnomad/files/, media-sound/gnomad/

[gentoo-commits] repo/gentoo:master commit in: media-sound/gnomad/files/, media-sound/gnomad/

[David Seifert]

commit:     128bd73938541133989777400ec00f2a7d5380dd
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  8 16:53:45 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 16:53:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=128bd739

media-sound/gnomad: Fix building under -fno-common

Closes: https://bugs.gentoo.org/707006
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../gnomad/files/gnomad-2.9.6-fno-common.patch     | 56 ++++++++++++++++++++++
 media-sound/gnomad/gnomad-2.9.6.ebuild             | 15 ++++--
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/media-sound/gnomad/files/gnomad-2.9.6-fno-common.patch b/media-sound/gnomad/files/gnomad-2.9.6-fno-common.patch
new file mode 100644
index 00000000000..76abaa9cfa2
--- /dev/null
+++ b/media-sound/gnomad/files/gnomad-2.9.6-fno-common.patch
@@ -0,0 +1,56 @@
+--- a/src/common.h
++++ b/src/common.h
+@@ -130,25 +130,25 @@
+ } playlist_widgets_t;
+ 
+ /* Globally known widgets */
+-transfer_widgets_t transfer_widgets;
+-data_widgets_t data_widgets;
+-playlist_widgets_t playlist_widgets;
++extern transfer_widgets_t transfer_widgets;
++extern data_widgets_t data_widgets;
++extern playlist_widgets_t playlist_widgets;
+ 
+ /* Global progress bar - not so good but... */
+-GtkWidget *progress_bar;
++extern GtkWidget *progress_bar;
+ 
+ /* Global playlist selection for the popup, not good either ... */
+-GList *jukebox_playlist;
+-GList *selected_target_playlists;
++extern GList *jukebox_playlist;
++extern GList *selected_target_playlists;
+ 
+ /* Global lock variable for the jukebox */
+-gboolean volatile jukebox_locked;
++extern gboolean volatile jukebox_locked;
+ 
+ /* Global cancellation variable for jukebox operations */
+-gboolean volatile cancel_jukebox_operation;
++extern gboolean volatile cancel_jukebox_operation;
+ 
+ /* Global debug level variable (standard = 7) */
+-gint gnomad_debug;
++extern gint gnomad_debug;
+ 
+ /* A proc for hiding dialog windows */
+ GCallback dispose_of_dialog_window(GtkButton * button, gpointer data);
+--- a/src/gnomad2.c
++++ b/src/gnomad2.c
+@@ -34,6 +34,16 @@
+ guint uevent_device_hooked = 0;
+ #endif
+ 
++transfer_widgets_t transfer_widgets;
++data_widgets_t data_widgets;
++playlist_widgets_t playlist_widgets;
++GtkWidget *progress_bar;
++GList *jukebox_playlist;
++GList *selected_target_playlists;
++gboolean volatile jukebox_locked;
++gboolean volatile cancel_jukebox_operation;
++gint gnomad_debug;
++
+ /* This one should be global really */
+ GtkWidget *main_window;
+ 

diff --git a/media-sound/gnomad/gnomad-2.9.6.ebuild b/media-sound/gnomad/gnomad-2.9.6.ebuild
index fb2ee99ca36..45206c12519 100644
--- a/media-sound/gnomad/gnomad-2.9.6.ebuild
+++ b/media-sound/gnomad/gnomad-2.9.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN=${PN}2
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="A GTK+ music manager and swiss army knife for the Portable Digital Entertainment (PDE) protocol"
+DESCRIPTION="A GTK+ music manager for the Portable Digital Entertainment (PDE) protocol"
 HOMEPAGE="http://gnomad2.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
 
@@ -22,12 +22,17 @@ RDEPEND="
 	media-libs/libnjb
 	media-libs/taglib
 	>=x11-libs/gtk+-2.24:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${PN}-2.9.6-fno-common.patch )
 DOCS=( AUTHORS README TODO ) # ChangeLog and NEWS are both outdated
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-sound/gnomad/files/, media-sound/gnomad/

[Sam James]

commit:     8017d7ef4a0ecffb4d179f37d14a8358251567ec
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 03:37:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 03:37:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8017d7ef

media-sound/gnomad: EAPI 8, fix modern C issues

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

 media-sound/gnomad/files/gnomad-2.9.6-c99.patch    | 28 ++++++++++++++++++++++
 ...omad-2.9.6-r1.ebuild => gnomad-2.9.6-r2.ebuild} | 14 +++++++----
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/media-sound/gnomad/files/gnomad-2.9.6-c99.patch b/media-sound/gnomad/files/gnomad-2.9.6-c99.patch
new file mode 100644
index 000000000000..a8fed73b2527
--- /dev/null
+++ b/media-sound/gnomad/files/gnomad-2.9.6-c99.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/875239
+https://bugs.debian.org/1066610
+https://salsa.debian.org/debian/gnomad2/-/blob/debian/2.9.6-9/debian/patches/missing-prototypes.patch
+
+Author: Andreas Beckmann <anbe@debian.org>
+Description: fix building with -Werror=implicit-function-declaration
+
+--- a/src/jukebox.c
++++ b/src/jukebox.c
+@@ -27,6 +27,7 @@
+ #include "filenaming.h"
+ #include "util.h"
+ #include "id3read.h"
++#include "tagfile.h"
+ #include <glib.h>
+ #include <glib/gprintf.h>
+ 
+--- a/src/tagfile.c
++++ b/src/tagfile.c
+@@ -20,6 +20,7 @@ Boston, MA 02111-1307, USA.
+ #include "util.h"
+ #include "filesystem.h"
+ #include <taglib/tag_c.h>
++#include <glib/gprintf.h>
+ 
+ /*****************************************************************************
+  * EXPORTED FUNCTIONS
+

diff --git a/media-sound/gnomad/gnomad-2.9.6-r1.ebuild b/media-sound/gnomad/gnomad-2.9.6-r2.ebuild
similarity index 85%
rename from media-sound/gnomad/gnomad-2.9.6-r1.ebuild
rename to media-sound/gnomad/gnomad-2.9.6-r2.ebuild
index 9b740cadb21a..5c7490e2adeb 100644
--- a/media-sound/gnomad/gnomad-2.9.6-r1.ebuild
+++ b/media-sound/gnomad/gnomad-2.9.6-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit xdg
 
@@ -24,16 +24,22 @@ RDEPEND="
 	media-libs/libmtp:=
 	media-libs/libnjb
 	media-libs/taglib
-	>=x11-libs/gtk+-2.24:2"
+	>=x11-libs/gtk+-2.24:2
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	nls? (
 		dev-util/intltool
 		sys-devel/gettext
-	)"
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.6-fno-common.patch
+	"${FILESDIR}"/${PN}-2.9.6-c99.patch
+)
 
-PATCHES=( "${FILESDIR}"/${PN}-2.9.6-fno-common.patch )
 DOCS=( AUTHORS README TODO ) # ChangeLog and NEWS are both outdated
 
 src_configure() {