[rpms/amarok] epel10.2: 2.4.90

[Rex Dieter <rdieter@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 67c03680b018e74705e97e3b8e4c32e3072c9305
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2011-11-15T08:42:45-06:00
Stats  : +81/-118 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/67c03680b018e74705e97e3b8e4c32e3072c9305?branch=epel10.2

Log:
2.4.90

---
diff --git a/.gitignore b/.gitignore
index 1137009..f753b5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /amarok-2.4.3.tar.bz2
+/amarok-2.4.90.tar.bz2

diff --git a/amarok-2.4.90-mygpo-qt-prefix.patch b/amarok-2.4.90-mygpo-qt-prefix.patch
new file mode 100644
index 0000000..94b8981
--- /dev/null
+++ b/amarok-2.4.90-mygpo-qt-prefix.patch
@@ -0,0 +1,70 @@
+diff --git a/src/services/gpodder/GpodderPodcastMeta.h b/src/services/gpodder/GpodderPodcastMeta.h
+index 0688eb0..7fbad35 100644
+--- a/src/services/gpodder/GpodderPodcastMeta.h
++++ b/src/services/gpodder/GpodderPodcastMeta.h
+@@ -23,7 +23,7 @@
+ #include "core/podcasts/PodcastMeta.h"
+ #include "core/playlists/PlaylistProvider.h"
+ 
+-#include "ApiRequest.h"
++#include <mygpo-qt/ApiRequest.h>
+ 
+ namespace Podcasts {
+ 
+diff --git a/src/services/gpodder/GpodderProvider.h b/src/services/gpodder/GpodderProvider.h
+index 8793741..943d261 100644
+--- a/src/services/gpodder/GpodderProvider.h
++++ b/src/services/gpodder/GpodderProvider.h
+@@ -24,6 +24,7 @@
+ 
+ #include <mygpo-qt/ApiRequest.h>
+ #include <mygpo-qt/EpisodeActionList.h>
++
+ #include "core/podcasts/PodcastReader.h"
+ #include "playlistmanager/PlaylistManager.h"
+ #include "playlistmanager/file/KConfigSyncRelStore.h"
+diff --git a/src/services/gpodder/GpodderServiceModel.h b/src/services/gpodder/GpodderServiceModel.h
+index 23a1cd3..d70cc1e 100644
+--- a/src/services/gpodder/GpodderServiceModel.h
++++ b/src/services/gpodder/GpodderServiceModel.h
+@@ -21,9 +21,12 @@
+ 
+ #include <QAbstractItemModel>
+ #include <QStringList>
+-#include <ApiRequest.h>
++
++#include <mygpo-qt/ApiRequest.h>
++#include <mygpo-qt/TagList.h>
++
+ #include "NetworkAccessManagerProxy.h"
+-#include <TagList.h>
++
+ #include "GpodderTreeItem.h"
+ 
+ class GpodderTreeItem;
+diff --git a/src/services/gpodder/GpodderServiceSettings.cpp b/src/services/gpodder/GpodderServiceSettings.cpp
+index 6369602..8b08324 100644
+--- a/src/services/gpodder/GpodderServiceSettings.cpp
++++ b/src/services/gpodder/GpodderServiceSettings.cpp
+@@ -20,6 +20,7 @@
+ #define DEBUG_PREFIX "GpodderServiceSettings"
+ 
+ #include <mygpo-qt/ApiRequest.h>
++
+ #include "GpodderServiceSettings.h"
+ #include "core/support/Amarok.h"
+ #include "core/support/Debug.h"
+diff --git a/src/services/gpodder/GpodderServiceSettings.h b/src/services/gpodder/GpodderServiceSettings.h
+index 533aaa3..4781452 100644
+--- a/src/services/gpodder/GpodderServiceSettings.h
++++ b/src/services/gpodder/GpodderServiceSettings.h
+@@ -20,7 +20,8 @@
+ #ifndef GPODDERSERVICESETTINGS_H
+ #define GPODDERSERVICESETTINGS_H
+ 
+-#include <ApiRequest.h>
++#include <mygpo-qt/ApiRequest.h>
++
+ #include "GpodderServiceConfig.h"
+ #include "core/podcasts/PodcastMeta.h"
+ 

diff --git a/amarok-2.5-wikipedia_load.patch b/amarok-2.5-wikipedia_load.patch
deleted file mode 100644
index 68e26c9..0000000
--- a/amarok-2.5-wikipedia_load.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-commit 027340cd9a8e01762d0ec0aafb46f4b05a7d29e8
-Author: Kevin Funk <krf@electrostorm.net>
-Date:   Sun Sep 18 23:37:11 2011 +0200
-
-    Fix crash in WikipediaApplet.
-    
-    The crash happened because of the loadProgress() signal triggering the
-    _pageLoadProgress() slot in the Wikipedia applet *after* the
-    _pageLoadFinished() has been triggered already.
-    That caused a null-pointer dereference.
-    
-    The actual problem is that we are not disconnecting from the webView
-    loadProgress() signal after some page loading has been finished.
-    
-    Also remove some not-so-pretty static_assert statements and use a more
-    type-safe approach to keep track of the progress bar proxy widget.
-    Use some soft asserts to avoid the worst-case when the proxy widget may
-    have been deleted somehow.
-    
-    BUG: 279813
-    FIXED-IN: 2.5
-
-diff --git a/src/context/applets/wikipedia/WikipediaApplet.cpp b/src/context/applets/wikipedia/WikipediaApplet.cpp
-index 1f8cd07..41412bf 100644
---- a/src/context/applets/wikipedia/WikipediaApplet.cpp
-+++ b/src/context/applets/wikipedia/WikipediaApplet.cpp
-@@ -464,10 +464,19 @@ void
- WikipediaAppletPrivate::_pageLoadStarted()
- {
-     Q_Q( WikipediaApplet );
--    QGraphicsProxyWidget *proxy = new QGraphicsProxyWidget;
--    proxy->setWidget( new QProgressBar );
-+
-+    // create a proxy widget for displaying the webview load status in form of a progress bar
-+
-+    // if the proxyWidget still exists, re-use the existing object
-+    if ( proxyWidget )
-+        return;
-+
-+    proxyWidget = new QGraphicsProxyWidget;
-+    proxyWidget->setWidget( new QProgressBar );
-+
-+    // add proxy widget to layout
-     QGraphicsLinearLayout *lo = static_cast<QGraphicsLinearLayout*>( q->layout() );
--    lo->addItem( proxy );
-+    lo->addItem( proxyWidget );
-     lo->activate();
-     QObject::connect( webView, SIGNAL(loadProgress(int)), q, SLOT(_pageLoadProgress(int)) );
- }
-@@ -475,11 +484,13 @@ WikipediaAppletPrivate::_pageLoadStarted()
- void
- WikipediaAppletPrivate::_pageLoadProgress( int progress )
- {
-+    DEBUG_BLOCK
-     Q_Q( WikipediaApplet );
--    QGraphicsLinearLayout *lo = static_cast<QGraphicsLinearLayout*>( q->layout() );
--    QGraphicsProxyWidget *proxy = static_cast<QGraphicsProxyWidget*>( lo->itemAt( lo->count() - 1 ) );
--    QString kbytes = QString::number( webView->page()->totalBytes() / 1024 );
--    QProgressBar *pbar = static_cast<QProgressBar*>( proxy->widget() );
-+    DEBUG_ASSERT(proxyWidget, return)
-+
-+    const QString kbytes = QString::number( webView->page()->totalBytes() / 1024 );
-+
-+    QProgressBar *pbar = qobject_cast<QProgressBar*>( proxyWidget->widget() );
-     pbar->setFormat( QString( "%1kB : %p%" ).arg( kbytes ) );
-     pbar->setValue( progress );
- }
-@@ -487,13 +498,19 @@ WikipediaAppletPrivate::_pageLoadProgress( int progress )
- void
- WikipediaAppletPrivate::_pageLoadFinished( bool ok )
- {
-+    DEBUG_BLOCK
-     Q_UNUSED( ok )
-     Q_Q( WikipediaApplet );
-+
-+    // remove proxy widget from layout again, delete it
-     QGraphicsLinearLayout *lo = static_cast<QGraphicsLinearLayout*>( q->layout() );
--    QGraphicsProxyWidget *proxy = static_cast<QGraphicsProxyWidget*>( lo->itemAt( lo->count() - 1 ) );
--    lo->removeItem( proxy );
-+    lo->removeItem( proxyWidget );
-     lo->activate();
--    proxy->deleteLater();
-+
-+    // disconnect (so that we don't get any further progress signalling) and delete widget
-+    QObject::disconnect( webView, SIGNAL(loadProgress(int)), q, SLOT(_pageLoadProgress(int)) );
-+    proxyWidget->deleteLater();
-+    proxyWidget = 0;
- }
- 
- void
-diff --git a/src/context/applets/wikipedia/WikipediaApplet_p.h b/src/context/applets/wikipedia/WikipediaApplet_p.h
-index d435b89..98bd007 100644
---- a/src/context/applets/wikipedia/WikipediaApplet_p.h
-+++ b/src/context/applets/wikipedia/WikipediaApplet_p.h
-@@ -65,6 +65,7 @@ public:
-         , settingsIcon( 0 )
-         , trackIcon( 0 )
-         , webView( 0 )
-+        , proxyWidget( 0 )
-         , aspectRatio( 0 )
-         , isForwardHistory( false )
-         , isBackwardHistory( false )
-@@ -128,6 +129,7 @@ public:
-     Plasma::IconWidget *settingsIcon;
-     Plasma::IconWidget *trackIcon;
-     WikipediaWebView *webView;
-+    QGraphicsProxyWidget *proxyWidget;
-     QStack<QUrl> historyBack;
-     QStack<QUrl> historyForward;
-     QUrl currentUrl;

diff --git a/amarok.spec b/amarok.spec
index a18b6e4..1c9bd85 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,21 +1,20 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.4.3
-Release: 4%{?dist}
+Version: 2.4.90
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Patch50: amarok-2.2.1.90-qtscript_not_required.patch
 
 ## upstream patches
-# https://projects.kde.org/projects/extragear/multimedia/amarok/repository/revisions/027340cd9a8e01762d0ec0aafb46f4b05a7d29e8 
-Patch100: amarok-2.5-wikipedia_load.patch
+Patch100: amarok-2.4.90-mygpo-qt-prefix.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -28,7 +27,7 @@ BuildRequires: liblastfm-devel
 BuildRequires: mysql-embedded-devel libaio-devel
 BuildRequires: pkgconfig(libgpod-1.0) >= 0.7.0
 BuildRequires: pkgconfig(libmtp) >= 0.3.0
-BuildRequires: pkgconfig(libmygpo-qt)
+BuildRequires: pkgconfig(libmygpo-qt) >= 1.0.5
 BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(loudmouth-1.0)
 BuildRequires: pkgconfig(qca2)
@@ -78,7 +77,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 #patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .wikipedia_load
+%patch100 -p1 -b .mygpo-qt-prefix
 
 
 %build
@@ -176,6 +175,9 @@ fi
 
 
 %changelog
+* Mon Nov 14 2011 Rex Dieter <rdieter@fedoraproject.org> 2.4.90-1
+- 2.4.90
+
 * Wed Nov 09 2011 Rex Dieter <rdieter@fedoraproject.org> 2.4.3-4
 - pkgconfig-style deps
 - drop extraneous/old BR's

diff --git a/sources b/sources
index bc71aac..9a3a501 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24e8141bcbd065448911fa872c50197d  amarok-2.4.3.tar.bz2
+92c77437c70f0086e91b4dc4842268c7  amarok-2.4.90.tar.bz2