[arch-commits] Commit in pyqt/trunk (3 files)

[Andrea Scarpino]

    Date: Tuesday, February 14, 2012 @ 02:26:17
  Author: andrea
Revision: 150169

upgpkg: pyqt 4.9.1-1

Upstream release

Added:
  pyqt/trunk/fix-qthelp-build.patch
Modified:
  pyqt/trunk/PKGBUILD
Deleted:
  pyqt/trunk/fix-qthelp-build.patch

------------------------+
 PKGBUILD               |   18 +++++++++---------
 fix-qthelp-build.patch |   22 +++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-14 06:50:20 UTC (rev 150168)
+++ PKGBUILD	2012-02-14 07:26:17 UTC (rev 150169)
@@ -1,13 +1,12 @@
 # $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 # Contributor: riai <riai at bigfoot.com> Ben <ben at benmazer.net>
 
 pkgbase=pyqt
 pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.9
-pkgrel=2
+pkgver=4.9.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
@@ -15,14 +14,15 @@
              'python-opengl' 'qt-assistant-compat' 'qtwebkit')
 source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
         'fix-qthelp-build.patch')
-md5sums=('61619500d09d87b6c2a25bd3ea994504'
-         '356a453331a33c507b1baba4a9771764')
+md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c'
+         '6acfe0a5a00779f946c29d5fac647ce1')
 
 build() {
+  # Build QtHelp (FS#27665)
+  cd "${srcdir}"/PyQt-x11-gpl-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-qthelp-build.patch
+
   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}"

Deleted: fix-qthelp-build.patch
===================================================================
--- fix-qthelp-build.patch	2012-02-14 06:50:20 UTC (rev 150168)
+++ fix-qthelp-build.patch	2012-02-14 07:26:17 UTC (rev 150169)
@@ -1,11 +0,0 @@
---- 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,

Added: fix-qthelp-build.patch
===================================================================
--- fix-qthelp-build.patch	                        (rev 0)
+++ fix-qthelp-build.patch	2012-02-14 07:26:17 UTC (rev 150169)
@@ -0,0 +1,11 @@
+--- PyQt-x11-gpl-4.9.1/configure.py~	2012-02-13 20:16:11.418786488 +0000
++++ PyQt-x11-gpl-4.9.1/configure.py	2012-02-13 20:16:50.561809527 +0000
+@@ -1261,7 +1261,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,