[arch-commits] Commit in pyqt/trunk (PKGBUILD fix-stackedwidget-bug.patch)

[Andrea Scarpino]

    Date: Monday, December 27, 2010 @ 17:06:25
  Author: andrea
Revision: 104068

upgpkg: pyqt 4.8.2-2
Fix QStackedWidget bug (FS#22230)

Added:
  pyqt/trunk/fix-stackedwidget-bug.patch
Modified:
  pyqt/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   11 ++++++++---
 fix-stackedwidget-bug.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-27 17:22:33 UTC (rev 104067)
+++ PKGBUILD	2010-12-27 22:06:25 UTC (rev 104068)
@@ -5,7 +5,7 @@
 
 pkgname=pyqt
 pkgver=4.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of Python bindings for the Qt toolkit"
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
@@ -19,12 +19,17 @@
 provides=('pyqt4')
 replaces=('pyqt4')
 conflicts=('pyqt4')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('142a32f126f205a2bd77f6a9910f5333')
+source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
+        'fix-stackedwidget-bug.patch')
+md5sums=('142a32f126f205a2bd77f6a9910f5333'
+        '42cfd44a8ec063cce3e328ddb9892565')
 
 build() {
   cd ${srcdir}/PyQt-x11-gpl-${pkgver}
 
+  # Already fixed upstream
+  patch -Np1 -i ${srcdir}/fix-stackedwidget-bug.patch
+
   python2 configure.py \
     --confirm-license \
     -v /usr/share/sip \

Added: fix-stackedwidget-bug.patch
===================================================================
--- fix-stackedwidget-bug.patch	                        (rev 0)
+++ fix-stackedwidget-bug.patch	2010-12-27 22:06:25 UTC (rev 104068)
@@ -0,0 +1,11 @@
+--- PyQt-x11-gpl-4.8.2/pyuic/uic/uiparser.py~	2010-12-27 14:01:31.500057960 -0800
++++ PyQt-x11-gpl-4.8.2/pyuic/uic/uiparser.py	2010-12-27 14:01:44.460058033 -0800
+@@ -158,7 +158,7 @@
+         # Ignore the parent if it is a container.
+         parent = self.stack.topwidget
+         if isinstance(parent, (QtGui.QDockWidget, QtGui.QMdiArea,
+-                               QtGui.QScrollArea, QtGui.StackedWidget,
++                               QtGui.QScrollArea, QtGui.QStackedWidget,
+                                QtGui.QToolBox, QtGui.QTabWidget,
+                                QtGui.QWizard)):
+             parent = None