media-sound/yarock: add 1.5.1, drop 1.5.0-r1

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2025-04-09 00:37:02 +02:00
parent 9a447cb56b
commit 7169218038
4 changed files with 1 additions and 117 deletions

View File

@@ -1 +1 @@
DIST yarock-1.5.0.tar.gz 1134974 BLAKE2B 802e99f664a29a4879ecc820a6421284e9b28ead82e9a517a974db5818523e53b22d7fbf73b6bcdd88b7f0b5b55aad1f001fd4102e69532ce2c4ef23b8c7ad2a SHA512 f56dacbfe15117c3ca4c3ad52394e6d4832410a8e6c71b9247d6b9449fec00b3aae6daede2562f4b8cd96f26c574c1a98b62b68457fc4c3a5f95f7f602b53e1f
DIST yarock-1.5.1.tar.gz 1155268 BLAKE2B 70c0eb345cc3a58f3abdcf926fedcf63e704639e915065e967cc813271228da924fdc42a7e586732d65a2633bd5fc5f2e402b0bf9fd7e471581dd367de42dbcf SHA512 a0a10203573cf431a67650ad3dea50921bbe516c8d383c56d96998a041617a18728f71cfd29b1040b2553b10dce18e408dcc8b6adc78a74785dc1e464cf740ab

View File

@@ -1,11 +0,0 @@
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 <taglib/mpegfile.h>
#include <taglib/asffile.h>
+#include <taglib/attachedpictureframe.h>
#include <taglib/vorbisfile.h>
#include <taglib/oggfile.h>
#include <taglib/oggflacfile.h>

View File

@@ -1,91 +0,0 @@
From 71e0b434a9c9eaa4879cd71e203b02dbfde28553 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
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 <asturm@gentoo.org>
---
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 <asturm@gentoo.org>
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 <asturm@gentoo.org>
---
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

View File

@@ -33,20 +33,6 @@ 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