summaryrefslogtreecommitdiff
path: root/extra/pyqt
diff options
context:
space:
mode:
Diffstat (limited to 'extra/pyqt')
-rw-r--r--extra/pyqt/PKGBUILD25
-rw-r--r--extra/pyqt/fix-pyuic4.patch91
-rw-r--r--extra/pyqt/fix-qthelp-build.patch11
3 files changed, 14 insertions, 113 deletions
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index 441bdda15..ff4e2ca59 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 173040 2012-12-09 15:29:07Z andrea $
+# $Id: PKGBUILD 183563 2013-04-23 13:10:46Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
pkgbase=pyqt
pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.6
+pkgver=4.10.1
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://riverbankcomputing.co.uk/software/pyqt/intro"
license=('GPL')
-makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
+makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('514e1f9597771dc732ba75ba9fa5c6b6')
+md5sums=('e5973c4ec0b0469f329bc00209d2ad9c')
build() {
cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
@@ -21,7 +21,8 @@ build() {
cd PyQt-x11-gpl-${pkgver}
python configure.py \
--confirm-license \
- --qsci-api
+ --qsci-api \
+ -q /usr/bin/qmake-qt4
# Thanks Gerardo for the rpath fix
find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
@@ -33,22 +34,24 @@ build() {
python2 configure.py \
--confirm-license \
-v /usr/share/sip \
- --qsci-api
+ --qsci-api \
+ -q /usr/bin/qmake-qt4
# 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"
+ depends=('qt4')
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
+ install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
}
package_pyqt(){
@@ -64,7 +67,7 @@ package_pyqt(){
# Provided by pyqt-common
rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
- rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+ rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
}
package_python2-pyqt(){
@@ -85,6 +88,6 @@ package_python2-pyqt(){
# 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
+ rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpythonplugin.so
+ rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
}
diff --git a/extra/pyqt/fix-pyuic4.patch b/extra/pyqt/fix-pyuic4.patch
deleted file mode 100644
index 2173443d8..000000000
--- a/extra/pyqt/fix-pyuic4.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-# HG changeset patch
-# User Phil Thompson <phil at riverbankcomputing.com>
-# Date 2012-07-13 13:39:28 +0100
-# Node ID 29b668ada14c1428a3bbfe8f0324c6626bd5ac9a
-# Parent fd0f3da9d79ca9858d10a20c15fb85456cb832d7
-Fixed a regression in pyuic's handling of custom widgets.
-
-diff --git a/pyuic/uic/Compiler/qobjectcreator.py b/pyuic/uic/Compiler/qobjectcreator.py
---- a/pyuic/uic/Compiler/qobjectcreator.py
-+++ b/pyuic/uic/Compiler/qobjectcreator.py
-@@ -1,6 +1,6 @@
- #############################################################################
- ##
--## Copyright (C) 2011 Riverbank Computing Limited.
-+## Copyright (C) 2012 Riverbank Computing Limited.
- ## Copyright (C) 2006 Thorsten Marek.
- ## All right reserved.
- ##
-@@ -100,7 +100,6 @@
- assert widgetClass not in self._widgets
- self._widgets[widgetClass] = (baseClass, module)
-
--
- def _resolveBaseclass(self, baseClass):
- try:
- for x in range(0, 10):
-@@ -114,19 +113,17 @@
- except KeyError:
- raise ValueError("unknown baseclass %s" % baseClass)
-
--
- def search(self, cls):
- try:
-- self._usedWidgets.add(cls)
- baseClass = self._resolveBaseclass(self._widgets[cls][0])
- DEBUG("resolved baseclass of %s: %s" % (cls, baseClass))
--
-- return type(cls, (baseClass,),
-- {"module" : ""})
--
- except KeyError:
- return None
-
-+ self._usedWidgets.add(cls)
-+
-+ return type(cls, (baseClass, ), {"module" : ""})
-+
- def _writeImportCode(self):
- imports = {}
- for widget in self._usedWidgets:
-diff --git a/pyuic/uic/objcreator.py b/pyuic/uic/objcreator.py
---- a/pyuic/uic/objcreator.py
-+++ b/pyuic/uic/objcreator.py
-@@ -102,19 +102,26 @@
- self._modules.append(self._customWidgets)
-
- def createQObject(self, classname, *args, **kwargs):
-- # Handle scoped names, typically static factory methods.
-- parts = classname.split('.')
-- factory = self.findQObjectType(parts[0])
-+ # Handle regular and custom widgets.
-+ factory = self.findQObjectType(classname)
-
-- if factory is not None:
-- for part in parts[1:]:
-- factory = getattr(factory, part, None)
-- if factory is None:
-- break
-- else:
-- return self._cpolicy.instantiate(factory, *args, **kwargs)
-+ if factory is None:
-+ # Handle scoped names, typically static factory methods.
-+ parts = classname.split('.')
-
-- raise NoSuchWidgetError(classname)
-+ if len(parts) > 1:
-+ factory = self.findQObjectType(parts[0])
-+
-+ if factory is not None:
-+ for part in parts[1:]:
-+ factory = getattr(factory, part, None)
-+ if factory is None:
-+ break
-+
-+ if factory is None:
-+ raise NoSuchWidgetError(classname)
-+
-+ return self._cpolicy.instantiate(factory, *args, **kwargs)
-
- def invoke(self, rname, method, args=()):
- return self._cpolicy.invoke(rname, method, args)
diff --git a/extra/pyqt/fix-qthelp-build.patch b/extra/pyqt/fix-qthelp-build.patch
deleted file mode 100644
index 6055f9f35..000000000
--- a/extra/pyqt/fix-qthelp-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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,
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-10-27 11:33:41 +0000