Upstream patch for Info applet crash.

Bump PKGREVISION.

4 files changed, 70 insertions, 3 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index bdf162131ef..2f17b7c1457 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.81 2010/04/10 02:49:36 markd Exp $
+# $NetBSD: Makefile,v 1.82 2010/04/16 13:49:29 wiz Exp $
 #
 
 DISTNAME=	amarok-${VERS}
 VERS=		2.3.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio multimedia
 #MASTER_SITES=	http://download.kde.org/unstable/amarok/${VERS}/src/ \
 #		ftp://gd.tuwien.ac.at/kde/unstable/amarok/${VERS}/src/
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 4fe9acd16f4..3740ede86e4 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.39 2010/03/16 19:28:50 wiz Exp $
+$NetBSD: distinfo,v 1.40 2010/04/16 13:49:29 wiz Exp $
 
 SHA1 (amarok-2.3.0.tar.bz2) = 64856a21907d1ba7d198149a8a46276fc4cda7a6
 RMD160 (amarok-2.3.0.tar.bz2) = ff2a7cea8ffbd0e6b08a9b37ab7529e1b1d43a37
 Size (amarok-2.3.0.tar.bz2) = 9391281 bytes
+SHA1 (patch-aa) = 8d4ceda127a7932cce35b2d0308fb3e555bc84d6
 SHA1 (patch-ab) = 91e6bf8a84d63832641b6270c6f5215baa8f139e
+SHA1 (patch-ac) = cb03c67a811280eafcdb74f4211648cb171edc03
diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa
new file mode 100644
index 00000000000..48a871c895e
--- /dev/null
+++ b/audio/amarok/patches/patch-aa
@@ -0,0 +1,50 @@
+$NetBSD: patch-aa,v 1.17 2010/04/16 13:49:29 wiz Exp $
+
+Upstream patch for Info applet crash.
+
+--- src/context/applets/info/InfoApplet.cpp.orig	2010-03-10 23:12:15.000000000 +0000
++++ src/context/applets/info/InfoApplet.cpp
+@@ -40,18 +40,30 @@ QString InfoApplet::s_defaultHtml = "<ht
+ 
+ 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,
+     constraintsEvent();
+ }
+ 
+-InfoApplet::~InfoApplet()
+-{
+-    delete m_webView;
+-}
+-
+ void InfoApplet::constraintsEvent( Plasma::Constraints constraints )
+ {
+     Q_UNUSED( constraints )
diff --git a/audio/amarok/patches/patch-ac b/audio/amarok/patches/patch-ac
new file mode 100644
index 00000000000..d26c8ee966d
--- /dev/null
+++ b/audio/amarok/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.6 2010/04/16 13:49:29 wiz Exp $
+
+Upstream patch for Info applet crash.
+
+--- src/context/applets/info/InfoApplet.h.orig	2010-03-10 23:12:15.000000000 +0000
++++ 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 );
+