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

[Andrea Scarpino]

    Date: Saturday, October 23, 2010 @ 06:41:02
  Author: andrea
Revision: 96651

upgpkg: pyqt 4.8.0-1
upstream release

Modified:
  pyqt/trunk/PKGBUILD
Deleted:
  pyqt/trunk/fix-kdebindings-4.5.2.patch

-----------------------------+
 PKGBUILD                    |   17 +++++++----------
 fix-kdebindings-4.5.2.patch |   17 -----------------
 2 files changed, 7 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-23 10:40:25 UTC (rev 96650)
+++ PKGBUILD	2010-10-23 10:41:02 UTC (rev 96651)
@@ -4,8 +4,9 @@
 # Contributor: riai <riai at bigfoot.com> Ben <ben at benmazer.net>
 
 pkgname=pyqt
-pkgver=4.7.7
-pkgrel=2
+pkgver=4.8.0
+_pkgver=4.8
+pkgrel=1
 pkgdesc="A set of Python bindings for the Qt toolkit"
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
@@ -19,16 +20,12 @@
 provides=('pyqt4')
 replaces=('pyqt4')
 conflicts=('pyqt4')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
-	'fix-kdebindings-4.5.2.patch')
-md5sums=('b7b30ab25ee976407b37052f2f724bce'
-	'8484f787214d55d23bc3b790fc80b450')
+source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${_pkgver}.tar.gz")
+md5sums=('003d195498eb42ca2daf7615fa01488d')
 
 build() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  cd ${srcdir}/PyQt-x11-gpl-${_pkgver}
 
-  patch -Np0 -i ${srcdir}/fix-kdebindings-4.5.2.patch
-  
   python2 configure.py \
     --confirm-license \
     -v /usr/share/sip \
@@ -41,7 +38,7 @@
 }
 
 package(){
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  cd ${srcdir}/PyQt-x11-gpl-${_pkgver}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 }

Deleted: fix-kdebindings-4.5.2.patch
===================================================================
--- fix-kdebindings-4.5.2.patch	2010-10-23 10:40:25 UTC (rev 96650)
+++ fix-kdebindings-4.5.2.patch	2010-10-23 10:41:02 UTC (rev 96651)
@@ -1,17 +0,0 @@
---- sip/QtCore/qglobal.sip~	2010-09-20 15:10:28.000000000 +0200
-+++ sip/QtCore/qglobal.sip	2010-09-30 15:00:13.804577344 +0200
-@@ -312,12 +312,12 @@ public:
-     // Qt.Alignment class.
-     QFlags operator|(int f);
- %MethodCode
--        sipRes = new QFlags(*a0 | (ENUM(a1)));
-+        sipRes = new QFlags(*a0 | a1);
- %End
- 
-     QFlags operator^(int f);
- %MethodCode
--        sipRes = new QFlags(*a0 ^ (ENUM(a1)));
-+        sipRes = new QFlags(*a0 ^ a1);
- %End
- 
-     // These are necessary to prevent Python comparing object IDs.