From 115dcc7054f5934a2c8e26fd8a8eed5f3e29e9ce Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 28 Mar 2023 09:49:11 +0100 Subject: gentoo auto-resync : 28:03:2023 - 09:49:10 --- media-sound/guayadeque/Manifest | 6 +- ...que-0.4.5_p20170110-missing-aui-component.patch | 13 --- .../guayadeque/files/guayadeque-0.4.6-gcc10.patch | 70 -------------- .../files/guayadeque-0.4.6-metadata.patch | 2 - media-sound/guayadeque/guayadeque-0.4.6.ebuild | 105 --------------------- 5 files changed, 1 insertion(+), 195 deletions(-) delete mode 100644 media-sound/guayadeque/files/guayadeque-0.4.5_p20170110-missing-aui-component.patch delete mode 100644 media-sound/guayadeque/files/guayadeque-0.4.6-gcc10.patch delete mode 100644 media-sound/guayadeque/guayadeque-0.4.6.ebuild (limited to 'media-sound/guayadeque') diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest index 4aa3ca0a1ecf..85181a02d4db 100644 --- a/media-sound/guayadeque/Manifest +++ b/media-sound/guayadeque/Manifest @@ -1,9 +1,5 @@ -AUX guayadeque-0.4.5_p20170110-missing-aui-component.patch 404 BLAKE2B 9c17048796afe328fb136808c2cb88f8f9a7cada5a4f6cd8a01c0a398e8b93cc0d6158792097cf88e600beebd6105bd9036e9aa3ddf8da16878e7d5f82746ea2 SHA512 539fac802c3e91217f4eb6c5adf456f7e5bc2d53e1103cf54255514b0793e3ed17de84048ea31c5a03ea6121fae01ef712339dcc8e269d678e1272f757976029 -AUX guayadeque-0.4.6-gcc10.patch 2981 BLAKE2B a925446bca10a9f96a0babe889d151cc49792810c95295a0c0dc17796744b7486307c354fb47c07518e0f33b41cb8428feb1cc355678c78fb731cecf378c0068 SHA512 a998f055ef831bbd30c624b157de31ad847d3a8f838586e40ba7f978e184eb22914e036fb927794e61b432352d888cf808a90dde2e29458e203297e11079d144 -AUX guayadeque-0.4.6-metadata.patch 716 BLAKE2B 2dfd57e859eebfb174b6e66c3b9f11cad4af49a3ad615f1f6e53d7cd86c4e9851c8d7d78ba47ed1785cd2eab4017bc43720e9b3dbf4990d06165355c505fba32 SHA512 5d3d861eebaa629031de6186846353798b7178801d6b7c07344bf75d952891d17f90237986949bc4b12984b8635ae4d1f9fc8a319d2199bd6f22cc7669dcc564 -DIST guayadeque-0.4.6.tar.gz 2074965 BLAKE2B a6076a60f6560f51f1fa1ac7aca0529823d6579726049cfda212ae42e62c6f86ca18e8c06aa60d8e23c8accf51d4363ebe4b69b50ce5224f7db3215c32acf12f SHA512 d353aa492b393a5043cdab2d151d715381c3d9d50cad393ca5687b5c556257641fc2b5eda53772098c8c0621fba88ae693179d07a1085d5b69aab1e5d06459a7 +AUX guayadeque-0.4.6-metadata.patch 641 BLAKE2B 109212a5f2dd91577436a38ba17675c46e3900749429fef4ab8d9b2ceedae88d471ccdb6487717f4514f9b4b6259c19a22cef1bf59051eec816c8581b9820291 SHA512 62787b7230196949b130497f8f6395fceeb6af5a7893cb1d3efa23538076adec937baca6729798b59b56ec3798a8e5545232d9125906b8d4db24b7a4d1cf00aa DIST guayadeque-0.4.7.tar.gz 2192075 BLAKE2B b8f78a0667723d8ae27cc13c435f0309a521b10efc440d6cafca08692ef3a79299824d60bcafba3134255d652371f08adec98b1ac63589627c44d2ee8697d443 SHA512 8b620a2a44cc36866c2a2df14fec086796fab9a955429dc58f5689a90634dcc1a96434ab5dff4bbe8c81d785b9e1d8c91011ec076d4e0f5c75f269e9d92bf021 -EBUILD guayadeque-0.4.6.ebuild 2356 BLAKE2B b7b8c58c38fad216bd73f236cf7797b49e8ff19b1aedf7291a5ff9a6b8db31dbb5c36153b3c5b86ab1f42ac3a8e83968d95b572325d5e9395c16986c3b62c9d7 SHA512 c0b9aef324c9e370e5262c1ba8e0c3efa08c103eeec067bda9dbb69e4cf33794c6fbb6ff931423c5b9e6f30875a8e3cb17ca3df800cbb0b618eaab14de1ec266 EBUILD guayadeque-0.4.7.ebuild 2266 BLAKE2B 3845013ddb1f1d450c93f78766d635f6b5f4afc29f3a504327eec305173b35da4d471853843c14592dbacaeb8a83bff880cb2fa8549552e6c1d36d6269797293 SHA512 fb655713449f216eb27e3f8dec5f9899d1092e6e6e5742084a58e7dfc28f021023324daee9f6dc3d004159c913587255cba4d3b64a13b539abcaabd526c50e3a EBUILD guayadeque-9999.ebuild 2268 BLAKE2B 89f0f88f01a37f48eef9c9d0a5078f5fe7583e8cf4e2a844eb310f7b67b1214b16a7645faec1b31237cd4e6ab8c450f83bd4d4e2eec62f61be815035941ee99b SHA512 31ab57af134af8eaab048c9b264efd84dde12f24fed61c95bcfa1107f721e24b9e54a1a0ac1e7b5b3e400354d0d72b2226b70db96ab0a19dbb6a93960d1d9148 MISC metadata.xml 411 BLAKE2B 0a0ae74c6c50b622dbfd6d66a2bbe343c94471454d1be0ac6130f32deb17e944a8f322bf018af67ebbd8e5ef5a51b9b9a1062d5bd0e11ede1f5c4f3470c5e8da SHA512 3de001e7dd97fcdb2627f3305e55d1f5737670a3aabd5f0269c541d9d8f4c1c3e0e4dba60ddb689240f9e40cc2d08530ed56c9e18eb7499b3b003c33538c49d5 diff --git a/media-sound/guayadeque/files/guayadeque-0.4.5_p20170110-missing-aui-component.patch b/media-sound/guayadeque/files/guayadeque-0.4.5_p20170110-missing-aui-component.patch deleted file mode 100644 index 69a6e8b673a8..000000000000 --- a/media-sound/guayadeque/files/guayadeque-0.4.5_p20170110-missing-aui-component.patch +++ /dev/null @@ -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!" ) diff --git a/media-sound/guayadeque/files/guayadeque-0.4.6-gcc10.patch b/media-sound/guayadeque/files/guayadeque-0.4.6-gcc10.patch deleted file mode 100644 index 41529d20c051..000000000000 --- a/media-sound/guayadeque/files/guayadeque-0.4.6-gcc10.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 6be35ba2153f1c36400b8c535d8ba49292a1f51e Mon Sep 17 00:00:00 2001 -From: Juan Rios -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 -+/* - - - -@@ -538,8 +538,7 @@ guJamendoUpdateThread::~guJamendoUpdateThread() - - ... - --#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 index b35be4f133fa..f6d81a110d79 100644 --- a/media-sound/guayadeque/files/guayadeque-0.4.6-metadata.patch +++ b/media-sound/guayadeque/files/guayadeque-0.4.6-metadata.patch @@ -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 ) diff --git a/media-sound/guayadeque/guayadeque-0.4.6.ebuild b/media-sound/guayadeque/guayadeque-0.4.6.ebuild deleted file mode 100644 index 02eecd472933..000000000000 --- a/media-sound/guayadeque/guayadeque-0.4.6.ebuild +++ /dev/null @@ -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 -} -- cgit v1.2.3