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

[Andrea Scarpino]

Date: Thursday, June 28, 2012 @ 03:29:34
  Author: andrea
Revision: 162689

upgpkg: pyqt 4.9.4-1

Upstream release

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

+
 PKGBUILD   |   14 --
 fix-qthelp-build.patch |   11 ---
 2 files changed, 4 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-28 07:00:06 UTC (rev 162688)
+++ PKGBUILD2012-06-28 07:29:34 UTC (rev 162689)
@@ -5,23 +5,17 @@
 
 pkgbase=pyqt
 pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.3
-pkgrel=3
+pkgver=4.9.4
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://riverbankcomputing.co.uk/software/pyqt/intro;
 license=('GPL')
 makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
  'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
-source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
-'fix-qthelp-build.patch')
-md5sums=('223f75c55f1c38c46bd164cdd4996a43'
- '6acfe0a5a00779f946c29d5fac647ce1')
+ 
source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;)
+md5sums=('a0b6a820633366365af5124ddbd059c7')
 
 build() {
-  # Build QtHelp (FS#27665)
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  patch -p1 -i ${srcdir}/fix-qthelp-build.patch
-
   cd ${srcdir}
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
 

Deleted: fix-qthelp-build.patch
===
--- fix-qthelp-build.patch  2012-06-28 07:00:06 UTC (rev 162688)
+++ fix-qthelp-build.patch  2012-06-28 07:29:34 UTC (rev 162689)
@@ -1,11 +0,0 @@
 PyQt-x11-gpl-4.9.1/configure.py~   2012-02-13 20:16:11.418786488 +
-+++ PyQt-x11-gpl-4.9.1/configure.py2012-02-13 20:16:50.561809527 +
-@@ -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,

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

[Andrea Scarpino]

Date: Friday, December 23, 2011 @ 09:48:19
  Author: andrea
Revision: 145604

upgpkg: pyqt 4.9-2

Build QtHelp module (FS#27665)

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

+
 PKGBUILD   |   11 ---
 fix-qthelp-build.patch |   11 +++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-23 11:17:35 UTC (rev 145603)
+++ PKGBUILD2011-12-23 14:48:19 UTC (rev 145604)
@@ -7,17 +7,22 @@
 pkgbase=pyqt
 pkgname=('pyqt' 'python2-pyqt')
 pkgver=4.9
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://riverbankcomputing.co.uk/software/pyqt/intro;
 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;)
-md5sums=('61619500d09d87b6c2a25bd3ea994504')
+source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
+'fix-qthelp-build.patch')
+md5sums=('61619500d09d87b6c2a25bd3ea994504'
+ '356a453331a33c507b1baba4a9771764')
 
 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}

Added: fix-qthelp-build.patch
===
--- fix-qthelp-build.patch  (rev 0)
+++ fix-qthelp-build.patch  2011-12-23 14:48:19 UTC (rev 145604)
@@ -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,