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

[Andrea Scarpino]

    Date: Monday, January 24, 2011 @ 12:30:35
  Author: andrea
Revision: 107406

prepare next release

Modified:
  python-qt/trunk/PKGBUILD	(contents, properties)
Deleted:
  python-qt/trunk/fix-stackedwidget-bug.patch

-----------------------------+
 PKGBUILD                    |   13 ++++---------
 fix-stackedwidget-bug.patch |   11 -----------
 2 files changed, 4 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-24 17:30:26 UTC (rev 107405)
+++ PKGBUILD	2011-01-24 17:30:35 UTC (rev 107406)
@@ -2,8 +2,8 @@
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=python-qt
-pkgver=4.8.2
-pkgrel=4
+pkgver=4.8.3
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
@@ -13,17 +13,12 @@
 	'qscintilla: QScintilla API'
 	'qt-assistant-compat: add PyQt online help in Qt Assistant')
 makedepends=('phonon' 'qt-assistant-compat')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
-        'fix-stackedwidget-bug.patch')
-md5sums=('142a32f126f205a2bd77f6a9910f5333'
-        '42cfd44a8ec063cce3e328ddb9892565')
+source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
+md5sums=('d54fd1c37a74864faf42709c8102f254')
 
 build() {
   cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
 
-  # Already fixed upstream
-  patch -Np1 -i "${srcdir}/fix-stackedwidget-bug.patch"
-
   python configure.py \
     --confirm-license \
     --qsci-api


Property changes on: python-qt/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
   + Id

Deleted: fix-stackedwidget-bug.patch
===================================================================
--- fix-stackedwidget-bug.patch	2011-01-24 17:30:26 UTC (rev 107405)
+++ fix-stackedwidget-bug.patch	2011-01-24 17:30:35 UTC (rev 107406)
@@ -1,11 +0,0 @@
---- 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