[packages/cantata] Up to 2.5.0
arekm
arekm at pld-linux.org
Wed May 20 18:41:00 CEST 2026
commit 59ada56698fa24d2770eb9156e4d4cbbd1715464
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed May 20 18:40:32 2026 +0200
Up to 2.5.0
cantata-lrelease.patch | 38 -------------------
cantata.spec | 8 ++--
libdir.patch | 11 ++----
system-qtiocompressor.patch | 92 ++++++++++++++++++++++-----------------------
4 files changed, 53 insertions(+), 96 deletions(-)
---
diff --git a/cantata.spec b/cantata.spec
index fa65eb9..54a264e 100644
--- a/cantata.spec
+++ b/cantata.spec
@@ -9,14 +9,13 @@
Summary: Music Player Daemon (MPD) graphical client
Name: cantata
-Version: 2.4.2
-Release: 2
+Version: 2.5.0
+Release: 1
License: GPL v2+
Group: Applications/Multimedia
# https://github.com/CDrummond/cantata/releases
Source0: https://github.com/CDrummond/cantata/releases/download/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 83b6a2504f1fa40e88d06272aab9f512
-Patch0: %{name}-lrelease.patch
+# Source0-md5: e5b79b7112b7005b14af4e57172ba77e
Patch101: system-qtiocompressor.patch
Patch105: icons_crash.patch
Patch106: libdir.patch
@@ -94,7 +93,6 @@ Features:
%prep
%setup -q
-%patch -P0 -p1
%patch -P101 -p1
rm -rfv 3rdparty/{qjson,qtiocompressor}
diff --git a/cantata-lrelease.patch b/cantata-lrelease.patch
deleted file mode 100644
index 6211adb..0000000
--- a/cantata-lrelease.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6546d9d7f9c2c45e49752a829f0def1930703de0 Mon Sep 17 00:00:00 2001
-From: Jan Palus <atler at pld-linux.org>
-Date: Thu, 21 Jan 2021 20:23:20 +0100
-Subject: [PATCH] Take lrelease path from cmake config instead of relying on
- fixed paths
-
----
- translations/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt
-index e278865c..61ab93cd 100644
---- a/translations/CMakeLists.txt
-+++ b/translations/CMakeLists.txt
-@@ -4,9 +4,9 @@ foreach (TS_FILE ${TS_FILES})
- list(APPEND CANTATA_TRANS "${TRANS}")
- endforeach ()
-
--find_program(LRELEASE_EXECUTABLE lrelease PATHS /usr/lib64/qt5/bin/)
-+find_package(Qt5LinguistTools ${QT_MIN_VERSION} QUIET)
-
--if (LRELEASE_EXECUTABLE)
-+if (Qt5LinguistTools_FOUND)
- set(catalogname cantata)
- add_custom_target(translations ALL)
- foreach(TRANS ${CANTATA_TRANS})
-@@ -14,7 +14,7 @@ if (LRELEASE_EXECUTABLE)
- set(CUR_TS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${TRANS}.ts)
- set(CUR_QM_FILE ${CMAKE_CURRENT_BINARY_DIR}/${TRANS}.qm)
- add_custom_command(TARGET translations
-- COMMAND ${LRELEASE_EXECUTABLE} ARGS ${CUR_TS_FILE} -qm ${CUR_QM_FILE}
-+ COMMAND ${Qt5_LRELEASE_EXECUTABLE} ARGS ${CUR_TS_FILE} -qm ${CUR_QM_FILE}
- DEPENDS ${CUR_TS_FILE})
- if (WIN32)
- install(FILES ${CUR_QM_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/translations/)
---
-2.30.0
-
diff --git a/libdir.patch b/libdir.patch
index 773b68e..5a2730a 100644
--- a/libdir.patch
+++ b/libdir.patch
@@ -1,14 +1,11 @@
---- cantata-1.5.2/CMakeLists.txt 2016-01-11 07:35:12.310535875 +0100
-+++ cantata-2.0.1/CMakeLists.txt 2016-07-12 13:06:24.291313896 +0300
-@@ -146,9 +146,9 @@
+--- cantata-2.5.0.orig2/CMakeLists.txt 2021-10-06 19:18:08.000000000 +0200
++++ cantata-2.5.0.fix/CMakeLists.txt 2026-05-20 18:22:01.794069835 +0200
+@@ -124,7 +124,7 @@
endif ()
if (NOT APPLE AND NOT WIN32)
- if (CANTATA_HELPERS_LIB_DIR AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+ if (CANTATA_HELPERS_LIB_DIR)
set(LINUX_LIB_DIR ${CANTATA_HELPERS_LIB_DIR})
-- else ()
-+ else ()
+ else ()
set(LINUX_LIB_DIR lib)
- endif ()
- endif ()
diff --git a/system-qtiocompressor.patch b/system-qtiocompressor.patch
index 8505683..5d10549 100644
--- a/system-qtiocompressor.patch
+++ b/system-qtiocompressor.patch
@@ -1,10 +1,12 @@
---- cantata-2.0.1/CMakeLists.txt~ 2016-06-03 19:02:23.000000000 +0300
-+++ cantata-2.0.1/CMakeLists.txt 2016-07-12 12:55:20.323365057 +0300
-@@ -827,10 +827,9 @@
- endif (NOT ENABLE_UBUNTU)
+diff -urN cantata-2.5.0.orig/CMakeLists.txt cantata-2.5.0/CMakeLists.txt
+--- cantata-2.5.0.orig/CMakeLists.txt 2021-10-06 19:18:08.000000000 +0200
++++ cantata-2.5.0/CMakeLists.txt 2026-05-20 18:21:40.659621108 +0200
+@@ -540,10 +540,10 @@
+ add_subdirectory(translations)
add_subdirectory(support)
-add_subdirectory(3rdparty/qtiocompressor)
++
add_subdirectory(streams/icons)
add_subdirectory(online/icons)
-target_link_libraries(cantata support-core qtiocompressor ${CANTATA_LIBS} ${QTLIBS} ${ZLIB_LIBRARIES})
@@ -12,9 +14,10 @@
# enable warnings
add_definitions(-DQT_NO_DEBUG_OUTPUT)
---- cantata-2.0.1/context/albumview.cpp 2016-01-08 20:44:35.000000000 +0200
-+++ cantata-2.0.1.headers/context/albumview.cpp 2016-07-12 12:58:27.993149090 +0300
-@@ -27,7 +27,7 @@
+diff -urN cantata-2.5.0.orig/context/albumview.cpp cantata-2.5.0/context/albumview.cpp
+--- cantata-2.5.0.orig/context/albumview.cpp 2022-01-08 22:24:03.000000000 +0100
++++ cantata-2.5.0/context/albumview.cpp 2026-05-20 18:21:40.632708014 +0200
+@@ -26,7 +26,7 @@
#include "gui/covers.h"
#include "network/networkaccessmanager.h"
#include "support/utils.h"
@@ -22,20 +25,22 @@
+#include <QtIOCompressor>
#include "contextengine.h"
#include "widgets/textbrowser.h"
- #include "support/actioncollection.h"
---- cantata-2.0.1/context/artistview.cpp 2016-01-08 20:44:35.000000000 +0200
-+++ cantata-2.0.1.headers/context/artistview.cpp 2016-07-12 12:58:27.993149090 +0300
+ #include "widgets/icons.h"
+diff -urN cantata-2.5.0.orig/context/artistview.cpp cantata-2.5.0/context/artistview.cpp
+--- cantata-2.5.0.orig/context/artistview.cpp 2022-01-08 22:24:03.000000000 +0100
++++ cantata-2.5.0/context/artistview.cpp 2026-05-20 18:21:40.635414108 +0200
@@ -26,7 +26,7 @@
- #include "gui/covers.h"
+ #include "gui/apikeys.h"
#include "support/utils.h"
#include "network/networkaccessmanager.h"
-#include "qtiocompressor/qtiocompressor.h"
+#include <QtIOCompressor>
#include "widgets/textbrowser.h"
+ #include "widgets/icons.h"
#include "contextengine.h"
- #include "support/actioncollection.h"
---- cantata-2.0.1/context/songview.cpp 2016-01-08 20:44:35.000000000 +0200
-+++ cantata-2.0.1.headers/context/songview.cpp 2016-07-12 12:58:27.993149090 +0300
+diff -urN cantata-2.5.0.orig/context/songview.cpp cantata-2.5.0/context/songview.cpp
+--- cantata-2.5.0.orig/context/songview.cpp 2022-01-08 22:24:03.000000000 +0100
++++ cantata-2.5.0/context/songview.cpp 2026-05-20 18:21:40.637695666 +0200
@@ -43,7 +43,7 @@
#include "widgets/textbrowser.h"
#include "gui/stdactions.h"
@@ -45,9 +50,10 @@
#include <QFile>
#include <QDir>
#include <QFileInfo>
---- cantata-2.0.1/context/wikipediasettings.cpp 2016-01-08 20:44:35.000000000 +0200
-+++ cantata-2.0.1.headers/context/wikipediasettings.cpp 2016-07-12 12:58:27.996482597 +0300
-@@ -28,7 +28,7 @@
+diff -urN cantata-2.5.0.orig/context/wikipediasettings.cpp cantata-2.5.0/context/wikipediasettings.cpp
+--- cantata-2.5.0.orig/context/wikipediasettings.cpp 2022-01-08 22:24:03.000000000 +0100
++++ cantata-2.5.0/context/wikipediasettings.cpp 2026-05-20 18:21:40.639973022 +0200
+@@ -27,7 +27,7 @@
#include "support/icon.h"
#include "support/spinner.h"
#include "gui/settings.h"
@@ -56,9 +62,10 @@
#include "support/utils.h"
#include "support/action.h"
#include "support/thread.h"
---- cantata-2.0.1/models/musiclibraryitemroot.cpp 2016-01-08 20:44:37.000000000 +0200
-+++ cantata-2.0.1.headers/models/musiclibraryitemroot.cpp 2016-07-12 12:58:28.003149612 +0300
-@@ -32,7 +32,7 @@
+diff -urN cantata-2.5.0.orig/models/musiclibraryitemroot.cpp cantata-2.5.0/models/musiclibraryitemroot.cpp
+--- cantata-2.5.0.orig/models/musiclibraryitemroot.cpp 2022-01-08 22:24:03.000000000 +0100
++++ cantata-2.5.0/models/musiclibraryitemroot.cpp 2026-05-20 18:21:40.642334271 +0200
+@@ -31,7 +31,7 @@
#include "musiclibrarymodel.h"
#include "mpd-interface/mpdparseutils.h"
#include "mpd-interface/mpdconnection.h"
@@ -67,31 +74,34 @@
#include <QXmlStreamReader>
#include <QXmlStreamWriter>
#include <QFile>
---- cantata-2.0.1/models/streamsmodel.cpp 2016-04-14 23:29:32.000000000 +0300
-+++ cantata-2.0.1.headers/models/streamsmodel.cpp 2016-07-12 12:58:28.006483118 +0300
-@@ -39,7 +39,7 @@
+diff -urN cantata-2.5.0.orig/models/streamsmodel.cpp cantata-2.5.0/models/streamsmodel.cpp
+--- cantata-2.5.0.orig/models/streamsmodel.cpp 2022-01-08 22:24:03.000000000 +0100
++++ cantata-2.5.0/models/streamsmodel.cpp 2026-05-20 18:21:40.644692898 +0200
+@@ -34,7 +34,7 @@
+ #include "support/action.h"
#include "gui/stdactions.h"
#include "support/actioncollection.h"
- #include "digitallyimported.h"
-#include "qtiocompressor/qtiocompressor.h"
+#include <QtIOCompressor>
#include "config.h"
#include "support/globalstatic.h"
#include <QModelIndex>
---- cantata-2.0.1/online/onlinedbservice.cpp 2016-01-29 23:26:44.000000000 +0200
-+++ cantata-2.0.1.headers/online/onlinedbservice.cpp 2016-07-12 12:58:27.999816104 +0300
-@@ -26,7 +26,7 @@
- #include "gui/plurals.h"
+diff -urN cantata-2.5.0.orig/online/onlinedbservice.cpp cantata-2.5.0/online/onlinedbservice.cpp
+--- cantata-2.5.0.orig/online/onlinedbservice.cpp 2022-01-08 22:24:03.000000000 +0100
++++ cantata-2.5.0/online/onlinedbservice.cpp 2026-05-20 18:21:40.647055668 +0200
+@@ -25,7 +25,7 @@
+ #include "gui/covers.h"
#include "models/roles.h"
#include "network/networkaccessmanager.h"
-#include "qtiocompressor/qtiocompressor.h"
+#include <QtIOCompressor>
#include "db/onlinedb.h"
- #include "support/localize.h"
#include <QXmlStreamReader>
---- cantata-2.0.1/online/podcastservice.cpp 2016-01-08 20:44:36.000000000 +0200
-+++ cantata-2.0.1.headers/online/podcastservice.cpp 2016-07-12 12:58:28.003149612 +0300
-@@ -31,7 +31,7 @@
+
+diff -urN cantata-2.5.0.orig/online/podcastservice.cpp cantata-2.5.0/online/podcastservice.cpp
+--- cantata-2.5.0.orig/online/podcastservice.cpp 2022-01-08 22:24:03.000000000 +0100
++++ cantata-2.5.0/online/podcastservice.cpp 2026-05-20 18:21:40.650320301 +0200
+@@ -33,7 +33,7 @@
#include "mpd-interface/mpdconnection.h"
#include "config.h"
#include "http/httpserver.h"
@@ -100,9 +110,10 @@
#include "network/networkaccessmanager.h"
#include "models/roles.h"
#include "models/playqueuemodel.h"
---- cantata-2.0.1/scrobbling/scrobbler.cpp 2016-01-08 20:44:35.000000000 +0200
-+++ cantata-2.0.1.headers/scrobbling/scrobbler.cpp 2016-07-12 12:58:27.999816104 +0300
-@@ -35,7 +35,7 @@
+diff -urN cantata-2.5.0.orig/scrobbling/scrobbler.cpp cantata-2.5.0/scrobbling/scrobbler.cpp
+--- cantata-2.5.0.orig/scrobbling/scrobbler.cpp 2022-01-08 22:24:03.000000000 +0100
++++ cantata-2.5.0/scrobbling/scrobbler.cpp 2026-05-20 18:21:40.652977349 +0200
+@@ -34,7 +34,7 @@
#include "support/globalstatic.h"
#include "support/utils.h"
#include "support/configuration.h"
@@ -111,14 +122,3 @@
#include <QUrl>
#include <QStringList>
#include <QCryptographicHash>
---- cantata-2.0.1/streams/tar.cpp 2016-01-08 20:44:36.000000000 +0200
-+++ cantata-2.0.1.headers/streams/tar.cpp 2016-07-12 12:58:27.999816104 +0300
-@@ -22,7 +22,7 @@
- */
-
- #include "tar.h"
--#include "qtiocompressor/qtiocompressor.h"
-+#include <QtIOCompressor>
-
- Tar::Tar(const QString &fileName)
- : file(fileName)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cantata.git/commitdiff/59ada56698fa24d2770eb9156e4d4cbbd1715464
More information about the pld-cvs-commit
mailing list