[cantata] 1.3.4-1

Rex Dieter rdieter at fedoraproject.org
Sat Jun 7 20:24:03 UTC 2014 

commit f8695f446e3249d3dd8d5da3ed42c3e1a050fe1d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Jun 7 15:23:59 2014 -0500

    1.3.4-1
    
    - cantata-1.3.4
    - disable kde integration (for now, FTBFS)
    - revert whitespace changes
    - restore cmake types for build options
    - use system libqxt
    - ready Qt5-enabled build (not used yet)

 .gitignore                                 |    3 +-
 cantata-0.9.1-perl_env.patch               |    9 --
 cantata-1.2.0-kde4_includes.patch          |   11 --
 cantata-1.2.0-libmusicbrainz5_cflags.patch |   53 ----------
 cantata-1.2.2-system-qtiocompressor.patch  |  123 -----------------------
 cantata-1.3.3-kde4_includes.patch          |   11 ++
 cantata-1.3.4-system-qtiocompressor.patch  |  135 +++++++++++++++++++++++++
 cantata-1.3.4-system-qxt.patch             |   25 +++++
 cantata.spec                               |  149 +++++++++++++++++-----------
 sources                                    |    2 +-
 10 files changed, 266 insertions(+), 255 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bcf4c3f..cfbad83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/cantata-1.2.2.tar.bz2
-/cantata-1.3.3.tar.bz2
+/cantata-1.3.4.tar.bz2
diff --git a/cantata-1.3.3-kde4_includes.patch b/cantata-1.3.3-kde4_includes.patch
new file mode 100644
index 0000000..c2e0349
--- /dev/null
+++ b/cantata-1.3.3-kde4_includes.patch
@@ -0,0 +1,11 @@
+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/cantata-1.3.4-system-qtiocompressor.patch b/cantata-1.3.4-system-qtiocompressor.patch
new file mode 100644
index 0000000..7e9d74c
--- /dev/null
+++ b/cantata-1.3.4-system-qtiocompressor.patch
@@ -0,0 +1,135 @@
+diff -up cantata-1.3.4/CMakeLists.txt.system-qtiocompressor cantata-1.3.4/CMakeLists.txt
+--- cantata-1.3.4/CMakeLists.txt.system-qtiocompressor	2014-04-08 14:44:37.000000000 -0500
++++ cantata-1.3.4/CMakeLists.txt	2014-06-07 11:12:22.816867598 -0500
+@@ -637,10 +638,9 @@ else (QJSON_FOUND)
+     target_link_libraries(cantata qjson)
+ endif (QJSON_FOUND)
+ 
+-add_subdirectory(3rdparty/qtiocompressor)
+ add_subdirectory(icons)
+ 
+-target_link_libraries(cantata support qtiocompressor ${QTLIBS} ${ZLIB_LIBRARIES})
++target_link_libraries(cantata support QtSolutions_IOCompressor-2.3 ${QTLIBS} ${ZLIB_LIBRARIES})
+ include_directories(${QTINCLUDES} ${ZLIB_INCLUDE_DIRS})
+ 
+ if (TAGLIB_FOUND)
+diff -up cantata-1.3.4/context/albumview.cpp.system-qtiocompressor cantata-1.3.4/context/albumview.cpp
+--- cantata-1.3.4/context/albumview.cpp.system-qtiocompressor	2014-03-25 15:27:18.000000000 -0500
++++ cantata-1.3.4/context/albumview.cpp	2014-06-07 11:12:22.810867662 -0500
+@@ -27,7 +27,7 @@
+ #include "covers.h"
+ #include "networkaccessmanager.h"
+ #include "utils.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #include "musiclibrarymodel.h"
+ #include "contextengine.h"
+ #include "textbrowser.h"
+diff -up cantata-1.3.4/context/artistview.cpp.system-qtiocompressor cantata-1.3.4/context/artistview.cpp
+--- cantata-1.3.4/context/artistview.cpp.system-qtiocompressor	2014-03-25 15:27:18.000000000 -0500
++++ cantata-1.3.4/context/artistview.cpp	2014-06-07 11:12:22.811867651 -0500
+@@ -27,7 +27,7 @@
+ #include "utils.h"
+ #include "musiclibrarymodel.h"
+ #include "networkaccessmanager.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #include "textbrowser.h"
+ #include "contextengine.h"
+ #include "actioncollection.h"
+diff -up cantata-1.3.4/context/wikipediasettings.cpp.system-qtiocompressor cantata-1.3.4/context/wikipediasettings.cpp
+--- cantata-1.3.4/context/wikipediasettings.cpp.system-qtiocompressor	2014-02-20 13:17:51.000000000 -0600
++++ cantata-1.3.4/context/wikipediasettings.cpp	2014-06-07 11:12:22.811867651 -0500
+@@ -28,7 +28,7 @@
+ #include "icon.h"
+ #include "spinner.h"
+ #include "settings.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #include "utils.h"
+ #include "action.h"
+ #include "thread.h"
+diff -up cantata-1.3.4/models/dirviewmodel.cpp.system-qtiocompressor cantata-1.3.4/models/dirviewmodel.cpp
+--- cantata-1.3.4/models/dirviewmodel.cpp.system-qtiocompressor	2014-03-09 01:57:44.000000000 -0600
++++ cantata-1.3.4/models/dirviewmodel.cpp	2014-06-07 11:20:23.030770690 -0500
+@@ -45,7 +45,7 @@
+ #include "icons.h"
+ #include "config.h"
+ #include "utils.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ 
+ #if defined ENABLE_MODEL_TEST
+ #include "modeltest.h"
+diff -up cantata-1.3.4/models/musiclibraryitempodcast.cpp.system-qtiocompressor cantata-1.3.4/models/musiclibraryitempodcast.cpp
+--- cantata-1.3.4/models/musiclibraryitempodcast.cpp.system-qtiocompressor	2014-03-25 15:27:18.000000000 -0500
++++ cantata-1.3.4/models/musiclibraryitempodcast.cpp	2014-06-07 11:12:22.811867651 -0500
+@@ -30,7 +30,7 @@
+ #include "onlineservice.h"
+ #include "song.h"
+ #include "icons.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #include "utils.h"
+ #include "covers.h"
+ #include "rssparser.h"
+diff -up cantata-1.3.4/models/musiclibraryitemroot.cpp.system-qtiocompressor cantata-1.3.4/models/musiclibraryitemroot.cpp
+--- cantata-1.3.4/models/musiclibraryitemroot.cpp.system-qtiocompressor	2014-03-25 15:27:18.000000000 -0500
++++ cantata-1.3.4/models/musiclibraryitemroot.cpp	2014-06-07 11:12:22.812867641 -0500
+@@ -32,7 +32,7 @@
+ #include "mpdconnection.h"
+ #include "song.h"
+ #include "localize.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #include "musicmodel.h"
+ #include <QXmlStreamReader>
+ #include <QXmlStreamWriter>
+diff -up cantata-1.3.4/models/musiclibrarymodel.cpp.system-qtiocompressor cantata-1.3.4/models/musiclibrarymodel.cpp
+--- cantata-1.3.4/models/musiclibrarymodel.cpp.system-qtiocompressor	2014-02-20 13:17:51.000000000 -0600
++++ cantata-1.3.4/models/musiclibrarymodel.cpp	2014-06-07 11:12:22.812867641 -0500
+@@ -41,7 +41,7 @@
+ #include "utils.h"
+ #include "icons.h"
+ #include "stdactions.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #include <QCommonStyle>
+ #include <QFile>
+ #include <QTimer>
+diff -up cantata-1.3.4/models/streamsmodel.cpp.system-qtiocompressor cantata-1.3.4/models/streamsmodel.cpp
+--- cantata-1.3.4/models/streamsmodel.cpp.system-qtiocompressor	2014-03-25 15:27:18.000000000 -0500
++++ cantata-1.3.4/models/streamsmodel.cpp	2014-06-07 11:12:22.813867630 -0500
+@@ -40,7 +40,7 @@
+ #include "actioncollection.h"
+ #include "digitallyimported.h"
+ #include "qjson/parser.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #include "utils.h"
+ #include "config.h"
+ #include <QModelIndex>
+diff -up cantata-1.3.4/online/onlineservice.cpp.system-qtiocompressor cantata-1.3.4/online/onlineservice.cpp
+--- cantata-1.3.4/online/onlineservice.cpp.system-qtiocompressor	2014-03-25 15:27:19.000000000 -0500
++++ cantata-1.3.4/online/onlineservice.cpp	2014-06-07 11:12:22.813867630 -0500
+@@ -28,7 +28,7 @@
+ #include "networkaccessmanager.h"
+ #include "mpdparseutils.h"
+ #include "covers.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ #include "thread.h"
+ #include "settings.h"
+ #include <QFile>
+diff -up cantata-1.3.4/streams/tar.cpp.system-qtiocompressor cantata-1.3.4/streams/tar.cpp
+--- cantata-1.3.4/streams/tar.cpp.system-qtiocompressor	2014-02-20 13:17:54.000000000 -0600
++++ cantata-1.3.4/streams/tar.cpp	2014-06-07 11:12:22.813867630 -0500
+@@ -22,7 +22,7 @@
+  */
+ 
+ #include "tar.h"
+-#include "qtiocompressor/qtiocompressor.h"
++#include <QtIOCompressor>
+ 
+ Tar::Tar(const QString &fileName)
+     : file(fileName)
diff --git a/cantata-1.3.4-system-qxt.patch b/cantata-1.3.4-system-qxt.patch
new file mode 100644
index 0000000..805aee9
--- /dev/null
+++ b/cantata-1.3.4-system-qxt.patch
@@ -0,0 +1,25 @@
+diff -up cantata-1.3.4/CMakeLists.txt.system-qxt cantata-1.3.4/CMakeLists.txt
+--- cantata-1.3.4/CMakeLists.txt.system-qxt	2014-06-07 14:33:53.195155309 -0500
++++ cantata-1.3.4/CMakeLists.txt	2014-06-07 14:39:26.524617407 -0500
+@@ -552,9 +552,9 @@ else (ENABLE_KDE)
+     endif (ENABLE_QT5)
+ 
+     if (WIN32 OR APPLE OR NOT ENABLE_QT5)
+-        add_definitions(-DQXT_STATIC)
+-        add_subdirectory(3rdparty/qxt)
+-        include_directories(${CMAKE_SOURCE_DIR}/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 APPLE OR NOT ENABLE_QT5)
+ 
+@@ -586,7 +586,7 @@ else (ENABLE_KDE)
+         target_link_libraries(cantata qtsingleapplication)
+     endif (WIN32)
+     if (WIN32 OR APPLE OR NOT ENABLE_QT5)
+-        target_link_libraries(cantata qxt)
++        target_link_libraries(cantata QxtGui)
+     endif (WIN32 OR APPLE OR NOT ENABLE_QT5)
+ endif (ENABLE_KDE)
+ 
diff --git a/cantata.spec b/cantata.spec
index b4e0163..869503a 100644
--- a/cantata.spec
+++ b/cantata.spec
@@ -1,48 +1,59 @@
-# define to enable kde integration
-%global kde 1
+## define build type, uses Qt4 if neither kde or qt5 is defined
+# kde build FTBFS at the moment (as of 1.3.4)
+#global kde 1
+%global qt5 1
 
 %if 0%{?fedora} > 17 || 0%{?rhel} > 6
 %global udisks2 1
 %endif
 
