From d4653056cc74d97f24bef0d56b4ebe11c53c8b76 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Feb 2025 19:24:56 +0000 Subject: gentoo auto-resync : 24:02:2025 - 19:24:56 --- media-sound/yarock/Manifest | 9 ++- .../files/yarock-1.4.0-fix-build-taglib2.patch | 44 ----------- .../files/yarock-1.4.0-taglib2-include.patch | 11 +++ .../yarock/files/yarock-1.5.0-assorted-fixes.patch | 91 ++++++++++++++++++++++ media-sound/yarock/metadata.xml | 5 +- media-sound/yarock/yarock-1.4.0-r4.ebuild | 63 --------------- media-sound/yarock/yarock-1.5.0.ebuild | 55 +++++++++++++ 7 files changed, 166 insertions(+), 112 deletions(-) delete mode 100644 media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch create mode 100644 media-sound/yarock/files/yarock-1.4.0-taglib2-include.patch create mode 100644 media-sound/yarock/files/yarock-1.5.0-assorted-fixes.patch delete mode 100644 media-sound/yarock/yarock-1.4.0-r4.ebuild create mode 100644 media-sound/yarock/yarock-1.5.0.ebuild (limited to 'media-sound/yarock') diff --git a/media-sound/yarock/Manifest b/media-sound/yarock/Manifest index 0a3dfc8922e6..cf16741578d5 100644 --- a/media-sound/yarock/Manifest +++ b/media-sound/yarock/Manifest @@ -1,4 +1,5 @@ -AUX yarock-1.4.0-fix-build-taglib2.patch 1863 BLAKE2B d52fc6407b663d362e516013b3d011e47240bfc3e8856951a9d2ee12864ca4d9ff2d83d100b24b4b3039422da981ba3fa5891abe3edeeff0e0548ae59c205c12 SHA512 71907f11188558935d180661500da26bc9b815330915a50e1929234f194c8200efd15cb516b58442edb173a08e1a797d25eb217ba319425d12fa252109a7eda4 -DIST Yarock_1.4.0_Sources.tar.gz 735399 BLAKE2B e54e995a419e1837b746374d3d7c6655e750d5142cce4d573dc268010b7bcf9da1a15531991769c16693f8b587228da445d4a14a89499600708309876f83bb5f SHA512 39ad470cd53fef738166ca635ca96da0868db406b62be92d276062acc568724a62886b7779eb47fc6a3e6d2825fe417753e9e6b87a978b9009e09d7ea5866f00 -EBUILD yarock-1.4.0-r4.ebuild 1281 BLAKE2B 09d4ee71860e48ac6c78ab651f3d55eb61fd2ec66e345c40aa7d0ef90a6feb58b7f4194c74d94a273b3dccffbd147f4ddfb67deb7d0153c64130ddb7a7c98e15 SHA512 48682ff3113006065854d36db3b942769c169d1ae12d0b778e833b34bd2da5df0739c3139ede4d1ccde2d627903ff4384909d68f60946838edb9d0010204f13b -MISC metadata.xml 478 BLAKE2B 61705b6938687fabef20be9ca0733531a8e50dc2a1853e27c62e695ac2a506a3f8b6d456aa21b428544bd31a1c7346317f5905bfa4188c63755e2aad3d5864b6 SHA512 3afed127784c1f952f2c49dd80c527a5816e080f3b1edb83575e4fd325221512c1a5767eb3a0f331db3eaf1c51268d577d8c0524afffa9c2814714aeeb12e1a3 +AUX yarock-1.4.0-taglib2-include.patch 346 BLAKE2B 20768b192668d6581eeb6f51ca1a85981333cd6089864bec1332f63dd31ed3029ded246f7f2818c2bd3714c650aa4664a15a74830f22f4726f62da9356724def SHA512 5a2d1fabdb0ee9ac4c353834234ca187e947a9c6a071778b87f7f35bedcfe7bf1195ed62b6f1818bd2500f542552dde77f2d98e480466df6c7d7d923cdea5206 +AUX yarock-1.5.0-assorted-fixes.patch 3890 BLAKE2B f641709692ecf7a067d0cb5d4f76a6ca0b5a1dc3b26f8502d67f7a330f5b21968a2921e546f98ef8227f2b8e29e055ad53d5ccf70554e283d9114f98e9094c4f SHA512 db9404d4c8494f77377030c91bcf91782a1be65a09f10f73d761c6f543054e66eb43a4c54e664db39e80dd5bb1fadd5b2f824faf583651e0de0556c23064797e +DIST yarock-1.5.0.tar.gz 1134974 BLAKE2B 802e99f664a29a4879ecc820a6421284e9b28ead82e9a517a974db5818523e53b22d7fbf73b6bcdd88b7f0b5b55aad1f001fd4102e69532ce2c4ef23b8c7ad2a SHA512 f56dacbfe15117c3ca4c3ad52394e6d4832410a8e6c71b9247d6b9449fec00b3aae6daede2562f4b8cd96f26c574c1a98b62b68457fc4c3a5f95f7f602b53e1f +EBUILD yarock-1.5.0.ebuild 1245 BLAKE2B fd6831876dfe153e78db3a68edc45e24880957082f0d0575104364f5ae142c80cff689f43024e75a7afe3c33e953ccd899d62dbb73229787b2fc87c4ba06e43a SHA512 da1a04466ac4c32efc3748dfe08770ccbcb9171ddb12740b691edd12ce8359337624ad3d80128e702c47b74d2baf36393b4933665a9007bca1ac757fe74e74d9 +MISC metadata.xml 544 BLAKE2B ac2092a02f79814e287c33acca047c7269a29e9d1f6eaac1eaec94c16135ef669984f67c84c7cd313d278f64903ee38766939a64a0a02cca3430dfa31c62a800 SHA512 abc359d5c0f7cd2b317caa32c0e9005f74aa79f044f1b98b9a99648e2c67560f5e16167597eb16639b385788cd178c72bdef41f6a30a53b8a5e8e8dd3d63ae90 diff --git a/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch b/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch deleted file mode 100644 index d234866ea26d..000000000000 --- a/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://github.com/sebaro/Yarock/commit/3cdc8910a6dec9054913dcdd8e804bb79b53b861.patch ---- a/src/core/mediaitem/tag.cpp -+++ b/src/core/mediaitem/tag.cpp -@@ -28,6 +28,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -289,10 +290,10 @@ - /*----------------------------------------------------------------------------*/ - static void readMP4Tags(TagLib::MP4::Tag *tag, MEDIA::TrackPtr track, QString& s_disc ) - { -- const TagLib::MP4::ItemListMap& items = tag->itemListMap(); -+ const TagLib::MP4::ItemMap& items = tag->itemMap(); - - /* album artists tags */ -- TagLib::MP4::ItemListMap::ConstIterator it = items.find("aART"); -+ TagLib::MP4::ItemMap::ConstIterator it = items.find("aART"); - if ( it != items.end() ) - { - TagLib::StringList album_artists = it->second.toStringList(); -@@ -665,7 +666,7 @@ - else if (TagLib::MP4::File* file = dynamic_cast(fileref.file())) - { - TagLib::MP4::Tag* tag = file->tag(); -- tag->itemListMap()[kMP4_FMPS_Rating_ID] = TagLib::StringList(QStringToTaglibString(QString::number( rating ))); -+ tag->setItem(kMP4_FMPS_Rating_ID, TagLib::StringList(QStringToTaglibString(QString::number( rating )))); - } - else - { -@@ -772,8 +773,8 @@ - if (aac_file) - { - TagLib::MP4::Tag* tag = aac_file->tag(); -- const TagLib::MP4::ItemListMap& items = tag->itemListMap(); -- TagLib::MP4::ItemListMap::ConstIterator it = items.find("covr"); -+ const TagLib::MP4::ItemMap& items = tag->itemMap(); -+ TagLib::MP4::ItemMap::ConstIterator it = items.find("covr"); - if (it != items.end()) - { - const TagLib::MP4::CoverArtList& art_list = it->second.toCoverArtList(); diff --git a/media-sound/yarock/files/yarock-1.4.0-taglib2-include.patch b/media-sound/yarock/files/yarock-1.4.0-taglib2-include.patch new file mode 100644 index 000000000000..3ddf7256a42a --- /dev/null +++ b/media-sound/yarock/files/yarock-1.4.0-taglib2-include.patch @@ -0,0 +1,11 @@ +https://github.com/sebaro/Yarock/issues/1#issuecomment-2402327268 +--- a/src/core/mediaitem/tag.cpp ++++ b/src/core/mediaitem/tag.cpp +@@ -28,6 +28,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/media-sound/yarock/files/yarock-1.5.0-assorted-fixes.patch b/media-sound/yarock/files/yarock-1.5.0-assorted-fixes.patch new file mode 100644 index 000000000000..af061ade0e1e --- /dev/null +++ b/media-sound/yarock/files/yarock-1.5.0-assorted-fixes.patch @@ -0,0 +1,91 @@ +From 71e0b434a9c9eaa4879cd71e203b02dbfde28553 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 23 Feb 2025 18:02:34 +0100 +Subject: [PATCH 1/4] Fix "yarock-player.org" organisation breaking appid, + de-duplicate desktop files + +This (resulting in "org.yarock-player.yarock") did not match both +org.yarock.desktop and yarock.desktop, resulting in the wayland +placeholder icon used instead of Yarock's, among other potential +XDG/DBus adjacent issues. + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 2 +- + src/main.cpp | 4 -- + 2 files changed, 1 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6dd3952..69654c6 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -203,7 +203,7 @@ install(TARGETS yarock DESTINATION ${CMAKE_INSTALL_BIN}) + install(FILES ${YAROCK_QM_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/yarock/translations") + + # -- install destop file +-install(FILES data/org.yarock.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications") ++install(FILES data/yarock.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications") + + # -- install appdata file + install(FILES data/org.yarock.metainfo.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo") +diff --git a/src/main.cpp b/src/main.cpp +index 03eeafa..276d8de 100755 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -24,8 +24,6 @@ int main(int argc, char *argv[]) { + //! core application settings + QCoreApplication::setApplicationName(APP_NAME); + QCoreApplication::setApplicationVersion(VERSION); +- QCoreApplication::setOrganizationName(ORG_NAME); +- QCoreApplication::setOrganizationDomain("yarock-player.org"); + + //! taken from amarok + // This call is needed to prevent a crash on exit with Phonon-VLC and LibPulse +@@ -40,8 +38,6 @@ int main(int argc, char *argv[]) { + QApplication application(argc, argv); + application.setApplicationName(APP_NAME); + application.setApplicationVersion(VERSION); +- application.setOrganizationName(ORG_NAME); +- application.setOrganizationDomain("yarock-player.org"); + application.setAttribute(Qt::AA_DontShowIconsInMenus, false); + + //! Qt Type registration +-- +2.48.1 + + +From d0b1157c61cfe520d03b656f35ac3c914dbb9f04 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 23 Feb 2025 18:09:11 +0100 +Subject: [PATCH 2/4] Use organisationless metainfo.xml file + +Follow-up to 71e0b434a9c9eaa4879cd71e203b02dbfde28553, incidentally +running dos2unix over it. + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 2 +- + ...arock.metainfo.xml => yarock.metainfo.xml} | 102 +++++++++--------- + 2 files changed, 52 insertions(+), 52 deletions(-) + rename data/{org.yarock.metainfo.xml => yarock.metainfo.xml} (98%) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 69654c6..995c337 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -206,7 +206,7 @@ install(FILES ${YAROCK_QM_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/yaro + install(FILES data/yarock.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications") + + # -- install appdata file +-install(FILES data/org.yarock.metainfo.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo") ++install(FILES data/yarock.metainfo.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo") + + # -- install icons files + install(FILES ${CMAKE_SOURCE_DIR}/icon/yarock_16x16.png DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/apps" RENAME application-x-yarock.png) +diff --git a/data/org.yarock.metainfo.xml b/data/yarock.metainfo.xml +similarity index 98% +rename from data/org.yarock.metainfo.xml +rename to data/yarock.metainfo.xml +index 224713a..3afa371 100755 +-- +2.48.1 diff --git a/media-sound/yarock/metadata.xml b/media-sound/yarock/metadata.xml index d49e848cea41..5f3fecebc200 100644 --- a/media-sound/yarock/metadata.xml +++ b/media-sound/yarock/metadata.xml @@ -5,9 +5,12 @@ asturm@gentoo.org Andreas Sturmlechner + + https://github.com/sebaro/Yarock/issues + sebaro/Yarock + Enable media-video/mpv backend - Enable media-libs/phonon backend Enable media-video/vlc backend diff --git a/media-sound/yarock/yarock-1.4.0-r4.ebuild b/media-sound/yarock/yarock-1.4.0-r4.ebuild deleted file mode 100644 index e12b562a93b8..000000000000 --- a/media-sound/yarock/yarock-1.4.0-r4.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P="Yarock_${PV}_Sources" -inherit cmake - -DESCRIPTION="Qt-based music player" -HOMEPAGE="https://code.launchpad.net/yarock" -SRC_URI="https://launchpad.net/${PN}/1.x/${PV}/+download/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="mpv phonon vlc" - -RDEPEND=" - dev-cpp/htmlcxx - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/taglib:= - x11-libs/libX11 - mpv? ( media-video/mpv:=[libmpv] ) - phonon? ( >=media-libs/phonon-4.12.0[qt5(-)] ) - vlc? ( media-video/vlc:= ) -" -DEPEND="${RDEPEND} - dev-qt/qtconcurrent:5 - dev-qt/qtx11extras:5 -" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -PATCHES=( "${FILESDIR}"/${PN}-1.4.0-fix-build-taglib2.patch ) - -DOCS=( CHANGES.md README.md ) - -src_prepare() { - cmake_src_prepare - sed -e "/^install.*org.yarock.appdata.xml/s:share/appdata:share/metadata:" \ - -i CMakeLists.txt || die - sed -e "/^Version/d" \ - -i data/org.yarock.desktop || die -} - -src_configure() { - local mycmakeargs=( - -DENABLE_QT5=ON - -DENABLE_MPV=$(usex mpv) - -DENABLE_PHONON=$(usex phonon) - -DENABLE_VLC=$(usex vlc) - ) - - cmake_src_configure -} diff --git a/media-sound/yarock/yarock-1.5.0.ebuild b/media-sound/yarock/yarock-1.5.0.ebuild new file mode 100644 index 000000000000..dfe38ca2841b --- /dev/null +++ b/media-sound/yarock/yarock-1.5.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Qt-based music player" +HOMEPAGE="https://github.com/sebaro/Yarock" +SRC_URI="https://github.com/sebaro/Yarock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN^}-${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="mpv vlc" + +RDEPEND=" + dev-cpp/htmlcxx + dev-qt/qtbase:6[dbus,gui,network,sql,sqlite,widgets,xml] + media-libs/taglib:= + x11-libs/libX11 + mpv? ( media-video/mpv:=[libmpv] ) + vlc? ( media-video/vlc:= ) +" +DEPEND="${RDEPEND} + dev-qt/qtbase:6[concurrent] +" +BDEPEND="dev-qt/qttools:6[linguist]" + +DOCS=( CHANGES.md README.md ) + +PATCHES=( + # TODO(?): https://github.com/sebaro/Yarock/issues/1#issuecomment-2398941145 + "${FILESDIR}"/${PN}-1.4.0-taglib2-include.patch + # Pending: https://github.com/sebaro/Yarock/pull/3 + "${FILESDIR}"/${P}-assorted-fixes.patch +) + +src_prepare() { + cmake_src_prepare + sed -e "/^Version/d" \ + -i data/org.yarock.desktop || die + mv data/{org.,}yarock.desktop || die +} + +src_configure() { + local mycmakeargs=( + -DENABLE_PHONON=OFF # questionable benefit over vlc directly + -DENABLE_MPV=$(usex mpv) + -DENABLE_VLC=$(usex vlc) + ) + + cmake_src_configure +} -- cgit v1.2.3