From da7de552dc08fb70a2d624dd248c3cea4d5a21fe Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mar 22 2010 15:36:52 +0000 Subject: - workaround info applet crasher (kde#227639,kde#229756) --- diff --git a/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch b/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch new file mode 100644 index 0000000..03e9257 --- /dev/null +++ b/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch @@ -0,0 +1,76 @@ +From a62fed8c667a076daa21fdf8360708813f1bf9e0 Mon Sep 17 00:00:00 2001 +From: Nikolaj Hald Nielsen +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 = "" + + 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 + diff --git a/amarok.spec b/amarok.spec index bd527e1..407c926 100644 --- a/amarok.spec +++ b/amarok.spec @@ -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 - 2.3.0-3 +- workaround info applet crasher (kde#227639,kde#229756) + +* Thu Mar 11 2010 Rex Dieter - 2.3.0-2 +- fix Source0 URL +- -libs: drop unused/extraneous kdelibs4 dep + * Thu Mar 11 2010 Thomas Janssen thomasj@fedoraproject.org> 2.3.0-1 - amarok 2.3.0