up to 2.0.1

diff --git a/cantata.spec b/cantata.spec
index dd13cb41f4119d6d57672ed7aeef04cc993c0e6c..5a62a14bb96212f1770bb79400ce96161d602d03 100644 (file)
--- a/cantata.spec
+++ b/cantata.spec
@@ -1,3 +1,5 @@
+# TODO
+# - handle /usr/share/cantata/fonts/fontawesome-4.3.0.ttf
 #
 # Conditional build:
 %bcond_with    kde             # KDE
@@ -6,16 +8,15 @@
 
 Summary:       Music Player Daemon (MPD) graphical client
 Name:          cantata
-Version:       1.5.2
-Release:       4
+Version:       2.0.1
+Release:       1
 License:       GPL v2+
 Group:         Applications/Multimedia
-# https://github.com/CDrummond/cantata/wiki/Previous-%28Google-Code%29-Downloads
-Source0:       https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60LV9rM3RMQk85Z1E&/%{name}-%{version}.tar.bz2
-# Source0-md5: 0b29d30f1b03ecac23eb608309fbeaa1
+# https://github.com/CDrummond/cantata/releases
+Source0:       https://github.com/CDrummond/cantata/releases/download/v%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: dacab1b6bf7639e3d46876db8883fbb2
 Patch101:      system-qtiocompressor.patch
 Patch102:      system-qxt.patch
-Patch103:      kde4_includes.patch
 Patch104:      libsolid_static.patch
 Patch105:      icons_crash.patch
 Patch106:      libdir.patch
@@ -25,6 +26,7 @@ BuildRequires:        Qt5DBus-devel
 BuildRequires: Qt5Gui-devel
 BuildRequires: Qt5IOCompressor-devel
 BuildRequires: Qt5Network-devel
+BuildRequires: Qt5Sql-devel
 BuildRequires: Qt5Svg-devel
 BuildRequires: Qt5Xml-devel
 BuildRequires: cdparanoia-III-devel
@@ -44,6 +46,7 @@ BuildRequires:        rpmbuild(macros) >= 1.596
 BuildRequires: systemd-devel
 BuildRequires: taglib-devel
 BuildRequires: taglib-extras-devel
+BuildRequires: vlc-devel
 %if %{with kde}
 BuildRequires: QtIOCompressor-devel
 BuildRequires: QtNetwork-devel
@@ -54,11 +57,11 @@ BuildRequires:      libqxt-devel
 BuildRequires: phonon-devel
 BuildRequires: qjson-devel
 %endif
-Requires:      media-player-info
-Requires:      kde4-icons-oxygen
 Requires:      Qt5Gui-platform-xcb
 Requires:      gtk-update-icon-cache
 Requires:      hicolor-icon-theme
+Requires:      kde4-icons-oxygen
+Requires:      media-player-info
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -90,28 +93,14 @@ Features:
 
 %patch101 -p1
 rm -rfv 3rdparty/{qjson,qtiocompressor}
-sed -i.system-qtiocompressor-headers -e 's|^#include "qtiocompressor/qtiocompressor.h"|#include <QtIOCompressor>|g' \
-       context/albumview.cpp \
-       context/artistview.cpp \
-       context/songview.cpp \
-       context/wikipediasettings.cpp \
-       models/dirviewmodel.cpp \
-       models/musiclibrarymodel.cpp \
-       models/musiclibraryitempodcast.cpp \
-       models/musiclibraryitemroot.cpp \
-       models/streamsmodel.cpp \
-       online/onlineservice.cpp \
-       scrobbling/scrobbler.cpp \
-       streams/tar.cpp
 
 %patch102 -p1
 rm -rfv 3rdparty/{qtsingleapplication,qxt}
 sed -i.system-qxt-headers -e 's|^#include "qxt/qxtglobalshortcut.h"|#include <QxtGlobalShortcut>|g' \
        gui/qxtmediakeys.cpp
 
-%patch103 -p1
 %patch104 -p1
-%patch105 -p1
+#%patch105 -p1
 %patch106 -p1
 
 %build
@@ -122,11 +111,12 @@ CXXFLAGS="%{rpmcxxflags} -I/usr/include/qt5/QtSolutions"
        -DCANTATA_HELPERS_LIB_DIR=%{_lib} \
        -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5 \
        -DLCONVERT_EXECUTABLE=/usr/bin/lconvert-qt5 \
