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

[Miroslav Šulc]

commit:     96720b82caced823b5f52e6fd83d1d088e79854b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 15:51:42 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 15:52:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96720b82

media-sound/guayadeque: bump to 0.4.6 + updated live

1) eapi7
2) dropped media-libs/gnonlin:1.0 dep
3) updated and organized deps
4) fixed metadata installation
5) added xdg

Bug: https://bugs.gentoo.org/724554
Bug: https://bugs.gentoo.org/658636
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/guayadeque/Manifest                    |  1 +
 .../guayadeque/files/guayadeque-0.4.6-gcc10.patch  | 70 ++++++++++++++++++++++
 .../files/guayadeque-0.4.6-metadata.patch          | 13 ++++
 ...yadeque-9999.ebuild => guayadeque-0.4.6.ebuild} | 52 ++++++++--------
 media-sound/guayadeque/guayadeque-9999.ebuild      | 51 +++++++---------
 5 files changed, 131 insertions(+), 56 deletions(-)

diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest
index a1229d29952..0daed0c6708 100644
--- a/media-sound/guayadeque/Manifest
+++ b/media-sound/guayadeque/Manifest
@@ -1 +1,2 @@
 DIST guayadeque-0.4.5_p20170110.tar.gz 2070855 BLAKE2B a8783a61df636e3ddf1473ba20450c89eeb977e06491e840743e7b8a7aa1a7515138ecf8f6c92a27f0c762363ef12c094927192b254ae238196ac6d967fd84d1 SHA512 57215ba47574fba615b33d72f45279c3726035bea38746f7d927a39866fb3fa8a3fb1dbd13fe672c7daba16a2131fbf4b89afed6a3bf8d9a584e5112d926f518
+DIST guayadeque-0.4.6.tar.gz 2074965 BLAKE2B a6076a60f6560f51f1fa1ac7aca0529823d6579726049cfda212ae42e62c6f86ca18e8c06aa60d8e23c8accf51d4363ebe4b69b50ce5224f7db3215c32acf12f SHA512 d353aa492b393a5043cdab2d151d715381c3d9d50cad393ca5687b5c556257641fc2b5eda53772098c8c0621fba88ae693179d07a1085d5b69aab1e5d06459a7

