mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
media-sound/guayadeque: dropped obsolete 0.4.6
Bug: https://bugs.gentoo.org/902863 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Miroslav Šulc
@@ -1,2 +1 @@
|
||||
DIST guayadeque-0.4.6.tar.gz 2074965 BLAKE2B a6076a60f6560f51f1fa1ac7aca0529823d6579726049cfda212ae42e62c6f86ca18e8c06aa60d8e23c8accf51d4363ebe4b69b50ce5224f7db3215c32acf12f SHA512 d353aa492b393a5043cdab2d151d715381c3d9d50cad393ca5687b5c556257641fc2b5eda53772098c8c0621fba88ae693179d07a1085d5b69aab1e5d06459a7
|
||||
DIST guayadeque-0.4.7.tar.gz 2192075 BLAKE2B b8f78a0667723d8ae27cc13c435f0309a521b10efc440d6cafca08692ef3a79299824d60bcafba3134255d652371f08adec98b1ac63589627c44d2ee8697d443 SHA512 8b620a2a44cc36866c2a2df14fec086796fab9a955429dc58f5689a90634dcc1a96434ab5dff4bbe8c81d785b9e1d8c91011ec076d4e0f5c75f269e9d92bf021
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e46d921..13e4ffa 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -32,7 +32,7 @@ SET( SEARCH_LIBS
|
||||
|
||||
SET( wxWidgets_USE_LIBS base core adv net html xml aui qa )
|
||||
|
||||
-FIND_PACKAGE( wxWidgets )
|
||||
+FIND_PACKAGE( wxWidgets COMPONENTS base core adv net html xml aui qa REQUIRED )
|
||||
|
||||
IF( NOT wxWidgets_FOUND)
|
||||
MESSAGE( FATAL_ERROR "wxWidgets not found!" )
|
||||
@@ -1,70 +0,0 @@
|
||||
From 6be35ba2153f1c36400b8c535d8ba49292a1f51e Mon Sep 17 00:00:00 2001
|
||||
From: Juan Rios <anonbeat@gmail.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
|
||||
@@ -1,5 +1,3 @@
|
||||
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 )
|
||||
|
||||
@@ -1,105 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
WX_GTK_VER=3.0
|
||||
|
||||
inherit cmake wxwidgets xdg
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
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
|
||||
|
||||
DESCRIPTION="Music management program designed for all music enthusiasts"
|
||||
HOMEPAGE="https://guayadeque.org/"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="appindicator ipod +minimal"
|
||||
|
||||
# No test available, Making src_test fail
|
||||
RESTRICT="test"
|
||||
|
||||
GST_DEPS="
|
||||
media-plugins/gst-plugins-libav:1.0
|
||||
media-plugins/gst-plugins-libnice:1.0
|
||||
media-plugins/gst-plugins-pulse:1.0
|
||||
media-plugins/gst-plugins-soup:1.0
|
||||
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
|
||||
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
|
||||
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}"
|
||||
|
||||
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 )
|
||||
|
||||
pkg_setup() {
|
||||
setup-wxwidgets
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
# remove bundled libs
|
||||
rm -rf src/wx/wxsql* src/wxsqlite3 || die
|
||||
|
||||
# comment out unused languages
|
||||
cd po || die
|
||||
local l
|
||||
for l in "${LANGS[@]}"; do
|
||||
! has ${l} ${LINGUAS-${l}} && cmake_comment_add_subdirectory ${l}
|
||||
done
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DENABLE_IPOD=$(usex ipod)
|
||||
-DENABLE_LIBINDICATE=$(usex appindicator)
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use minimal; then
|
||||
elog "If you are missing functionalities consider setting USE=-minimal"
|
||||
elog "or install any of the following packages:"
|
||||
|
||||
local pkg
|
||||
for pkg in ${GST_DEPS}; do
|
||||
elog "\t ${pkg}"
|
||||
done
|
||||
fi
|
||||
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
Reference in New Issue
Block a user