-       -DENABLE_KDE:BOOL=%{?with_kde:ON}%{!?with_kde:OFF} \
-       -DENABLE_QT5:BOOL=ON \
        -DENABLE_FFMPEG:BOOL=OFF \
+       -DENABLE_KDE:BOOL=%{?with_kde:ON}%{!?with_kde:OFF} \
+       -DENABLE_LIBVLC=ON \
        -DENABLE_MPG123:BOOL=OFF \
        -DENABLE_MUSICBRAINZ=%{?with_musicbrainz:ON}%{!?with_musicbrainz:OFF} \
+       -DENABLE_QT5:BOOL=ON \
        -DENABLE_UDISKS2:BOOL=%{?with_udisks:ON}%{!?with_udisks:OFF} \
        ..
 

diff --git a/kde4_includes.patch b/kde4_includes.patch
deleted file mode 100644 (file)
index 7f412d0..0000000
--- a/kde4_includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-fix kde support (kde4_includes)
-diff -up cantata-1.3.3/CMakeLists.txt.kde4_includes cantata-1.3.3/CMakeLists.txt
---- cantata-1.3.3/CMakeLists.txt.kde4_includes 2014-06-07 10:45:10.477192972 -0500
-+++ cantata-1.3.3/CMakeLists.txt       2014-06-07 10:47:24.482770660 -0500
-@@ -229,6 +229,7 @@ endif (ENABLE_HTTP_STREAM_PLAYBACK)
- if (ENABLE_KDE)
-     find_package(KDE4 REQUIRED)
-     add_definitions(-DENABLE_KDE_SUPPORT)
-+    include_directories(${KDE4_INCLUDES})
-     set(ENABLE_KDE_SUPPORT TRUE)
- endif (ENABLE_KDE)
- 

diff --git a/system-qtiocompressor.patch b/system-qtiocompressor.patch
index 411ea208e112414394e72d58a2c74a40e82a2230..9b057ac3478eba4e5a58ba1358ac9bf9147f7fbe 100644 (file)
--- a/system-qtiocompressor.patch
+++ b/system-qtiocompressor.patch
@@ -1,15 +1,124 @@
-could be made upstreamable with a little more work -- rex
-diff -up cantata-1.4.1/CMakeLists.txt.system-qtiocompressor cantata-1.4.1/CMakeLists.txt
---- cantata-1.4.1/CMakeLists.txt.system-qtiocompressor 2014-08-27 11:15:24.084393939 -0500
-+++ cantata-1.4.1/CMakeLists.txt       2014-08-27 11:16:11.182889573 -0500
-@@ -714,8 +714,8 @@ endif (WIN32)
+--- 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)
  
- add_subdirectory(po)
  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})
-+#add_subdirectory(3rdparty/qtiocompressor)
 +target_link_libraries(cantata support-core Qt5Solutions_IOCompressor-2.3 ${CANTATA_LIBS} ${QTLIBS} ${ZLIB_LIBRARIES})
  
  # 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 @@
+ #include "gui/covers.h"
+ #include "network/networkaccessmanager.h"
+ #include "support/utils.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#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
+@@ -26,7 +26,7 @@
+ #include "gui/covers.h"
+ #include "support/utils.h"
+ #include "network/networkaccessmanager.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #include "widgets/textbrowser.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
+@@ -43,7 +43,7 @@
+ #include "widgets/textbrowser.h"
+ #include "gui/stdactions.h"
+ #include "mpd-interface/mpdstatus.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #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 @@
+ #include "support/icon.h"
+ #include "support/spinner.h"
+ #include "gui/settings.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #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 @@
+ #include "mpd-interface/mpdparseutils.h"
+ #include "mpd-interface/mpdconnection.h"
+ #include "support/localize.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #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 @@
+ #include "gui/stdactions.h"
+ #include "support/actioncollection.h"
+ #include "digitallyimported.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #include "support/utils.h"
+ #include "config.h"
+ #include "support/globalstatic.h"
+--- 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"
+ #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 @@
+ #include "mpd-interface/mpdconnection.h"
+ #include "config.h"
+ #include "http/httpserver.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #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 @@
+ #include "support/globalstatic.h"
+ #include "support/utils.h"
+ #include "support/configuration.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #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)