rpms/amarok/F-13 a62fed8c667a076daa21fdf8360708813f1bf9e0.patch, NONE, 1.1 amarok.spec, 1.185, 1.186

Mon Mar 22 15:36:52 UTC 2010

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15278

Modified Files:
	amarok.spec 
Added Files:
	a62fed8c667a076daa21fdf8360708813f1bf9e0.patch 
Log Message:
* Mon Mar 22 2010 Rex Dietr <rdieter at fedoraproject.org>  - 2.3.0-3
- workaround info applet crasher (kde#227639,kde#229756)


a62fed8c667a076daa21fdf8360708813f1bf9e0.patch:
 InfoApplet.cpp |   19 +++++++++++++------
 InfoApplet.h   |    3 ++-
 2 files changed, 15 insertions(+), 7 deletions(-)

--- NEW FILE a62fed8c667a076daa21fdf8360708813f1bf9e0.patch ---
>From a62fed8c667a076daa21fdf8360708813f1bf9e0 Mon Sep 17 00:00:00 2001
From: Nikolaj Hald Nielsen <nhn at kde.org>
Date: Mon, 22 Mar 2010 09:46:32 +0100
Subject: [PATCH] Work around crash in the Info applet caused by a bug in certain versions of Qt.

BUG: 229756
BUG: 227639
---
 src/context/applets/info/InfoApplet.cpp |   19 +++++++++++++------
 src/context/applets/info/InfoApplet.h   |    2 ++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/context/applets/info/InfoApplet.cpp b/src/context/applets/info/InfoApplet.cpp
index 166da4c..e415e98 100644
--- a/src/context/applets/info/InfoApplet.cpp
+++ b/src/context/applets/info/InfoApplet.cpp
@@ -40,18 +40,30 @@ QString InfoApplet::s_defaultHtml = "<html>"
 
 InfoApplet::InfoApplet( QObject* parent, const QVariantList& args )
     : Context::Applet( parent, args )
+    , m_webView( 0 )
     , m_initialized( false )
     , m_currentPlaylist( 0 )
+   
 {
     setHasConfigurationInterface( false );
     setBackgroundHints( Plasma::Applet::NoBackground );
+}
+
+InfoApplet::~InfoApplet()
+{
+    delete m_webView;
+}
+
+
+void  InfoApplet::init()
+{
 
     dataEngine( "amarok-info" )->connectSource( "info", this );
 
     m_webView = new AmarokWebView( this );
 
     resize( 500, -1 );
-    
+
     QPalette p = m_webView->palette();
     p.setColor( QPalette::Dark, QColor( 255, 255, 255, 0)  );
     p.setColor( QPalette::Window, QColor( 255, 255, 255, 0)  );
@@ -62,11 +74,6 @@ InfoApplet::InfoApplet( QObject* parent, const QVariantList& args )
     constraintsEvent();
 }
 
-InfoApplet::~InfoApplet()
-{
-    delete m_webView;
-}
-
 void InfoApplet::constraintsEvent( Plasma::Constraints constraints )
 {
     Q_UNUSED( constraints )
diff --git a/src/context/applets/info/InfoApplet.h b/src/context/applets/info/InfoApplet.h
index 4be28fc..775ea7c 100644
--- a/src/context/applets/info/InfoApplet.h
+++ b/src/context/applets/info/InfoApplet.h
@@ -48,6 +48,8 @@ public:
     InfoApplet( QObject* parent, const QVariantList& args );
     virtual ~InfoApplet();
 
+    void init();
+
     void paintInterface( QPainter *painter, const QStyleOptionGraphicsItem *option, const QRect &contentsRect );
     void constraintsEvent( Plasma::Constraints constraints = Plasma::AllConstraints );
 
-- 
1.6.1



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-13/amarok.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- amarok.spec	11 Mar 2010 08:18:40 -0000	1.185
+++ amarok.spec	22 Mar 2010 15:36:52 -0000	1.186
@@ -2,17 +2,22 @@
 Name:    amarok
 Summary: Media player
 Version: 2.3.0
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Source0: http://download.kde.org/stable/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
+# http://bugs.kde.org/227639
+# http://bugs.kde.org/229756
+Patch100: http://gitorious.org/amarok/amarok/commit/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch
+# may need to rebase this, for building with qt-4.7
+# http://gitorious.org/amarok/amarok/commit/aa5ca5d179d084e99c8a477084ba717c35aa5030
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -64,7 +69,6 @@ Amarok is a multimedia player with:
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-%{?kde4_version:Requires: kdelibs4%{?_isa} >= %{kde4_version}}
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %description libs
 %{summary}.
@@ -83,6 +87,8 @@ Obsoletes: amarok-utilities < 2.0.96
 
 %patch50 -p1 -b .qtscript_not_required
 
+%patch100 -p1 -b .info_applet_workaround 
+
 
 %build
 mkdir -p %{_target_platform}
@@ -174,6 +180,13 @@ fi
 
 
 %changelog
+* Mon Mar 22 2010 Rex Dietr <rdieter at fedoraproject.org>  - 2.3.0-3
+- workaround info applet crasher (kde#227639,kde#229756)
+
+* Thu Mar 11 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.0-2
+- fix Source0 URL
+- -libs: drop unused/extraneous kdelibs4 dep
+
 * Thu Mar 11 2010 Thomas Janssen thomasj at fedoraproject.org> 2.3.0-1
 - amarok 2.3.0
 