-Name:           cantata
-Version:        1.3.3
-Release:        2%{?dist}
-Summary:        Music Player Daemon (MPD) graphical client
-License:        GPLv2+
-URL:            http://code.google.com/p/cantata/
-Source0:        http://cantata.googlecode.com/files/cantata-%{version}.tar.bz2
-Patch0:         %{name}-1.2.2-system-qtiocompressor.patch
+Name:    cantata
+Summary: Music Player Daemon (MPD) graphical client
+Version: 1.3.4
+Release: 1%{?dist}
 
-## upstreamable patches
-# s|^#!/usr/bin/env perl|#!/usr/bin/perl|
-Patch101:       cantata-0.9.1-perl_env.patch
-
-# fix kde support
-# Patch102:       cantata-1.2.0-kde4_includes.patch
-
-# pkgconfig hints for libmusicbrainz5
-# Patch103:       cantata-1.2.0-libmusicbrainz5_cflags.patch
+License: GPLv2+
+URL:     http://code.google.com/p/cantata/
+# https://code.google.com/p/cantata/wiki/Downloads
+Source0: cantata-%{version}.tar.bz2
 
-BuildRequires:  cdparanoia-devel
-BuildRequires:  gettext
+## upstreamable patches
+# could be made upstreamable with a little more work -- rex
+Patch101: cantata-1.3.4-system-qtiocompressor.patch
+Patch102: cantata-1.3.4-system-qxt.patch
+# fix kde support (kde4_includes)
+Patch103: cantata-1.3.3-kde4_includes.patch
+
+BuildRequires: cdparanoia-devel
+BuildRequires: gettext
 %if 0%{?kde}
