[arch-commits] Commit in amarok/trunk (PKGBUILD contextviewfix.patch)

[Ronald van Haren]

    Date: Wednesday, June 27, 2012 @ 16:00:04
  Author: ronald
Revision: 162670

upgpkg: amarok 2.5.0-4

add contextviewfix.patch for FS#30448

Added:
  amarok/trunk/contextviewfix.patch
Modified:
  amarok/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   12 +++++++++---
 contextviewfix.patch |   14 ++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-27 19:56:06 UTC (rev 162669)
+++ PKGBUILD	2012-06-27 20:00:04 UTC (rev 162670)
@@ -6,7 +6,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
@@ -23,10 +23,12 @@
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
 	"toolbarfix.patch"
-	"amarok-2.5.0-ffmpeg-fixes.patch")
+	"amarok-2.5.0-ffmpeg-fixes.patch"
+	"contextviewfix.patch")
 sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2'
           'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f'
-          '61193ccc48e9f99b4856eef27fe7a4aaf465feec')
+          '61193ccc48e9f99b4856eef27fe7a4aaf465feec'
+          'a95e3bfb177adacc268552ae479dd88b70f5f9e1')
 
 build() {
   cd "${srcdir}"
@@ -34,6 +36,10 @@
   patch -Np0 -i "${srcdir}"/toolbarfix.patch
   patch -Np0 -i "${srcdir}"/amarok-2.5.0-ffmpeg-fixes.patch
 
+  pushd ${pkgname}-${pkgver}
+  patch -Np1 -i "${srcdir}"/contextviewfix.patch # FS#30448
+  popd
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \

Added: contextviewfix.patch
===================================================================
--- contextviewfix.patch	                        (rev 0)
+++ contextviewfix.patch	2012-06-27 20:00:04 UTC (rev 162670)
@@ -0,0 +1,14 @@
+diff --git a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
+index a23305f..8fa6f9b 100644
+--- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
++++ b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
+@@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry()
+     if(!view())
+         return;
+ 
+-    QRectF rect = view()->sceneRect();
++    // mimic ContextView::resizeEvent(), nothing else seems to work, bug 292895
++    QRectF rect( view()->pos(), view()->maximumViewportSize() );
+     setGeometry( rect );
+     m_applets->setGeometry( rect );
+     m_applets->refresh();
\ No newline at end of file