[packages/cantata] up to 2.4.1

Mon Mar 2 00:36:13 CET 2020

commit e3d58df8504c45e9af261840d1eeaec9478510cd
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Mar 2 00:34:37 2020 +0100

    up to 2.4.1

 cantata.spec                | 32 +++++++++++++++++---------------
 libdir.patch                | 17 +++++++----------
 libsolid_static.patch       | 13 -------------
 system-qtiocompressor.patch |  4 ++--
 system-qxt.patch            | 24 ------------------------
 5 files changed, 26 insertions(+), 64 deletions(-)
---

diff --git a/cantata.spec b/cantata.spec
index 250c689..4cdcb85 100644
--- a/cantata.spec
+++ b/cantata.spec
@@ -8,33 +8,36 @@
 
 Summary:	Music Player Daemon (MPD) graphical client
 Name:		cantata
-Version:	2.0.1
+Version:	2.4.1
 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:	dacab1b6bf7639e3d46876db8883fbb2
+# Source0-md5:	a87cce0da0f16904e41a79ec7de5f1ce
 Patch101:	system-qtiocompressor.patch
-Patch102:	system-qxt.patch
-Patch104:	libsolid_static.patch
 Patch105:	icons_crash.patch
 Patch106:	libdir.patch
 URL:		https://github.com/cdrummond/cantata
 BuildRequires:	Qt5Concurrent-devel
+BuildRequires:	Qt5Core-devel
 BuildRequires:	Qt5DBus-devel
 BuildRequires:	Qt5Gui-devel
 BuildRequires:	Qt5IOCompressor-devel
 BuildRequires:	Qt5Network-devel
 BuildRequires:	Qt5Sql-devel
 BuildRequires:	Qt5Svg-devel
+BuildRequires:	Qt5Widgets-devel
 BuildRequires:	Qt5Xml-devel
-BuildRequires:	cdparanoia-III-devel
-BuildRequires:	cmake
+BuildRequires:	avahi-devel
+BuildRequires:	cmake >= 2.6
 BuildRequires:	desktop-file-utils
 BuildRequires:	libcddb-devel
-BuildRequires:	libmtp-devel
+BuildRequires:	libcdio-paranoia-devel
+BuildRequires:	libmtp-devel >= 1.1.0
 %{?with_musicbrainz:BuildRequires:	libmusicbrainz5-devel}
+# C++11
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	media-player-info
 BuildRequires:	phonon-devel
 BuildRequires:	pkgconfig
@@ -44,9 +47,9 @@ BuildRequires:	qt5-qmake
 BuildRequires:	rpmbuild(find_lang) >= 1.37
 BuildRequires:	rpmbuild(macros) >= 1.596
 BuildRequires:	systemd-devel
-BuildRequires:	taglib-devel
-BuildRequires:	taglib-extras-devel
+BuildRequires:	taglib-devel >= 1.6
 BuildRequires:	vlc-devel
+BuildRequires:	zlib-devel
 %if %{with kde}
 BuildRequires:	QtIOCompressor-devel
 BuildRequires:	QtNetwork-devel
@@ -61,8 +64,9 @@ Requires:	Qt5Gui-platform-xcb
 Requires:	Qt5Sql-sqldriver-sqlite3
 Requires:	gtk-update-icon-cache
 Requires:	hicolor-icon-theme
-Requires:	kde4-icons-oxygen
+Requires:	libmtp >= 1.1.0
 Requires:	media-player-info
+Requires:	taglib >= 1.6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -95,12 +99,10 @@ Features:
 %patch101 -p1
 rm -rfv 3rdparty/{qjson,qtiocompressor}
 
-%patch102 -p1
 rm -rfv 3rdparty/{qtsingleapplication,qxt}
 sed -i.system-qxt-headers -e 's|^#include "qxt/qxtglobalshortcut.h"|#include <QxtGlobalShortcut>|g' \
 	gui/qxtmediakeys.cpp
 
-%patch104 -p1
 #%patch105 -p1
 %patch106 -p1
 
@@ -154,8 +156,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/*/*/*.svg
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/translations
-%{_datadir}/%{name}/config
+#%{_datadir}/%{name}/config
 %{_datadir}/%{name}/icons
-%{_datadir}/%{name}/mpd
+#%{_datadir}/%{name}/mpd
 %{_datadir}/%{name}/scripts
-%{_datadir}/%{name}/themes
+#%{_datadir}/%{name}/themes
diff --git a/libdir.patch b/libdir.patch
index 99363fa..773b68e 100644
--- a/libdir.patch
+++ b/libdir.patch
@@ -1,17 +1,14 @@
 --- 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,11 +146,11 @@
