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

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

[David Seifert]

commit:     c73383474e4815b02ca3feea76b35512b88371f3
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 23:48:55 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 23:48:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7338347

media-sound/gimmix: Port to EAPI 7

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/gimmix-0.5.7.2-QA-desktop-file.patch     | 11 ++++++
 media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild        | 40 +++++++++++++---------
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/media-sound/gimmix/files/gimmix-0.5.7.2-QA-desktop-file.patch b/media-sound/gimmix/files/gimmix-0.5.7.2-QA-desktop-file.patch
new file mode 100644
index 00000000000..1a0b3d0105a
--- /dev/null
+++ b/media-sound/gimmix/files/gimmix-0.5.7.2-QA-desktop-file.patch
@@ -0,0 +1,11 @@
+--- a/data/gimmix.desktop
++++ b/data/gimmix.desktop
+@@ -5,6 +5,6 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Icon=gimmix.png
+-Categories=Application;GTK;AudioVideo;
++Icon=gimmix
++Categories=GTK;AudioVideo;
+ MimeType=

diff --git a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
index 0b9ae98c4bb..7d875e3d3fd 100644
--- a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
+++ b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="a graphical music player daemon (MPD) client using GTK+2"
 HOMEPAGE="https://launchpad.net/gimmix"
@@ -13,25 +14,32 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="cover lyrics taglib"
 
-RDEPEND=">=media-libs/libmpd-0.17
-	gnome-base/libglade
+RDEPEND="
+	media-libs/libmpd:=
+	gnome-base/libglade:=
 	x11-libs/gtk+:2
-	cover? ( net-libs/libnxml net-misc/curl )
-	lyrics? ( net-libs/libnxml net-misc/curl )
-	taglib? ( >=media-libs/taglib-1.5 )"
-DEPEND="${RDEPEND}
+	cover? (
+		net-libs/libnxml:=
+		net-misc/curl:=
+	)
+	lyrics? (
+		net-libs/libnxml:=
+		net-misc/curl:=
+	)
+	taglib? ( media-libs/taglib:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	dev-util/intltool"
 
-DOCS=( AUTHORS ChangeLog README TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.7.1-curl-headers.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${PN}-0.5.7.2-QA-desktop-file.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-curl-headers.patch \
-		"${FILESDIR}"/${P}-format-security.patch
-	sed -i -e "/^Icon/s/\.png$//" \
-		-e "/^Categories/s/Application;//" data/gimmix.desktop
-
-	# broken build system in tarball
+	default
 	eautoreconf
 }
 

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

[David Seifert]

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

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

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

 media-sound/gimmix/files/gimmix-0.5.7.2-fno-common.patch | 11 +++++++++++
 media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild              |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/media-sound/gimmix/files/gimmix-0.5.7.2-fno-common.patch b/media-sound/gimmix/files/gimmix-0.5.7.2-fno-common.patch
new file mode 100644
index 00000000000..f9987181bb1
--- /dev/null
+++ b/media-sound/gimmix/files/gimmix-0.5.7.2-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/gimmix-playlist.c
++++ b/src/gimmix-playlist.c
+@@ -60,7 +60,7 @@
+ static gchar *invalid_dir_error = "You have specified an invalid music directory. Do you want to specify the correct music directory now ?";
+ 
+ GtkWidget 	*search_combo;
+-GtkWidget	*search_entry;
++extern GtkWidget	*search_entry;
+ GtkWidget	*search_box;
+ 	
+ static GtkWidget	*gimmix_statusbar;

diff --git a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
index 7d875e3d3fd..94b5fc0b68b 100644
--- a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
+++ b/media-sound/gimmix/gimmix-0.5.7.2-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,8 +34,9 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.5.7.1-curl-headers.patch
-	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${PN}-0.5.7.2-format-security.patch
 	"${FILESDIR}"/${PN}-0.5.7.2-QA-desktop-file.patch
+	"${FILESDIR}"/${PN}-0.5.7.2-fno-common.patch
 )
 
 src_prepare() {