[arch-commits] Commit in pyqt/repos (6 files)

Andrea Scarpino andrea at archlinux.org
Fri Dec 23 14:48:45 UTC 2011


    Date: Friday, December 23, 2011 @ 09:48:45
  Author: andrea
Revision: 145605

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  pyqt/repos/extra-i686/PKGBUILD
    (from rev 145604, pyqt/trunk/PKGBUILD)
  pyqt/repos/extra-i686/fix-qthelp-build.patch
    (from rev 145604, pyqt/trunk/fix-qthelp-build.patch)
  pyqt/repos/extra-x86_64/PKGBUILD
    (from rev 145604, pyqt/trunk/PKGBUILD)
  pyqt/repos/extra-x86_64/fix-qthelp-build.patch
    (from rev 145604, pyqt/trunk/fix-qthelp-build.patch)
Deleted:
  pyqt/repos/extra-i686/PKGBUILD
  pyqt/repos/extra-x86_64/PKGBUILD

-------------------------------------+
 extra-i686/PKGBUILD                 |  163 +++++++++++++++++-----------------
 extra-i686/fix-qthelp-build.patch   |   11 ++
 extra-x86_64/PKGBUILD               |  163 +++++++++++++++++-----------------
 extra-x86_64/fix-qthelp-build.patch |   11 ++
 4 files changed, 190 insertions(+), 158 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-12-23 14:48:19 UTC (rev 145604)
+++ extra-i686/PKGBUILD	2011-12-23 14:48:45 UTC (rev 145605)
@@ -1,79 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: 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=1
-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')
-
-build() {
-  cd "${srcdir}"
-  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
-  python configure.py \
-    --confirm-license \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-
-  ### Python2 version ###
-  cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
-  python2 configure.py \
-    --confirm-license \
-    -v /usr/share/sip \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-}
-
-package_pyqt(){
-  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python-qt')
-  provides=('python-qt')
-
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python2-pyqt(){
-  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
-  depends=('pyqt' 'python2-sip' 'dbus-python')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'python-opengl: enable OpenGL 3D graphics in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python2-qt')
-  provides=('python2-qt')
-  options=('!emptydirs')
-
-  cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Provided by pyqt
-  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
-  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
-}

Copied: pyqt/repos/extra-i686/PKGBUILD (from rev 145604, pyqt/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-12-23 14:48:45 UTC (rev 145605)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer:
+# Contributor: 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
+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"
+        '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}"
+  python configure.py \
+    --confirm-license \
+    --qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+
+  ### Python2 version ###
+  cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
+  python2 configure.py \
+    --confirm-license \
+    -v /usr/share/sip \
+    --qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+}
+
+package_pyqt(){
+  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
+  depends=('qtwebkit' 'python-sip')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+              'qscintilla: QScintilla API'
+              'qt-assistant-compat: add PyQt online help in Qt Assistant')
+  replaces=('python-qt')
+  provides=('python-qt')
+
+  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python2-pyqt(){
+  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
+  depends=('pyqt' 'python2-sip' 'dbus-python')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+              'python-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'qscintilla: QScintilla API'
+              'qt-assistant-compat: add PyQt online help in Qt Assistant')
+  replaces=('python2-qt')
+  provides=('python2-qt')
+  options=('!emptydirs')
+
+  cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Provided by pyqt
+  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
+  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
+}

Copied: pyqt/repos/extra-i686/fix-qthelp-build.patch (from rev 145604, pyqt/trunk/fix-qthelp-build.patch)
===================================================================
--- extra-i686/fix-qthelp-build.patch	                        (rev 0)
+++ extra-i686/fix-qthelp-build.patch	2011-12-23 14:48:45 UTC (rev 145605)
@@ -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,

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-12-23 14:48:19 UTC (rev 145604)
+++ extra-x86_64/PKGBUILD	2011-12-23 14:48:45 UTC (rev 145605)
@@ -1,79 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: 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=1
-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')
-
-build() {
-  cd "${srcdir}"
-  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
-  python configure.py \
-    --confirm-license \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-
-  ### Python2 version ###
-  cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
-  python2 configure.py \
-    --confirm-license \
-    -v /usr/share/sip \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-}
-
-package_pyqt(){
-  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python-qt')
-  provides=('python-qt')
-
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python2-pyqt(){
-  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
-  depends=('pyqt' 'python2-sip' 'dbus-python')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'python-opengl: enable OpenGL 3D graphics in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python2-qt')
-  provides=('python2-qt')
-  options=('!emptydirs')
-
-  cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Provided by pyqt
-  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
-  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
-}

Copied: pyqt/repos/extra-x86_64/PKGBUILD (from rev 145604, pyqt/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-12-23 14:48:45 UTC (rev 145605)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer:
+# Contributor: 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
+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"
+        '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}"
+  python configure.py \
+    --confirm-license \
+    --qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+
+  ### Python2 version ###
+  cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
+  python2 configure.py \
+    --confirm-license \
+    -v /usr/share/sip \
+    --qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+}
+
+package_pyqt(){
+  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
+  depends=('qtwebkit' 'python-sip')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+              'qscintilla: QScintilla API'
+              'qt-assistant-compat: add PyQt online help in Qt Assistant')
+  replaces=('python-qt')
+  provides=('python-qt')
+
+  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python2-pyqt(){
+  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
+  depends=('pyqt' 'python2-sip' 'dbus-python')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+              'python-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'qscintilla: QScintilla API'
+              'qt-assistant-compat: add PyQt online help in Qt Assistant')
+  replaces=('python2-qt')
+  provides=('python2-qt')
+  options=('!emptydirs')
+
+  cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Provided by pyqt
+  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
+  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
+}

Copied: pyqt/repos/extra-x86_64/fix-qthelp-build.patch (from rev 145604, pyqt/trunk/fix-qthelp-build.patch)
===================================================================
--- extra-x86_64/fix-qthelp-build.patch	                        (rev 0)
+++ extra-x86_64/fix-qthelp-build.patch	2011-12-23 14:48:45 UTC (rev 145605)
@@ -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,




More information about the arch-commits mailing list