[rpms/amarok] epel10: 2.7.90

[rpms/amarok] epel10: 2.7.90

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10
Commit : e4210589cf5d3726f2dbcbc992d25561013851e7
Author : Rex Dieter <rdieter@math.unl.edu>
Date   : 2013-08-01T11:03:36-05:00
Stats  : +82/-83 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/e4210589cf5d3726f2dbcbc992d25561013851e7?branch=epel10

Log:
2.7.90

---
diff --git a/.gitignore b/.gitignore
index 597e188..79c3d26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /amarok-2.7.1.tar.bz2
+/amarok-2.7.90.tar.bz2

diff --git a/0057-Fix-crashed-when-dynamic-playlist-based-on-last.fm-i.patch b/0057-Fix-crashed-when-dynamic-playlist-based-on-last.fm-i.patch
deleted file mode 100644
index a3132e7..0000000
--- a/0057-Fix-crashed-when-dynamic-playlist-based-on-last.fm-i.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 95e694452be6c040bb8040f39b260c97b214f1c0 Mon Sep 17 00:00:00 2001
-From: Ralf Engels <ralf-engels@gmx.de>
-Date: Wed, 6 Feb 2013 01:02:45 +0100
-Subject: [PATCH 057/289] Fix crashed when dynamic playlist based on last.fm
- is aborted
-
-Since the bias solver runs in a different thread care must be taken
-for signals.
-
-BUG: 314243
-FIXED-IN: 2.8
----
- src/browsers/BrowserMessageArea.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/browsers/BrowserMessageArea.cpp b/src/browsers/BrowserMessageArea.cpp
-index 0a2b391..dc36257 100644
---- a/src/browsers/BrowserMessageArea.cpp
-+++ b/src/browsers/BrowserMessageArea.cpp
-@@ -117,11 +117,11 @@ BrowserMessageArea::newProgressOperation( QObject *sender, const QString &text,
-     newBar->setDescription( text );
-     newBar->setMaximum( maximum );
-     connect( sender, SIGNAL(destroyed( QObject * )), m_progressBar,
--             SLOT(endProgressOperation( QObject * )) );
-+             SLOT(endProgressOperation( QObject * )), Qt::QueuedConnection );
-     connect( sender, SIGNAL(endProgressOperation( QObject * )), m_progressBar,
--             SLOT(endProgressOperation( QObject * )) );
-+             SLOT(endProgressOperation( QObject * )), Qt::QueuedConnection );
-     connect( sender, SIGNAL(incrementProgress()), m_progressBar,
--             SLOT(slotIncrementProgress()) );
-+             SLOT(slotIncrementProgress()), Qt::QueuedConnection );
-     connect( sender, SIGNAL(totalSteps( int )), newBar, SLOT(slotTotalSteps( int )) );
-     newBar->setAbortSlot( obj, slot, type );
-     m_progressBar->addProgressBar( newBar, sender );
--- 
-1.7.11.7
-

