diff options
| author | wiz <wiz> | 2010-04-16 13:49:29 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2010-04-16 13:49:29 +0000 |
| commit | c6a6f0966d824787d0714aa3a576dec3329a5bd3 (patch) | |
| tree | 68d884ccc05f69c81cd34891645c331e00f3c306 /audio/amarok/patches | |
| parent | 3059ccb7c4d5e4937b7c70f39523c6f4ab386889 (diff) | |
| download | pkgsrc-c6a6f0966d824787d0714aa3a576dec3329a5bd3.tar.gz | |
Upstream patch for Info applet crash.
Bump PKGREVISION.
Diffstat (limited to 'audio/amarok/patches')
| -rw-r--r-- | audio/amarok/patches/patch-aa | 50 | ||||
| -rw-r--r-- | audio/amarok/patches/patch-ac | 15 |
2 files changed, 65 insertions, 0 deletions
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 ); + |