- endif (NOT CMAKE_BUILD_TYPE)
+@@ -146,9 +146,9 @@
+ endif ()
  
  if (NOT APPLE AND NOT WIN32)
--    if (CANTATA_HELPERS_LIB_DIR AND NOT ENABLE_KDE AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+-    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 (CANTATA_HELPERS_LIB_DIR AND NOT ENABLE_KDE AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-+    else (CANTATA_HELPERS_LIB_DIR)
+-    else ()
++    else ()
          set(LINUX_LIB_DIR lib)
--    endif (CANTATA_HELPERS_LIB_DIR AND NOT ENABLE_KDE AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-+    endif (CANTATA_HELPERS_LIB_DIR)
- endif (NOT APPLE AND NOT WIN32)
- 
- if (ENABLE_UBUNTU)
+     endif ()
+ endif ()
diff --git a/libsolid_static.patch b/libsolid_static.patch
deleted file mode 100644
index 0a54ecb..0000000
--- a/libsolid_static.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-make libsolidlite explicitly static
-diff -up cantata-1.3.4/3rdparty/solid-lite/CMakeLists.txt.libsolid_static cantata-1.3.4/3rdparty/solid-lite/CMakeLists.txt
---- cantata-1.3.4/3rdparty/solid-lite/CMakeLists.txt.libsolid_static	2014-02-20 13:17:53.000000000 -0600
-+++ cantata-1.3.4/3rdparty/solid-lite/CMakeLists.txt	2014-06-09 12:52:02.823317653 -0500
-@@ -289,7 +289,7 @@ if (ENABLE_QT5)
- else (ENABLE_QT5)
-     QT4_WRAP_CPP(solidlite_LIB_MOC_SRCS ${solidlite_LIB_MOC_HDRS} )
- endif (ENABLE_QT5)
--add_library(solidlite ${solidlite_LIB_SRCS} ${solidlite_LIB_MOC_SRCS})
-+add_library(solidlite STATIC ${solidlite_LIB_SRCS} ${solidlite_LIB_MOC_SRCS})
- # set_target_properties(solidlite PROPERTIES AUTOMOC TRUE)
- 
- if ( UDEV_FOUND )
diff --git a/system-qtiocompressor.patch b/system-qtiocompressor.patch
index 9b057ac..8505683 100644
--- a/system-qtiocompressor.patch
+++ b/system-qtiocompressor.patch
@@ -59,9 +59,9 @@
 --- 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 @@
+ #include "musiclibrarymodel.h"
  #include "mpd-interface/mpdparseutils.h"
  #include "mpd-interface/mpdconnection.h"
- #include "support/localize.h"
 -#include "qtiocompressor/qtiocompressor.h"
 +#include <QtIOCompressor>
  #include <QXmlStreamReader>
@@ -75,9 +75,9 @@
  #include "digitallyimported.h"
 -#include "qtiocompressor/qtiocompressor.h"
 +#include <QtIOCompressor>
- #include "support/utils.h"
  #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 @@
diff --git a/system-qxt.patch b/system-qxt.patch
deleted file mode 100644
index c2565cc..0000000
--- a/system-qxt.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up cantata-1.4.1/CMakeLists.txt.system-qxt cantata-1.4.1/CMakeLists.txt
---- cantata-1.4.1/CMakeLists.txt.system-qxt	2014-08-27 11:35:04.684766778 -0500
-+++ cantata-1.4.1/CMakeLists.txt	2014-08-27 11:38:39.057480514 -0500
-@@ -671,8 +672,9 @@ else (ENABLE_KDE)
-     endif (ENABLE_QT5)
- 
-     if (WIN32 OR (NOT APPLE AND NOT ENABLE_QT5))
--        add_definitions(-DQXT_STATIC)
--        add_subdirectory(3rdparty/qxt)
-+        #add_definitions(-DQXT_STATIC)
-+        #add_subdirectory(3rdparty/qxt)
-+        include_directories(/usr/include/QxtCore /usr/include/QxtGui)
-         set(CANTATA_SRCS ${CANTATA_SRCS} gui/qxtmediakeys.cpp)
-     endif (WIN32 OR (NOT APPLE AND NOT ENABLE_QT5))
- 
-@@ -696,7 +698,7 @@ else (ENABLE_KDE)
-         target_link_libraries(cantata qtsingleapplication)
-     endif (WIN32 OR APPLE)
-     if (WIN32 OR (NOT APPLE AND NOT ENABLE_QT5))
--        target_link_libraries(cantata qxt)
-+        target_link_libraries(cantata QxtGui)
-     endif (WIN32 OR (NOT APPLE AND NOT ENABLE_QT5))
- endif (ENABLE_KDE)
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cantata.git/commitdiff/e3d58df8504c45e9af261840d1eeaec9478510cd