diff --git a/media-sound/guayadeque/files/guayadeque-0.4.6-gcc10.patch b/media-sound/guayadeque/files/guayadeque-0.4.6-gcc10.patch
new file mode 100644
index 00000000000..41529d20c05
--- /dev/null
+++ b/media-sound/guayadeque/files/guayadeque-0.4.6-gcc10.patch
@@ -0,0 +1,70 @@
+From 6be35ba2153f1c36400b8c535d8ba49292a1f51e Mon Sep 17 00:00:00 2001
+From: Juan Rios <anonbeat@×××××.com>
+Date: Wed, 20 May 2020 05:23:22 +0100
+Subject: [PATCH] Fix compilation with gcc and fix some warnings with wxString
+ Trim
+
+---
+ src/ui/jamendo/Jamendo.cpp                    | 5 ++---
+ src/ui/mediaviewer/playlists/PlayListFile.cpp | 4 ++--
+ src/ui/podcasts/PodcastsPanel.cpp             | 2 +-
+ 3 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/ui/jamendo/Jamendo.cpp b/src/ui/jamendo/Jamendo.cpp
+index 8725bb60..107cadd7 100644
+--- a/src/ui/jamendo/Jamendo.cpp
++++ b/src/ui/jamendo/Jamendo.cpp
+@@ -487,7 +487,7 @@ guJamendoUpdateThread::~guJamendoUpdateThread()
+     }
+ }
+ 
+-#if 0
++/*
+ <JamendoData epoch="1282819258" documentation="http://developer.jamendo.com/en/wiki/DatabaseDumps" type="artistalbumtrack">
+ <Artists>
+     <artist>
+@@ -538,8 +538,7 @@ guJamendoUpdateThread::~guJamendoUpdateThread()
+     </artist>
+ ...
+ </Artists>
+-#endif
+-
++*/
+ 
+ // -------------------------------------------------------------------------------- //
+ void ReadJamendoXmlTrack( wxXmlNode * xmlnode, guJamendoUpdateThread * thread, guTrack * track )
+diff --git a/src/ui/mediaviewer/playlists/PlayListFile.cpp b/src/ui/mediaviewer/playlists/PlayListFile.cpp
+index a7ae4a4d..e038e20b 100644
+--- a/src/ui/mediaviewer/playlists/PlayListFile.cpp
++++ b/src/ui/mediaviewer/playlists/PlayListFile.cpp
+@@ -287,7 +287,7 @@ bool guPlaylistFile::ReadM3uStream( wxInputStream &playlist, const wxString &pat
+         int Count = Lines.Count();
+         for( Index = 0; Index < Count; Index++ )
+         {
+-            Lines[ Index ].Trim( wxString::both );
++            Lines[ Index ].Trim( false ).Trim( true );
+             if( Lines[ Index ].IsEmpty() || ( Lines[ Index ].Find( wxT( "#EXTM3U" ) ) != wxNOT_FOUND ) )
+             {
+                 continue;
+@@ -676,7 +676,7 @@ bool guCuePlaylistFile::LoadFromText( const wxString &content )
+         int Count = Lines.Count();
+         for( Index = 0; Index < Count; Index++ )
+         {
+-            Lines[ Index ].Trim( wxString::both );
++            Lines[ Index ].Trim( false ).Trim( true );
+             wxString Line = Lines[ Index ];
+             //guLogMessage( wxT( "'%s'" ), Line.c_str() );
+             wxArrayString Keys = wxStringTokenize( Line, wxT( " " ) );
+diff --git a/src/ui/podcasts/PodcastsPanel.cpp b/src/ui/podcasts/PodcastsPanel.cpp
+index b715bd29..f242608d 100644
+--- a/src/ui/podcasts/PodcastsPanel.cpp
++++ b/src/ui/podcasts/PodcastsPanel.cpp
+@@ -1193,7 +1193,7 @@ void guPodcastPanel::AddChannel( wxCommandEvent &event )
+         wxSetCursor( * wxHOURGLASS_CURSOR );
+         wxTheApp->Yield();
+ 
+-        wxString PodcastUrl = NewPodcastChannel->GetValue().Trim( wxString::both );
++        wxString PodcastUrl = NewPodcastChannel->GetValue().Trim( false ).Trim( true );
+         if( !PodcastUrl.IsEmpty() )
+         {
+             // If we find an itunes link we replace the itpc to the standard http

diff --git a/media-sound/guayadeque/files/guayadeque-0.4.6-metadata.patch b/media-sound/guayadeque/files/guayadeque-0.4.6-metadata.patch
new file mode 100644
index 00000000000..b35be4f133f
--- /dev/null
+++ b/media-sound/guayadeque/files/guayadeque-0.4.6-metadata.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e46d921..40e640e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -158,7 +158,7 @@ ADD_SUBDIRECTORY( po )
+ # freedesktop.org-specific files
+ INSTALL( FILES defconfig/guayadeque.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications )
+ INSTALL( FILES defconfig/guayadeque.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps )
+-INSTALL( FILES defconfig/guayadeque.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata )
++INSTALL( FILES defconfig/guayadeque.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metadata )
+ 
+ # program-specific files
+ INSTALL( FILES defconfig/guayadeque.default.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/guayadeque )

diff --git a/media-sound/guayadeque/guayadeque-9999.ebuild b/media-sound/guayadeque/guayadeque-0.4.6.ebuild
similarity index 77%
copy from media-sound/guayadeque/guayadeque-9999.ebuild
copy to media-sound/guayadeque/guayadeque-0.4.6.ebuild
index eea72853844..d9bb5a09547 100644
--- a/media-sound/guayadeque/guayadeque-9999.ebuild
+++ b/media-sound/guayadeque/guayadeque-0.4.6.ebuild
@@ -1,37 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER=3.0
 
+inherit cmake wxwidgets xdg
+
 if [[ ${PV} == *9999 ]]; then
-	SCM="git-r3"
+	inherit git-r3
 	EGIT_REPO_URI=${EGIT_REPO_URI:-https://github.com/anonbeat/guayadeque}
 	EGIT_BRANCH=${EGIT_BRANCH:-master}
+else
+	SRC_URI="https://github.com/anonbeat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-inherit cmake-utils vcs-snapshot wxwidgets $SCM
-
 DESCRIPTION="Music management program designed for all music enthusiasts"
 HOMEPAGE="https://guayadeque.org/"
-if [[ ${PV} != *9999 ]]; then
-	COMMIT=...
-	SRC_URI="https://github.com/anonbeat/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	KEYWORDS=""
-fi
 
 LICENSE="GPL-3+"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="appindicator ipod +minimal"
 
 # No test available, Making src_test fail
 RESTRICT="test"
 
 GST_DEPS="
-	media-libs/gnonlin:1.0
 	media-plugins/gst-plugins-libav:1.0
 	media-plugins/gst-plugins-libnice:1.0
 	media-plugins/gst-plugins-pulse:1.0
@@ -39,25 +34,32 @@ GST_DEPS="
 	media-libs/gst-plugins-bad:1.0
 	media-libs/gst-plugins-ugly:1.0
 "
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 RDEPEND="
 	dev-db/sqlite:3
-	>=dev-db/wxsqlite3-3.2.1
+	dev-db/wxsqlite3
 	dev-libs/glib:2
 	media-libs/flac
 	media-libs/gst-plugins-base:1.0
 	media-libs/gst-plugins-good:1.0
 	media-libs/gstreamer:1.0
-	>=media-libs/taglib-1.6.4
+	media-libs/taglib
 	net-misc/curl
 	sys-apps/dbus
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	appindicator? ( >=dev-libs/libindicate-0.7 )
 	ipod? ( media-libs/libgpod )
 	!minimal? ( ${GST_DEPS} )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/gettext
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.5_p20170110-missing-aui-component.patch"
+	"${FILESDIR}/${P}-gcc10.patch"
+	"${FILESDIR}/${P}-metadata.patch"
+)
 
 # echo $(cat po/CMakeLists.txt | grep ADD_SUBDIRECTORY | sed 's#ADD_SUBDIRECTORY( \(\w\+\) )#\1#')
 LANGS=( bg ca_ES cs de el es fr hr hu is it ja nb nl pl pt pt_BR ru sk sr sr@latin sv th tr uk )
@@ -66,16 +68,8 @@ pkg_setup() {
 	setup-wxwidgets
 }
 
-src_unpack() {
-	if [[ ${PV} = *9999 ]]; then
-		git-r3_src_unpack
-		#cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-}
-
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# remove bundled libs
 	rm -rf src/wx/wxsql* src/wxsqlite3 || die
@@ -93,7 +87,7 @@ src_configure() {
 		-DENABLE_IPOD=$(usex ipod)
 		-DENABLE_LIBINDICATE=$(usex appindicator)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
@@ -106,4 +100,6 @@ pkg_postinst() {
 			elog "\t ${pkg}"
 		done
 	fi
+
+	xdg_desktop_database_update
 }

diff --git a/media-sound/guayadeque/guayadeque-9999.ebuild b/media-sound/guayadeque/guayadeque-9999.ebuild
index eea72853844..2578fcf2e89 100644
--- a/media-sound/guayadeque/guayadeque-9999.ebuild
+++ b/media-sound/guayadeque/guayadeque-9999.ebuild
@@ -1,27 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER=3.0
 
+inherit cmake wxwidgets xdg
+
 if [[ ${PV} == *9999 ]]; then
-	SCM="git-r3"
+	inherit git-r3
 	EGIT_REPO_URI=${EGIT_REPO_URI:-https://github.com/anonbeat/guayadeque}
 	EGIT_BRANCH=${EGIT_BRANCH:-master}
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/anonbeat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit cmake-utils vcs-snapshot wxwidgets $SCM
-
 DESCRIPTION="Music management program designed for all music enthusiasts"
 HOMEPAGE="https://guayadeque.org/"
-if [[ ${PV} != *9999 ]]; then
-	COMMIT=...
-	SRC_URI="https://github.com/anonbeat/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	KEYWORDS=""
-fi
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -31,7 +28,6 @@ IUSE="appindicator ipod +minimal"
 RESTRICT="test"
 
 GST_DEPS="
-	media-libs/gnonlin:1.0
 	media-plugins/gst-plugins-libav:1.0
 	media-plugins/gst-plugins-libnice:1.0
 	media-plugins/gst-plugins-pulse:1.0
@@ -39,25 +35,30 @@ GST_DEPS="
 	media-libs/gst-plugins-bad:1.0
 	media-libs/gst-plugins-ugly:1.0
 "
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 RDEPEND="
 	dev-db/sqlite:3
-	>=dev-db/wxsqlite3-3.2.1
+	dev-db/wxsqlite3
 	dev-libs/glib:2
 	media-libs/flac
 	media-libs/gst-plugins-base:1.0
 	media-libs/gst-plugins-good:1.0
 	media-libs/gstreamer:1.0
-	>=media-libs/taglib-1.6.4
+	media-libs/taglib
 	net-misc/curl
 	sys-apps/dbus
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	appindicator? ( >=dev-libs/libindicate-0.7 )
 	ipod? ( media-libs/libgpod )
 	!minimal? ( ${GST_DEPS} )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/gettext
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.6-metadata.patch"
+)
 
 # echo $(cat po/CMakeLists.txt | grep ADD_SUBDIRECTORY | sed 's#ADD_SUBDIRECTORY( \(\w\+\) )#\1#')
 LANGS=( bg ca_ES cs de el es fr hr hu is it ja nb nl pl pt pt_BR ru sk sr sr@latin sv th tr uk )
@@ -66,16 +67,8 @@ pkg_setup() {
 	setup-wxwidgets
 }
 
-src_unpack() {
-	if [[ ${PV} = *9999 ]]; then
-		git-r3_src_unpack
-		#cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-}
-
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# remove bundled libs
 	rm -rf src/wx/wxsql* src/wxsqlite3 || die
@@ -93,7 +86,7 @@ src_configure() {
 		-DENABLE_IPOD=$(usex ipod)
 		-DENABLE_LIBINDICATE=$(usex appindicator)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
@@ -106,4 +99,6 @@ pkg_postinst() {
 			elog "\t ${pkg}"
 		done
 	fi
+
+	xdg_desktop_database_update
 }