-BuildRequires:  kdelibs4-devel >= 4.7
+BuildRequires: kdelibs4-devel >= 4.7
+%endif
+%if 0%{?qt4} || 0%{?kde}
+BuildRequires: libqxt-devel
+BuildRequires: pkgconfig(phonon)
+BuildRequires: pkgconfig(QJson)
+BuildRequires: pkgconfig(QtDBus) pkgconfig(QtGui) pkgconfig(QtNetwork) pkgconfig(QtXml)
+BuildRequires: pkgconfig(QtWebKit)
+BuildRequires: qtiocompressor-devel
+BuildRequires: qtsingleapplication-devel
 %endif
-BuildRequires:  pkgconfig(libcddb)
-BuildRequires:  pkgconfig(libmtp)
-BuildRequires:  pkgconfig(libmusicbrainz5)
-BuildRequires:  pkgconfig(phonon)
-BuildRequires:  pkgconfig(QJson)
-BuildRequires:  pkgconfig(QtWebKit)
-BuildRequires:  pkgconfig(taglib)
-BuildRequires:  pkgconfig(taglib-extras)
-BuildRequires:  qtiocompressor-devel
-BuildRequires:  qtsingleapplication-devel
-BuildRequires:  systemd-devel
+%if 0%{?qt5}
+BuildRequires: pkgconfig(phonon4qt5)
+BuildRequires: pkgconfig(Qt5DBus) pkgconfig(Qt5Gui) pkgconfig(Qt5Network) pkgconfig(Qt5Xml)
+BuildRequires: pkgconfig(Qt5WebKit)
+%endif
+BuildRequires: pkgconfig(libcddb)
+BuildRequires: pkgconfig(libmtp)
+BuildRequires: pkgconfig(libmusicbrainz5)
+BuildRequires: pkgconfig(phonon)
+BuildRequires: pkgconfig(taglib)
+BuildRequires: pkgconfig(taglib-extras)
+BuildRequires: systemd-devel
+
 
 %description
-Cantata is a graphical client for the music player daemon (MPD). 
+Cantata is a graphical client for the music player daemon (MPD).
 
 Features:
 * Multiple MPD collections.
@@ -54,7 +65,7 @@ Features:
 * Ability to calculate ReplyGain tags.
 * Dynamic playlists.
 * Online services; Jamendo, Magnatune, SoundCloud, and Podcasts.