diff --git a/0071-MediaDeviceCache-work-around-Solid-UDisks2-bug-by-no.patch b/0071-MediaDeviceCache-work-around-Solid-UDisks2-bug-by-no.patch
new file mode 100644
index 0000000..bc33a88
--- /dev/null
+++ b/0071-MediaDeviceCache-work-around-Solid-UDisks2-bug-by-no.patch
@@ -0,0 +1,64 @@
+From cfaa48278274f70fab3f6e1b610660edafbf7bbc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mat=C4=9Bj=20Laitl?= <matej@laitl.cz>
+Date: Tue, 30 Jul 2013 19:51:04 +0200
+Subject: [PATCH 71/80] MediaDeviceCache: work-around Solid UDisks2 bug by not
+ calling allDevices()
+
+Kudos go to Alex Fiestas for extensive debugging and finding out the
+root of the problem.
+
+BUGFIXES:
+ * Work-around Solid UDisks2 backend bug that caused USB Mass Storage
+   devices and iPods not being recognized when connected before Amarok
+   was started. Also fixes a bug where blank devices would appear in
+   Play Media dialog. (BR 322980)
+
+We don't need to call Solid::Device::allDevices() at all because that
+was only needed for Apple iPhone support for the *old* iPod collection
+that was replaced in Amarok 2.6.
+
+BUG: 322980
+CCBUG: 317485
+FIXED-IN: 2.8
+---
+ ChangeLog                |  3 +++
+ src/MediaDeviceCache.cpp | 23 -----------------------
+ 2 files changed, 3 insertions(+), 23 deletions(-)
+
+diff --git a/src/MediaDeviceCache.cpp b/src/MediaDeviceCache.cpp
+index 28a3c80..73e8f34 100644
+--- a/src/MediaDeviceCache.cpp
++++ b/src/MediaDeviceCache.cpp
+@@ -136,29 +136,6 @@ MediaDeviceCache::refreshCache()
+             m_name[device.udi()] = device.vendor() + " - " + device.product();
+         }
+     }
+-    deviceList = Solid::Device::allDevices();
+-    foreach( const Solid::Device &device, deviceList )
+-    {
+-        if( const Solid::GenericInterface *generic = device.as<Solid::GenericInterface>() )
+-        {
+-            if( m_type.contains( device.udi() ) )
+-                continue;
+-
+-            const QMap<QString, QVariant> properties = generic->allProperties();
+-            if( !properties.contains("info.capabilities") )
+-                continue;
+-
+-            const QStringList capabilities = properties["info.capabilities"].toStringList();
+-            if( !capabilities.contains("afc") )
+-                continue;
+-
+-            debug() << "Found AFC capable Solid::DeviceInterface::GenericInterface with udi = " << device.udi();
+-            debug() << "Device name is = " << device.product() << " and was made by " << device.vendor();
+-
+-            m_type[device.udi()] = MediaDeviceCache::SolidGenericType;
+-            m_name[device.udi()] = device.vendor() + " - " + device.product();
+-        }
+-    }
+     KConfigGroup config = Amarok::config( "PortableDevices" );
+     const QStringList manualDeviceKeys = config.entryMap().keys();
+     foreach( const QString &udi, manualDeviceKeys )
+-- 
+1.8.3.1
+

