[rpms/amarok] epel10.2: 2.8.0

[Rex Dieter <rdieter@math.unl.edu>]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 77d98e34e3fca8a02959514fdb1b8043f7a4197b
Author : Rex Dieter <rdieter@math.unl.edu>
Date   : 2013-08-15T10:42:18-05:00
Stats  : +100/-166 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/77d98e34e3fca8a02959514fdb1b8043f7a4197b?branch=epel10.2

Log:
2.8.0

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

diff --git a/0071-MediaDeviceCache-work-around-Solid-UDisks2-bug-by-no.patch b/0071-MediaDeviceCache-work-around-Solid-UDisks2-bug-by-no.patch
deleted file mode 100644
index bc33a88..0000000
--- a/0071-MediaDeviceCache-work-around-Solid-UDisks2-bug-by-no.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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/amarok-2.7.0-onlinedoc.patch b/amarok-2.7.0-onlinedoc.patch
deleted file mode 100644
index 9ad6c7a..0000000
--- a/amarok-2.7.0-onlinedoc.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -up amarok-2.7.0/src/ActionClasses.cpp.onlinedoc amarok-2.7.0/src/ActionClasses.cpp
---- amarok-2.7.0/src/ActionClasses.cpp.onlinedoc	2013-01-17 06:53:54.000000000 -0600
-+++ amarok-2.7.0/src/ActionClasses.cpp	2013-01-17 16:23:03.357440692 -0600
-@@ -34,10 +34,12 @@
- #include "widgets/Osd.h"
- #include "KNotificationBackend.h"
- 
-+#include <QFile>
- #include <KAuthorized>
- #include <KHelpMenu>
- #include <KLocale>
- #include <KToolBar>
-+#include <KToolInvocation>
- 
- extern OcsData ocsData;
- 
-@@ -63,6 +65,7 @@ namespace Amarok
- using namespace Amarok;
- 
- KHelpMenu *Menu::s_helpMenu = 0;
-+OnlineHelpHandler *Menu::s_onlineHelpHandler = 0;
- 
- static void
- safePlug( KActionCollection *ac, const char *name, QWidget *w )
-@@ -152,6 +155,20 @@ Menu::helpMenu( QWidget *parent ) //STAT
- 
-     KMenu* menu = s_helpMenu->menu();
- 
-+    // If amarok-doc is not installed, bring up the online version instead.
-+    if ( !QFile::exists( "/usr/share/doc/HTML/en/amarok/index.docbook" ) ) {
-+        QAction *contentsAction = s_helpMenu->action( KHelpMenu::menuHelpContents );
-+        // disconnect the default slot which fires up KHelpCenter
-+        disconnect( contentsAction, SIGNAL(triggered(bool)), s_helpMenu, SLOT(appHelpActivated()) );
-+        if ( s_onlineHelpHandler == 0 )
-+            s_onlineHelpHandler = new OnlineHelpHandler( parent );
-+        else
-+            // ensure no duplicate connection
-+            disconnect( contentsAction, SIGNAL(triggered(bool)), s_onlineHelpHandler, SLOT(onlineHelpActivated()) );
-+        // connect our custom slot which fires up a browser on UserBase instead
-+        connect( contentsAction, SIGNAL(triggered(bool)), s_onlineHelpHandler, SLOT(onlineHelpActivated()) );
-+    }
-+
-     // NOTE: We hide "Report Bug..." because we need to add it on our own to name the dialog
-     // so it can be blacklisted from LikeBack.
-     s_helpMenu->action( KHelpMenu::menuReportBug )->setVisible( false );
-@@ -164,6 +181,17 @@ Menu::helpMenu( QWidget *parent ) //STAT
-     return menu;
- }
- 
-+OnlineHelpHandler::OnlineHelpHandler( QObject* parent )
-+        : QObject( parent )
-+{
-+}
-+
-+void
-+OnlineHelpHandler::onlineHelpActivated()
-+{
-+    KToolInvocation::invokeBrowser( "http://userbase.kde.org/Amarok/Manual" );
-+}
-+
- //////////////////////////////////////////////////////////////////////////////////////////
- // PlayPauseAction
- //////////////////////////////////////////////////////////////////////////////////////////
-diff -up amarok-2.7.0/src/ActionClasses.h.onlinedoc amarok-2.7.0/src/ActionClasses.h
---- amarok-2.7.0/src/ActionClasses.h.onlinedoc	2013-01-17 06:53:54.000000000 -0600
-+++ amarok-2.7.0/src/ActionClasses.h	2013-01-17 16:22:05.828136774 -0600
-@@ -34,6 +34,16 @@ class KHelpMenu;
- 
- namespace Amarok
- {
-+    class OnlineHelpHandler : public QObject
-+    {
-+        Q_OBJECT
-+        public:
-+            OnlineHelpHandler( QObject* parent );
-+
-+        public slots:
-+            void onlineHelpActivated();
-+    };
-+
-     class Menu : public KMenu
-     {
-         Q_OBJECT
-@@ -45,6 +55,7 @@ namespace Amarok
-         private:
-             static Menu       *s_instance;
-             static KHelpMenu  *s_helpMenu;
-+            static OnlineHelpHandler *s_onlineHelpHandler;
-     };
- 
-     class MenuAction : public KAction

diff --git a/amarok-2.8.0-onlinedoc.patch b/amarok-2.8.0-onlinedoc.patch
new file mode 100644
index 0000000..a4d1df8
--- /dev/null
+++ b/amarok-2.8.0-onlinedoc.patch
@@ -0,0 +1,91 @@
+diff -up amarok-2.8.0/src/ActionClasses.cpp.onlinedoc amarok-2.8.0/src/ActionClasses.cpp
+--- amarok-2.8.0/src/ActionClasses.cpp.onlinedoc	2013-08-14 15:22:51.000000000 -0500
++++ amarok-2.8.0/src/ActionClasses.cpp	2013-08-15 10:40:40.656472890 -0500
+@@ -33,10 +33,12 @@
+ #include "widgets/Osd.h"
+ #include "KNotificationBackend.h"
+ 
++#include <QFile>
+ #include <KAuthorized>
+ #include <KHelpMenu>
+ #include <KLocale>
+ #include <KToolBar>
++#include <KToolInvocation>
+ 
+ extern OcsData ocsData;
+ 
+@@ -62,6 +64,7 @@ namespace Amarok
+ using namespace Amarok;
+ 
+ KHelpMenu *Menu::s_helpMenu = 0;
++OnlineHelpHandler *Menu::s_onlineHelpHandler = 0;
+ 
+ static void
+ safePlug( KActionCollection *ac, const char *name, QWidget *w )
+@@ -151,6 +154,20 @@ Menu::helpMenu( QWidget *parent ) //STAT
+ 
+     KMenu* menu = s_helpMenu->menu();
+ 
++    // If amarok-doc is not installed, bring up the online version instead.
++    if ( !QFile::exists( "/usr/share/doc/HTML/en/amarok/index.docbook" ) ) {
++        QAction *contentsAction = s_helpMenu->action( KHelpMenu::menuHelpContents );
++        // disconnect the default slot which fires up KHelpCenter
++        disconnect( contentsAction, SIGNAL(triggered(bool)), s_helpMenu, SLOT(appHelpActivated()) );
++        if ( s_onlineHelpHandler == 0 )
++            s_onlineHelpHandler = new OnlineHelpHandler( parent );
++        else
++            // ensure no duplicate connection
++            disconnect( contentsAction, SIGNAL(triggered(bool)), s_onlineHelpHandler, SLOT(onlineHelpActivated()) );
++        // connect our custom slot which fires up a browser on UserBase instead
++        connect( contentsAction, SIGNAL(triggered(bool)), s_onlineHelpHandler, SLOT(onlineHelpActivated()) );
++    }
++
+     // "What's This" isn't currently defined for anything in Amarok, so let's remove it
+     s_helpMenu->action( KHelpMenu::menuWhatsThis )->setVisible( false );
+ 
+@@ -160,6 +177,17 @@ Menu::helpMenu( QWidget *parent ) //STAT
+     return menu;
+ }
+ 
++OnlineHelpHandler::OnlineHelpHandler( QObject* parent )
++        : QObject( parent )
++{
++}
++
++void
++OnlineHelpHandler::onlineHelpActivated()
++{
++    KToolInvocation::invokeBrowser( "http://userbase.kde.org/Amarok/Manual" );
++}
++
+ //////////////////////////////////////////////////////////////////////////////////////////
+ // PlayPauseAction
+ //////////////////////////////////////////////////////////////////////////////////////////
+diff -up amarok-2.8.0/src/ActionClasses.h.onlinedoc amarok-2.8.0/src/ActionClasses.h
+--- amarok-2.8.0/src/ActionClasses.h.onlinedoc	2013-08-14 15:22:51.000000000 -0500
++++ amarok-2.8.0/src/ActionClasses.h	2013-08-15 10:38:12.378047150 -0500
+@@ -34,6 +34,16 @@ class KHelpMenu;
+ 
+ namespace Amarok
+ {
++    class OnlineHelpHandler : public QObject
++    {
++        Q_OBJECT
++        public:
++            OnlineHelpHandler( QObject* parent );
++
++        public slots:
++            void onlineHelpActivated();
++    };
++
+     class Menu : public KMenu
+     {
+         Q_OBJECT
+@@ -45,6 +55,7 @@ namespace Amarok
+         private:
+             static Menu       *s_instance;
+             static KHelpMenu  *s_helpMenu;
++            static OnlineHelpHandler *s_onlineHelpHandler;
+     };
+ 
+     class MenuAction : public KAction

diff --git a/amarok.spec b/amarok.spec
index 142752c..c9618a7 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.7.90
-Release: 2%{?dist}
+Version: 2.8.0
+Release: 1%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
@@ -17,12 +17,11 @@ Source0: http://download.kde.org/%{stable}/amarok/%{version}/src/amarok-%{versio
 
 # Invoke a browser on the online UserBase documentation instead of KHelpCenter
 # for the help contents if the amarok-doc subpackage is not installed.
-Patch0:  amarok-2.7.0-onlinedoc.patch
+Patch0:  amarok-2.8.0-onlinedoc.patch
 
 ## upstreamable patches
 
 ## upstream patches
-Patch0071: 0071-MediaDeviceCache-work-around-Solid-UDisks2-bug-by-no.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -96,11 +95,7 @@ BuildArch: noarch
 %prep
 %setup -q 
 
-# amarok now has an onlinehelp handler, see how well that works before
-# deciding to remove or rebase this. -- rex
-#patch0 -p1 -b .onlinedoc
-
-%patch0071 -p1 -b .0071
+%patch0 -p1 -b .onlinedoc
 
 
 %build
@@ -195,6 +190,9 @@ fi
 
 
 %changelog
+* Thu Aug 15 2013 Rex Dieter <rdieter@fedoraproject.org> 2.8.0-1
+- 2.8.0
+
 * Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 2.7.90-2
 - Perl 5.18 rebuild
 

diff --git a/sources b/sources
index 65243ab..e1a5962 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71b7d5949578bbc2365d0861126b38c0  amarok-2.7.90.tar.bz2
+53cfcb4819668b10e13b061478c7b32a  amarok-2.8.0.tar.bz2