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

2012-10-16 Thread Allan McRae
Date: Tuesday, October 16, 2012 @ 07:54:15
  Author: allan
Revision: 168850

db-move: moved pyqt from [staging] to [testing] (i686, x86_64)

Added:
  pyqt/repos/testing-i686/
  pyqt/repos/testing-i686/PKGBUILD
(from rev 168833, pyqt/repos/staging-i686/PKGBUILD)
  pyqt/repos/testing-x86_64/
  pyqt/repos/testing-x86_64/PKGBUILD
(from rev 168833, pyqt/repos/staging-x86_64/PKGBUILD)
Deleted:
  pyqt/repos/staging-i686/
  pyqt/repos/staging-x86_64/

-+
 testing-i686/PKGBUILD   |   90 ++
 testing-x86_64/PKGBUILD |   90 ++
 2 files changed, 180 insertions(+)

Copied: pyqt/repos/testing-i686/PKGBUILD (from rev 168833, 
pyqt/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-16 11:54:15 UTC (rev 168850)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+# Contributor: riai  Ben 
+
+pkgbase=pyqt
+pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
+pkgver=4.9.5
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro";
+license=('GPL')
+makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
+ 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
+source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz";)
+md5sums=('e4cdd6619c63655f7510efb4df8462fb')
+
+build() {
+  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
+
+  cd 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 ../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-common(){
+  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
+  
+  cd PyQt-x11-gpl-${pkgver}
+  make -C pyrcc DESTDIR="${pkgdir}" install
+  make -C pylupdate DESTDIR="${pkgdir}" install
+  
+  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+}
+
+package_pyqt(){
+  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
+  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+  'qscintilla: QScintilla API'
+  'qt-assistant-compat: add PyQt online help in Qt Assistant')
+
+  cd PyQt-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-common
+  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+}
+
+package_python2-pyqt(){
+  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
+  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+  'python2-opengl: enable OpenGL 3D graphics in PyQt applications'
+  'qscintilla: QScintilla API'
+  'qt-assistant-compat: add PyQt online help in Qt Assistant')
+  provides=('python2-qt')
+
+  cd Py2Qt-x11-gpl-${pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use 
DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Fix conflicts with pyqt
+  mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
+  
+  # Provided by pyqt
+  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
+  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+}

Copied: pyqt/repos/testing-x86_64/PKGBUILD (from rev 168833, 
pyqt/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-10-16 11:54:15 UTC (rev 168850)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+# Contributor: riai  Ben 
+
+pkgbase=pyqt
+pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
+pkgver=4.9.5
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro";
+license=('GPL')
+makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
+ 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
+source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz";)
+md5sums=('e4cdd6619c63655f7510efb4df8462fb')
+
+build() {
+  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver

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

2012-07-17 Thread Andrea Scarpino
Date: Tuesday, July 17, 2012 @ 14:11:04
  Author: andrea
Revision: 163679

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

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

---+
 extra-i686/PKGBUILD   |  192 
 extra-i686/fix-pyuic4.patch   |   91 ++
 extra-x86_64/PKGBUILD |  192 
 extra-x86_64/fix-pyuic4.patch |   91 ++
 4 files changed, 380 insertions(+), 186 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-07-17 18:10:36 UTC (rev 163678)
+++ extra-i686/PKGBUILD 2012-07-17 18:11:04 UTC (rev 163679)
@@ -1,93 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino 
-# Contributor: Douglas Soares de Andrade 
-# Contributor: riai  Ben 
-
-pkgbase=pyqt
-pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-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";)
-md5sums=('a0b6a820633366365af5124ddbd059c7')
-
-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-common(){
-  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
-  
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
-  make -C pyrcc DESTDIR="${pkgdir}" install
-  make -C pylupdate DESTDIR="${pkgdir}" install
-  make -C designer INSTALL_ROOT="${pkgdir}" install
-  
-  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_pyqt(){
-  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-  'qscintilla: QScintilla API'
-  'qt-assistant-compat: add PyQt online help in Qt Assistant')
-
-  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
-
-  # Provided by pyqt-common
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_python2-pyqt(){
-  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
-  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')
-  provides=('python2-qt')
-
-  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
-
-  # Fix conflicts with pyqt
-  mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
-  
-  # Provided by pyqt-common
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  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 163678, pyqt/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-07-17 18:11:04 UTC (rev 163679)
@@ -0,0 +1,99 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+# Contributor: riai  Ben 
+
+pkgbase=pyqt
+pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
+pkgver=4.9.4
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro";
+license=('GPL')
+ma

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

2012-06-28 Thread Andrea Scarpino
Date: Thursday, June 28, 2012 @ 03:30:01
  Author: andrea
Revision: 162690

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

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

---+
 testing-i686/PKGBUILD |  192 +++-
 testing-i686/fix-qthelp-build.patch   |   11 -
 testing-x86_64/PKGBUILD   |  192 +++-
 testing-x86_64/fix-qthelp-build.patch |   11 -
 4 files changed, 186 insertions(+), 220 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2012-06-28 07:29:34 UTC (rev 162689)
+++ testing-i686/PKGBUILD   2012-06-28 07:30:01 UTC (rev 162690)
@@ -1,99 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino 
-# Contributor: Douglas Soares de Andrade 
-# Contributor: riai  Ben 
-
-pkgbase=pyqt
-pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.3
-pkgrel=3
-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')
-
-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}
-
-  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-common(){
-  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
-  
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
-  make -C pyrcc DESTDIR="${pkgdir}" install
-  make -C pylupdate DESTDIR="${pkgdir}" install
-  make -C designer INSTALL_ROOT="${pkgdir}" install
-  
-  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_pyqt(){
-  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-  'qscintilla: QScintilla API'
-  'qt-assistant-compat: add PyQt online help in Qt Assistant')
-
-  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
-
-  # Provided by pyqt-common
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_python2-pyqt(){
-  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
-  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')
-  provides=('python2-qt')
-
-  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
-
-  # Fix conflicts with pyqt
-  mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
-  
-  # Provided by pyqt-common
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}

Copied: pyqt/repos/testing-i686/PKGBUILD (from rev 162689, pyqt/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-06-28 07:30:01 UTC (rev 162690)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+# Contributor: riai  Ben 
+
+pkgbase=pyqt
+pkgname=('pyqt-common' 'pyqt' 'py

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

2012-06-27 Thread Andrea Scarpino
Date: Wednesday, June 27, 2012 @ 15:19:52
  Author: andrea
Revision: 162666

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

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

---+
 staging-i686/PKGBUILD |   97 
 staging-i686/fix-qthelp-build.patch   |   11 +++
 staging-x86_64/PKGBUILD   |   97 
 staging-x86_64/fix-qthelp-build.patch |   11 +++
 4 files changed, 216 insertions(+)

Copied: pyqt/repos/staging-i686/PKGBUILD (from rev 162665, pyqt/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-06-27 19:19:52 UTC (rev 162666)
@@ -0,0 +1,97 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+# Contributor: riai  Ben 
+
+pkgbase=pyqt
+pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
+pkgver=4.9.3
+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')
+
+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}
+
+  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-common(){
+  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
+  
+  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  make -C designer INSTALL_ROOT="${pkgdir}" install
+  
+  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+}
+
+package_pyqt(){
+  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
+  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+  'qscintilla: QScintilla API'
+  'qt-assistant-compat: add PyQt online help in Qt Assistant')
+
+  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
+
+  # Provided by pyqt-common
+  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+}
+
+package_python2-pyqt(){
+  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
+  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
+  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')
+  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
+
+  # Fix conflicts with pyqt
+  mv "${pkgdir}"/usr/bin/{,python2-}pylupdate4
+  mv "${pkgdir}"/usr/bin/{,python2-}pyrcc4
+  mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
+  
+  # Provided by pyqt-common
+  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+}

Copied: pyqt/repos/staging-i686/fix-qthelp-build.patch (from rev 162665, 
pyqt/trunk/fix-qthelp-build.patch)
===
--- staging-i686/fix-qthelp-build.patch (rev 0)
+++ staging-i686/fix-qthelp-build.patch 2012-06-27 19:19:52 UTC (rev 162666)
@@ -0,0 +1,11 @@
+--- PyQt-x11-gpl-4.9.1/configure.py~   2012-02-13 20:16:11.418786488 +
 PyQt-x11-

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

2012-02-13 Thread Andrea Scarpino
Date: Tuesday, February 14, 2012 @ 02:26:39
  Author: andrea
Revision: 150170

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

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

---+
 staging-i686/PKGBUILD |   84 
 staging-i686/fix-qthelp-build.patch   |   11 
 staging-x86_64/PKGBUILD   |   84 
 staging-x86_64/fix-qthelp-build.patch |   11 
 4 files changed, 190 insertions(+)

Copied: pyqt/repos/staging-i686/PKGBUILD (from rev 150169, pyqt/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-02-14 07:26:39 UTC (rev 150170)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+# Contributor: riai  Ben 
+
+pkgbase=pyqt
+pkgname=('pyqt' 'python2-pyqt')
+pkgver=4.9.1
+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";
+'fix-qthelp-build.patch')
+md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c'
+ '6acfe0a5a00779f946c29d5fac647ce1')
+
+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}
+
+  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/staging-i686/fix-qthelp-build.patch (from rev 150169, 
pyqt/trunk/fix-qthelp-build.patch)
===
--- staging-i686/fix-qthelp-build.patch (rev 0)
+++ staging-i686/fix-qthelp-build.patch 2012-02-14 07:26:39 UTC (rev 150170)
@@ -0,0 +1,11 @@
+--- 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,

Copied: pyqt/repos/staging-x86_64/PKGBUILD (from rev 150169, 
pyqt/trunk/PKGBUILD)
===
--- staging-x86_64

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

2011-12-23 Thread Andrea Scarpino
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 
-# Contributor: Douglas Soares de Andrade 
-# Contributor: riai  Ben 
-
-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 
+# Contributor: Douglas Soares de Andrade 
+# Contributor: riai  Ben 
+
+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
+
+  # T