From e6b1af31631f560802fb7c7f8ba497858e9a90aa Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 3 Nov 2011 19:39:16 -0400 Subject: [PATCH] fixes to extra/pyqt, relbump to 1.1 --- extra/pyqt/PKGBUILD | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index 3fe1d3863..8fc1a19d9 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -4,14 +4,15 @@ # Contributor: riai Ben # ALARM: macau -# - Fix for qreal on v7h +# Kevin Mihelich +# - Fix for QReal on ARM, for both python versions plugrel=1 pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') pkgver=4.8.6 -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') @@ -27,11 +28,9 @@ build() { cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} cd "${srcdir}/PyQt-x11-gpl-${pkgver}" - - # ALARM: Fix for v7h - if [ "$CARCH" = "armv7h" ]; then - patch -Np1 -i ${srcdir}/PyQt4-4.7.3-qreal_float_support.patch - fi + + # ALARM: Fix for QReal + patch -Np1 -i ${srcdir}/PyQt4-4.7.3-qreal_float_support.patch python configure.py \ --confirm-license \ @@ -44,6 +43,10 @@ build() { ### Python2 version ### cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" + + # ALARM: Fix for QReal + patch -Np1 -i ${srcdir}/PyQt4-4.7.3-qreal_float_support.patch + python2 configure.py \ --confirm-license \ -v /usr/share/sip \