From 965f57bd67b9f105fc41c321b533c8669cb10165 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 24 Dec 2011 01:28:57 -0500 Subject: [PATCH] extra/pyqt to 4.9-2 --- extra/pyqt/PKGBUILD | 9 +++++++-- extra/pyqt/fix-qthelp-build.patch | 11 +++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 extra/pyqt/fix-qthelp-build.patch diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index 66c066f16..0b33efc0d 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -11,7 +11,7 @@ plugrel=1 pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') -pkgver=4.8.6 +pkgver=4.9 pkgrel=2 arch=('i686' 'x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro" @@ -19,12 +19,17 @@ license=('GPL') makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' 'python-opengl' 'qt-assistant-compat' 'qtwebkit') 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") -md5sums=('9bfd7b08b8e438b83cc50d5c58191f97' +md5sums=('61619500d09d87b6c2a25bd3ea994504' + '356a453331a33c507b1baba4a9771764' 'a20d7022e91071f838bd4908851a0f7b') build() { cd "${srcdir}" + + patch -p0 -i "${srcdir}"/fix-qthelp-build.patch + cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} cd "${srcdir}/PyQt-x11-gpl-${pkgver}" diff --git a/extra/pyqt/fix-qthelp-build.patch b/extra/pyqt/fix-qthelp-build.patch new file mode 100644 index 000000000..cf0cbf171 --- /dev/null +++ b/extra/pyqt/fix-qthelp-build.patch @@ -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,