[arch-commits] Commit in (5 files)

Andrea Scarpino andrea at archlinux.org
Tue Jan 18 17:04:25 EST 2011


    Date: Tuesday, January 18, 2011 @ 17:04:25
  Author: andrea
Revision: 106740

add a pyqt package to remove conflicts between python-qt and python2-qt (FS#22391)

Added:
  pyqt/
  pyqt/repos/
  pyqt/trunk/
  pyqt/trunk/PKGBUILD
  pyqt/trunk/fix-stackedwidget-bug.patch

-----------------------------+
 PKGBUILD                    |   55 ++++++++++++++++++++++++++++++++++++++++++
 fix-stackedwidget-bug.patch |   11 ++++++++
 2 files changed, 66 insertions(+)

Added: pyqt/trunk/PKGBUILD
===================================================================
--- pyqt/trunk/PKGBUILD	                        (rev 0)
+++ pyqt/trunk/PKGBUILD	2011-01-18 22:04:25 UTC (rev 106740)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=pyqt
+pkgname=('pyqt' 'python-qt')
+pkgver=4.8.2
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro"
+license=('GPL')
+makedepends=('python-sip' 'qt' 'phonon' 'qt-assistant-compat')
+source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
+        'fix-stackedwidget-bug.patch')
+md5sums=('142a32f126f205a2bd77f6a9910f5333'
+        '42cfd44a8ec063cce3e328ddb9892565')
+
+build() {
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+
+  # Already fixed upstream
+  patch -Np1 -i ${srcdir}/fix-stackedwidget-bug.patch
+
+  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
+}
+
+package_pyqt(){
+  depends=""
+  pkgdesc="Python bindings common files"
+
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+}
+
+package_python-qt(){
+  pkgdesc="A set of Python 3 bindings for the Qt toolkit"
+  depends=('pyqt' 'python-sip' 'qt')
+  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 package
+  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
+}

Added: pyqt/trunk/fix-stackedwidget-bug.patch
===================================================================
--- pyqt/trunk/fix-stackedwidget-bug.patch	                        (rev 0)
+++ pyqt/trunk/fix-stackedwidget-bug.patch	2011-01-18 22:04:25 UTC (rev 106740)
@@ -0,0 +1,11 @@
+--- PyQt-x11-gpl-4.8.2/pyuic/uic/uiparser.py~	2010-12-27 14:01:31.500057960 -0800
++++ PyQt-x11-gpl-4.8.2/pyuic/uic/uiparser.py	2010-12-27 14:01:44.460058033 -0800
+@@ -158,7 +158,7 @@
+         # Ignore the parent if it is a container.
+         parent = self.stack.topwidget
+         if isinstance(parent, (QtGui.QDockWidget, QtGui.QMdiArea,
+-                               QtGui.QScrollArea, QtGui.StackedWidget,
++                               QtGui.QScrollArea, QtGui.QStackedWidget,
+                                QtGui.QToolBox, QtGui.QTabWidget,
+                                QtGui.QWizard)):
+             parent = None



More information about the arch-commits mailing list