[rpms/amarok] epel10.2: fix context view when on kde48 (kde#290123)

[rpms/amarok] epel10.2: fix context view when on kde48 (kde#290123)

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 028c44aa62529f6025ee5392fd29fe8d7bec540d
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2012-01-27T08:13:02-06:00
Stats  : +66/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/028c44aa62529f6025ee5392fd29fe8d7bec540d?branch=epel10.2

Log:
fix context view when on kde48 (kde#290123)

---
diff --git a/amarok-2.5.0-kde48_context_view.patch b/amarok-2.5.0-kde48_context_view.patch
new file mode 100644
index 0000000..bc10491
--- /dev/null
+++ b/amarok-2.5.0-kde48_context_view.patch
@@ -0,0 +1,59 @@
+diff -up amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp.kde48-1 amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp
+--- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp.kde48-1	2011-12-15 01:36:48.000000000 -0600
++++ amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp	2012-01-27 08:07:40.125916151 -0600
+@@ -67,6 +67,19 @@ Context::AppletToolbar::~AppletToolbar()
+ }
+ 
+ void
++
++Context::AppletToolbar::setContainment( Containment * containment )
++{
++    m_cont = containment;
++}
++
++Context::Containment *
++Context::AppletToolbar::containment() const
++{
++    return m_cont;
++}
++
++void
+ Context::AppletToolbar::resizeEvent( QGraphicsSceneResizeEvent * event )
+ {
+     debug() << "setting layout to" << QRectF( QPointF( 0, 0 ), event->newSize() );
+diff -up amarok-2.5.0/src/context/toolbar/AppletToolbar.h.kde48-1 amarok-2.5.0/src/context/toolbar/AppletToolbar.h
+--- amarok-2.5.0/src/context/toolbar/AppletToolbar.h.kde48-1	2011-12-15 01:36:48.000000000 -0600
++++ amarok-2.5.0/src/context/toolbar/AppletToolbar.h	2012-01-27 08:07:40.123916180 -0600
+@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWi
+         
+         void appletRemoved( Plasma::Applet* applet );
+ 
++        void setContainment( Containment * containment );
++        Containment* containment() const;
++
+     signals:
+         void showApplet( Plasma::Applet* );
+         void appletAddedToToolbar( Plasma::Applet* applet, int loc );
+diff -up amarok-2.5.0/src/context/ToolbarView.cpp.kde48-1 amarok-2.5.0/src/context/ToolbarView.cpp
+--- amarok-2.5.0/src/context/ToolbarView.cpp.kde48-1	2011-12-15 01:36:48.000000000 -0600
++++ amarok-2.5.0/src/context/ToolbarView.cpp	2012-01-27 08:07:40.122916194 -0600
+@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasm
+     setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+ 
+     // now we create the toolbar
+-    m_toolbar = new AppletToolbar( containment );
++    m_toolbar = new AppletToolbar(0);
++    scene->addItem(m_toolbar.data());
++    m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) );
+     m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 );
+     m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 );
+ 
+@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasm
+ 
+ Context::ToolbarView::~ToolbarView()
+ {
+-
++    delete m_toolbar.data();
+ }
+ 
+ void

diff --git a/amarok.spec b/amarok.spec
index 024d5e8..bf49f61 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group: 	 Applications/Multimedia
 # KDE e.V. may determine that future GPL versions are accepted
@@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #Patch50: amarok-2.2.1.90-qtscript_not_required.patch
 
 ## upstream patches
+# https://bugs.kde.org/show_bug.cgi?id=290123
+Patch100: amarok-2.5.0-kde48_context_view.patch 
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -76,6 +78,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 #patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .kde48_context_view
 
 
 %build
@@ -173,6 +176,9 @@ fi
 
 
 %changelog
+* Fri Jan 27 2012 Rex Dieter <rdieter@fedoraproject.org> 2.5.0-3
+- fix context view when on kde48 (kde#290123)
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild