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

[Andrea Scarpino]

    Date: Wednesday, October 6, 2010 @ 16:45:18
  Author: andrea
Revision: 94353

upgpkg: pyqt 4.7.7-1
upstream release + fix to build kdebindings

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

-----------------------------+
 PKGBUILD                    |   19 +++++++++++++------
 fix-kdebindings-4.5.2.patch |   17 +++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-06 20:41:43 UTC (rev 94352)
+++ PKGBUILD	2010-10-06 20:45:18 UTC (rev 94353)
@@ -4,23 +4,30 @@
 # Contributor: riai <riai at bigfoot.com> Ben <ben at benmazer.net>
 
 pkgname=pyqt
-pkgver=4.7.4
-pkgrel=3
+pkgver=4.7.7
+pkgrel=1
 pkgdesc="A set of Python bindings for the Qt toolkit"
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
 depends=('sip' 'qt' 'dbus-python')
-makedepends=('phonon' 'python-opengl')
-optdepends=('phonon' 'python-opengl' 'qscintilla')
+makedepends=('phonon' 'python-opengl' 'qt-assistant-compat')
+optdepends=('phonon: enable audio and video in PyQt applications'
+	'python-opengl: enable OpenGL 3D graphics in PyQt applications'
+	'qscintilla: QScintilla API'
+	'qt-assistant-compat: add PyQt online help in Qt Assistant')
 provides=('pyqt4')
 replaces=('pyqt4')
 conflicts=('pyqt4')
-source=("http://pyqwt.sourceforge.net/support/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('88e9f1bc467cccf424d2032e3470982c')
+source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
+	'fix-kdebindings-4.5.2.patch')
+md5sums=('b7b30ab25ee976407b37052f2f724bce'
+	'8484f787214d55d23bc3b790fc80b450')
 
 build() {
   cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+
+  patch -Np0 -i ${srcdir}/fix-kdebindings-4.5.2.patch
   
   python2 configure.py \
     --confirm-license \

Added: fix-kdebindings-4.5.2.patch
===================================================================
--- fix-kdebindings-4.5.2.patch	                        (rev 0)
+++ fix-kdebindings-4.5.2.patch	2010-10-06 20:45:18 UTC (rev 94353)
@@ -0,0 +1,17 @@
+--- 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.