-* Radio stream support - with the ability to search for streams via TuneIn 
+* Radio stream support - with the ability to search for streams via TuneIn
 and ShoutCast.
 * USB-Mass-Storage and MTP device support.
 * Audio CD ripping and playback.
@@ -64,60 +75,86 @@ and ShoutCast.
 media keys (via Qxt support)
 * Ubuntu/ambiance theme integration.
 
+
 %prep
 %setup -q
-%patch0 -p1 -b .system-qtiocompressor
-%patch101 -p1 -b .perl_env
-rm -rf 3rdparty/
+# No qt5 qjson,qtiocompressor... yet
+%if ! 0%{?qt5}
+%patch101 -p1 -b .system-qtiocompressor
+rm -rfv 3rdparty/{qjson,qtiocompressor}/
+%endif
+%patch102 -p1 -b .system-qxt
+%patch103 -p1 -b .kde4_includes
+rm -rfv 3rdparty/{qtsingleapplication,qxt}/
+
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 CXXFLAGS="%{optflags} -I/usr/include/QtSolutions" # see bug 1077936
-%{cmake_kde4} \
-  -DENABLE_KDE=%{?kde:ON}%{!?kde:OFF} \
-  -DENABLE_PROXY_CONFIG=ON \
-  -DENABLE_REMOTE_DEVICES=ON \
-  -DENABLE_FFMPEG=OFF \
-  -DENABLE_MPG123=OFF \
-  -DENABLE_HTTP_STREAM_PLAYBACKON \
-  %{?udisks2:-DENABLE_UDISKS2=ON} \
+%{cmake} \
+  -DENABLE_KDE:BOOL=%{?kde:ON}%{!?kde:OFF} \
+  -DENABLE_QT5:BOOL=%{?qt5:ON}%{!?qt5:OFF} \
+  -DENABLE_FFMPEG:BOOL=OFF \
+  -DENABLE_MPG123:BOOL=OFF \
+  %{?udisks2:-DENABLE_UDISKS2:BOOL=ON} \
   ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} %{!?kde:--with-qt} %{?kde:--with-kde} --all-name || touch %%{name}.lang
+%find_lang %{name} --with-qt --with-kde --all-name
+
 
 %check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/%{?kde:kde4}/cantata.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/cantata.desktop
+
 
 %post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
 %files -f %{name}.lang
 %doc AUTHORS ChangeLog LICENSE README TODO
-%{_kde4_bindir}/cantata
-%{_kde4_datadir}/applications/%{?kde:kde4}/cantata.desktop
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_datadir}/cantata/
+%{_bindir}/cantata
+%{_datadir}/applications/cantata.desktop
+%{_datadir}/icons/hicolor/*/*/*
+%dir %{_datadir}/cantata/
+%{_datadir}/cantata/icons/
+%{_datadir}/cantata/mpd/
+%{_datadir}/cantata/scripts/
+%{_datadir}/cantata/streams/
+%{_datadir}/cantata/themes/
+%dir %{_datadir}/cantata/translations/
+%if 0%{?kde}
 %dir %{_kde4_appsdir}/solid/
 %dir %{_kde4_appsdir}/solid/actions/
 %{_kde4_appsdir}/solid/actions/cantata-play-audiocd.desktop
+%endif
+
 
 %changelog
+* Sat Jun 07 2014 Rex Dieter <rdieter at fedoraproject.org> 
+- 1.3.4-1
+- cantata-1.3.4
+- disable kde integration (for now, FTBFS)
+- revert whitespace changes
+- restore cmake types for build options
+- use system libqxt
+- ready Qt5-enabled build (not used yet)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 9ed8bf8..8555cf0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-67053cfde9eb5c821483acc9c4961e36  cantata-1.3.3.tar.bz2
+5b21329a4b00716f7feb827805f215b5  cantata-1.3.4.tar.bz2

More information about the scm-commits mailing list