extra/pyqt to 4.9-2

This commit is contained in:
Kevin Mihelich 2011-12-24 01:28:57 -05:00
parent 6c8b5b2011
commit 965f57bd67
2 changed files with 18 additions and 2 deletions

View file

@ -11,7 +11,7 @@ plugrel=1
pkgbase=pyqt pkgbase=pyqt
pkgname=('pyqt' 'python2-pyqt') pkgname=('pyqt' 'python2-pyqt')
pkgver=4.8.6 pkgver=4.9
pkgrel=2 pkgrel=2
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://riverbankcomputing.co.uk/software/pyqt/intro" url="http://riverbankcomputing.co.uk/software/pyqt/intro"
@ -19,12 +19,17 @@ license=('GPL')
makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
'python-opengl' 'qt-assistant-compat' 'qtwebkit') 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz" source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
"fix-qthelp-build.patch"
"PyQt4-4.7.3-qreal_float_support.patch") "PyQt4-4.7.3-qreal_float_support.patch")
md5sums=('9bfd7b08b8e438b83cc50d5c58191f97' md5sums=('61619500d09d87b6c2a25bd3ea994504'
'356a453331a33c507b1baba4a9771764'
'a20d7022e91071f838bd4908851a0f7b') 'a20d7022e91071f838bd4908851a0f7b')
build() { build() {
cd "${srcdir}" cd "${srcdir}"
patch -p0 -i "${srcdir}"/fix-qthelp-build.patch
cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
cd "${srcdir}/PyQt-x11-gpl-${pkgver}" cd "${srcdir}/PyQt-x11-gpl-${pkgver}"

View file

@ -0,0 +1,11 @@
--- PyQt-x11-gpl-4.9/configure.py~ 2011-12-23 14:53:07.981490550 +0100
+++ PyQt-x11-gpl-4.9/configure.py 2011-12-23 14:52:38.384984221 +0100
@@ -1264,7 +1264,7 @@
opengl = (mname == "QtOpenGL")
qt = [mname]
- if mname in ("QtOpenGL", "QtWebKit"):
+ if mname in ("QtHelp", "QtOpenGL", "QtWebKit"):
qt.append("QtCore")
makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,