diff --git a/0074-Fix-Amarok-crashes-by-putting-a-broadcast-in-the-pla.patch b/0074-Fix-Amarok-crashes-by-putting-a-broadcast-in-the-pla.patch
deleted file mode 100644
index e376867..0000000
--- a/0074-Fix-Amarok-crashes-by-putting-a-broadcast-in-the-pla.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2d6f48ebe3dc4f91a27eb95c8fdb282decd283e9 Mon Sep 17 00:00:00 2001
-From: Ralf Engels <ralf-engels@gmx.de>
-Date: Tue, 12 Feb 2013 15:25:06 +0100
-Subject: [PATCH 074/289] Fix:  Amarok crashes by putting a broadcast in the
- playlist
-
-BUG: 313718
-FIXED-IN: 2.8
----
- src/core-impl/playlists/types/file/pls/PLSPlaylist.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core-impl/playlists/types/file/pls/PLSPlaylist.cpp b/src/core-impl/playlists/types/file/pls/PLSPlaylist.cpp
-index 3ba154a..8fe4b51 100644
---- a/src/core-impl/playlists/types/file/pls/PLSPlaylist.cpp
-+++ b/src/core-impl/playlists/types/file/pls/PLSPlaylist.cpp
-@@ -247,7 +247,7 @@ PLSPlaylist::loadPls( QTextStream &textStream )
-             m_tracks << Meta::TrackPtr( proxyTrack.data() );
-             continue;
-         }
--        if( (*i).contains(regExp_Title) )
-+        if( (*i).contains(regExp_Title) && proxyTrack )
-         {
-             // Have a "Title#=XYZ" line.
-             index = loadPls_extractIndex(*i);
-@@ -257,7 +257,7 @@ PLSPlaylist::loadPls( QTextStream &textStream )
-             proxyTrack->setName( tmp );
-             continue;
-         }
--        if( (*i).contains( regExp_Length ) )
-+        if( (*i).contains( regExp_Length ) && proxyTrack )
-         {
-             // Have a "Length#=XYZ" line.
-             index = loadPls_extractIndex(*i);
--- 
-1.7.11.7
-

diff --git a/amarok.spec b/amarok.spec
index 095aaf8..af2570c 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.7.1
-Release: 3%{?dist}
+Version: 2.7.90
+Release: 1%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
@@ -22,8 +22,7 @@ Patch0:  amarok-2.7.0-onlinedoc.patch
 ## upstreamable patches
 
 ## upstream patches
-Patch0057: 0057-Fix-crashed-when-dynamic-playlist-based-on-last.fm-i.patch
-Patch0074: 0074-Fix-Amarok-crashes-by-putting-a-broadcast-in-the-pla.patch
+Patch0071: 0071-MediaDeviceCache-work-around-Solid-UDisks2-bug-by-no.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -97,10 +96,11 @@ BuildArch: noarch
 %prep
 %setup -q 
 
-%patch0 -p1 -b .onlinedoc
+# amarok now has an onlinehelp handler, see how well that works before
+# deciding to remove or rebase this. -- rex
+#patch0 -p1 -b .onlinedoc
 
-%patch0057 -p1 -b .0057
-%patch0074 -p1 -b .0074
+%patch0071 -p1 -b .0071
 
 
 %build
@@ -122,7 +122,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %find_lang amarok_scriptengine_qscript && cat amarok_scriptengine_qscript.lang >> amarok.lang
 
 # unpackaged files
-rm -fv %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,core,lib,plasma,pud,ocsclient,-transcoding}.so
+rm -fv %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,core,lib,plasma,pud,ocsclient,shared,-transcoding}.so
 
 
 %check
@@ -136,12 +136,14 @@ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
+update-mime-database %{_datadir}/mime >& /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 || :
 update-desktop-database -q &> /dev/null ||:
+update-mime-database %{_datadir}/mime >& /dev/null
 fi
 
 %files -f amarok.lang
@@ -160,6 +162,7 @@ fi
 %{_kde4_configdir}/amarokapplets.knsrc
 %{_kde4_datadir}/applications/kde4/amarok.desktop
 %{_kde4_datadir}/applications/kde4/amarok_containers.desktop
+%{_kde4_datadir}/applications/kde4/amzdownloader.desktop
 %{_kde4_datadir}/config.kcfg/amarokconfig.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/*.protocol
@@ -168,6 +171,7 @@ fi
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
 %{_datadir}/dbus-1/interfaces/*.xml
+%{_datadir}/mime/packages/amzdownloader.xml
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -177,6 +181,7 @@ fi
 %{_kde4_libdir}/libamaroklib.so.1*
 %{_kde4_libdir}/libamarokocsclient.so.4*
 %{_kde4_libdir}/libamarokpud.so.1*
+%{_kde4_libdir}/libamarokshared.so.1*
 %{_kde4_libdir}/libamarok-sqlcollection.so.1*
 %{_kde4_libdir}/libamarok-transcoding.so.1*
 # private libs
@@ -190,6 +195,9 @@ fi
 
 
 %changelog
+* Thu Aug 01 2013 Rex Dieter <rdieter@fedoraproject.org> 2.7.90-1
+- 2.7.90
+
 * Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 2.7.1-3
 - Perl 5.18 rebuild
 

diff --git a/sources b/sources
index 8f8909d..65243ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-855203770cfb43be39bd9b961540dbaf  amarok-2.7.1.tar.bz2
+71b7d5949578bbc2365d0861126b38c0  amarok-2.7.90.tar.bz2