[packages/cantata] up to 1.5.2

[glen]

commit 59cadeb79b9facbf5c62c3b2886b636d0cc8d346
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Dec 28 17:11:22 2015 +0200

    up to 1.5.2
    
    build still fails with libmusicbrainz5 linking:
    
    ... /usr/lib64/libQt5DBus.so.5.5.1 -lz -lpthread /usr/lib64/libQt5Widgets.so.5.5.1 /usr/lib64/libQt5Gui.so.5.5.1 /usr/lib64/libQt5Core.so.5.5.1 -ludev
    CMakeFiles/cantata.dir/devices/musicbrainz.cpp.o: In function `artistFromCreditList(MusicBrainz5::CArtistCredit*) [clone .constprop.70]':
    /home/users/glen/rpm/packages/BUILD.x86_64-linux/cantata-1.5.2/devices/musicbrainz.cpp:126: undefined reference to `MusicBrainz5::CNameCredit::Name[abi:cxx11]() const'

 cantata.spec      | 10 +++++-----
 icons_crash.patch | 19 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/cantata.spec b/cantata.spec
index c889b05..ab7f59c 100644
--- a/cantata.spec
+++ b/cantata.spec
@@ -7,19 +7,19 @@
 
 Summary:	Music Player Daemon (MPD) graphical client
 Name:		cantata
-Version:	1.4.1
+Version:	1.5.2
 Release:	0.1
 License:	GPL v2+
 Group:		Applications/Multimedia
-# https://code.google.com/p/cantata/wiki/Downloads
-Source0:	http://pkgs.fedoraproject.org/repo/pkgs/cantata/%{name}-%{version}.tar.bz2/158cbf064f54f8d33630a17a5d40bebd/cantata-%{version}.tar.bz2
-# Source0-md5:	158cbf064f54f8d33630a17a5d40bebd
+# 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
 Patch101:	system-qtiocompressor.patch
 Patch102:	system-qxt.patch
 Patch103:	kde4_includes.patch
 Patch104:	libsolid_static.patch
 Patch105:	icons_crash.patch
-URL:		http://code.google.com/p/cantata/
+URL:		https://github.com/cdrummond/cantata
 BuildRequires:	cdparanoia-III-devel
 BuildRequires:	cmake
 BuildRequires:	desktop-file-utils
diff --git a/icons_crash.patch b/icons_crash.patch
index 1a43e39..97f9c69 100644
--- a/icons_crash.patch
+++ b/icons_crash.patch
@@ -11,9 +11,8 @@ diff -up cantata-1.4.1/support/icon.h.icons_crash cantata-1.4.1/support/icon.h
      #else
      static Icon getMediaIcon(const QString &name);
      static QString currentTheme() { return QIcon::themeName(); }
-diff -up cantata-1.4.1/widgets/icons.cpp.icons_crash cantata-1.4.1/widgets/icons.cpp
---- cantata-1.4.1/widgets/icons.cpp.icons_crash	2014-07-22 13:58:44.000000000 -0500
-+++ cantata-1.4.1/widgets/icons.cpp	2014-08-27 10:01:28.270480754 -0500
+--- cantata-1.5.2/widgets/icons.cpp~	2015-12-28 17:02:37.000000000 +0200
++++ cantata-1.5.2/widgets/icons.cpp	2015-12-28 17:03:13.267039821 +0200
 @@ -370,7 +370,7 @@ Icons::Icons()
      #endif
  
@@ -23,19 +22,19 @@ diff -up cantata-1.4.1/widgets/icons.cpp.icons_crash cantata-1.4.1/widgets/icons
      #endif
  
      QString iconFile=QString(CANTATA_SYS_ICONS_DIR+"stream.png");
-@@ -568,7 +568,7 @@ void Icons::initToolbarIcons(const QColo
-             toolbarMenuIcon=createMenuIcon(toolbarText);
-         }
+@@ -527,7 +527,7 @@
+         #ifdef ENABLE_ONLINE_SERVICES
+         onlineIcon=Icon("applications-internet");
          #endif
 -        if (QLatin1String("gnome")==Icon::currentTheme().toLower()) {
 +        if (QString::compare(QLatin1String("gnome"),Icon::currentTheme(), Qt::CaseInsensitive)==0) {
              QColor col=QApplication::palette().color(QPalette::Active, QPalette::WindowText);
-             infoIcon=loadSidebarIcon("info", col, col);
-         }
-@@ -579,7 +579,7 @@ void Icons::initToolbarIcons(const QColo
+             infoSidebarIcon=loadSidebarIcon("info", col, col);
+         } else {
+@@ -597,7 +597,7 @@
      }
  
-     #if !defined ENABLE_KDE_SUPPORT && !defined Q_OS_WIN && !defined Q_OS_MAC
+     #if !defined ENABLE_KDE_SUPPORT && !defined Q_OS_WIN
 -    if (QLatin1String("gnome")==Icon::currentTheme().toLower()) {
 +    if (QString::compare(QLatin1String("gnome"),Icon::currentTheme(), Qt::CaseInsensitive)==0) {
          QColor col=QApplication::palette().color(QPalette::Active, QPalette::WindowText);
================================================================

---- gitweb:

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