summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extra/pyqt/.footprint45
-rw-r--r--extra/pyqt/.md5sum4
-rw-r--r--extra/pyqt/Pkgfile18
-rw-r--r--extra/pyqt/fix-stackedwidget-bug.patch12
4 files changed, 66 insertions, 13 deletions
diff --git a/extra/pyqt/.footprint b/extra/pyqt/.footprint
index 697b0f769..55b4fc7b2 100644
--- a/extra/pyqt/.footprint
+++ b/extra/pyqt/.footprint
@@ -9,11 +9,13 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/
drwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/Qt.so
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/QtCore.so
+-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/QtDeclarative.so
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/QtDesigner.so
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/QtGui.so
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/QtHelp.so
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/QtMultimedia.so
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/QtNetwork.so
+-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/QtOpenGL.so
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/QtScript.so
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/QtScriptTools.so
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/QtSql.so
@@ -27,7 +29,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/pyqtconfig.py
drwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/uic/
drwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/uic/Compiler/
--rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/Compiler/__init__.py (EMPTY)
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/Compiler/__init__.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/Compiler/compiler.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/Compiler/indenter.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/Compiler/misc.py
@@ -35,7 +37,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/uic/Compiler/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/Compiler/qobjectcreator.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/Compiler/qtproxies.py
drwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/uic/Loader/
--rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/Loader/__init__.py (EMPTY)
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/Loader/__init__.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/Loader/loader.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/Loader/qobjectcreator.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/__init__.py
@@ -44,7 +46,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/uic/Loader/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/icon_cache.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/objcreator.py
drwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v2/
--rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v2/__init__.py (EMPTY)
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v2/__init__.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v2/as_string.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v2/ascii_upper.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v2/invoke.py
@@ -52,7 +54,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v2/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v2/proxy_base.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v2/string_io.py
drwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v3/
--rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v3/__init__.py (EMPTY)
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v3/__init__.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v3/as_string.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v3/ascii_upper.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/port_v3/invoke.py
@@ -66,6 +68,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/PyQt4/uic/widget-plugins/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/widget-plugins/phonon.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/widget-plugins/qaxcontainer.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/widget-plugins/qscintilla.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/widget-plugins/qtdeclarative.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/PyQt4/uic/widget-plugins/qtwebkit.py
drwxr-xr-x root/root usr/lib/python2.7/site-packages/dbus/
drwxr-xr-x root/root usr/lib/python2.7/site-packages/dbus/mainloop/
@@ -102,6 +105,7 @@ drwxr-xr-x root/root usr/share/sip/QtCore/
-rw-r--r-- root/root usr/share/sip/QtCore/qdir.sip
-rw-r--r-- root/root usr/share/sip/QtCore/qdiriterator.sip
-rw-r--r-- root/root usr/share/sip/QtCore/qeasingcurve.sip
+-rw-r--r-- root/root usr/share/sip/QtCore/qelapsedtimer.sip
-rw-r--r-- root/root usr/share/sip/QtCore/qeventloop.sip
-rw-r--r-- root/root usr/share/sip/QtCore/qeventtransition.sip
-rw-r--r-- root/root usr/share/sip/QtCore/qfile.sip
@@ -172,6 +176,26 @@ drwxr-xr-x root/root usr/share/sip/QtCore/
-rw-r--r-- root/root usr/share/sip/QtCore/qvector.sip
-rw-r--r-- root/root usr/share/sip/QtCore/qwaitcondition.sip
-rw-r--r-- root/root usr/share/sip/QtCore/qxmlstream.sip
+drwxr-xr-x root/root usr/share/sip/QtDeclarative/
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/QtDeclarativemod.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativecomponent.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativecontext.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativeengine.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativeerror.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativeexpression.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativeextensionplugin.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativeimageprovider.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativeitem.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativelist.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativeparserstatus.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativeproperty.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativepropertymap.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativepropertyvaluesource.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativescriptstring.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qdeclarativeview.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qpydeclarativelistproperty.sip
+-rw-r--r-- root/root usr/share/sip/QtDeclarative/qpydeclarativepropertyvaluesource.sip
drwxr-xr-x root/root usr/share/sip/QtDesigner/
-rw-r--r-- root/root usr/share/sip/QtDesigner/QtDesignermod.sip
-rw-r--r-- root/root usr/share/sip/QtDesigner/abstractactioneditor.sip
@@ -346,6 +370,7 @@ drwxr-xr-x root/root usr/share/sip/QtGui/
-rw-r--r-- root/root usr/share/sip/QtGui/qstackedlayout.sip
-rw-r--r-- root/root usr/share/sip/QtGui/qstackedwidget.sip
-rw-r--r-- root/root usr/share/sip/QtGui/qstandarditemmodel.sip
+-rw-r--r-- root/root usr/share/sip/QtGui/qstatictext.sip
-rw-r--r-- root/root usr/share/sip/QtGui/qstatusbar.sip
-rw-r--r-- root/root usr/share/sip/QtGui/qstringlistmodel.sip
-rw-r--r-- root/root usr/share/sip/QtGui/qstyle.sip
@@ -426,6 +451,8 @@ drwxr-xr-x root/root usr/share/sip/QtNetwork/
-rw-r--r-- root/root usr/share/sip/QtNetwork/qlocalserver.sip
-rw-r--r-- root/root usr/share/sip/QtNetwork/qlocalsocket.sip
-rw-r--r-- root/root usr/share/sip/QtNetwork/qnetworkaccessmanager.sip
+-rw-r--r-- root/root usr/share/sip/QtNetwork/qnetworkconfigmanager.sip
+-rw-r--r-- root/root usr/share/sip/QtNetwork/qnetworkconfiguration.sip
-rw-r--r-- root/root usr/share/sip/QtNetwork/qnetworkcookie.sip
-rw-r--r-- root/root usr/share/sip/QtNetwork/qnetworkcookiejar.sip
-rw-r--r-- root/root usr/share/sip/QtNetwork/qnetworkdiskcache.sip
@@ -433,6 +460,7 @@ drwxr-xr-x root/root usr/share/sip/QtNetwork/
-rw-r--r-- root/root usr/share/sip/QtNetwork/qnetworkproxy.sip
-rw-r--r-- root/root usr/share/sip/QtNetwork/qnetworkreply.sip
-rw-r--r-- root/root usr/share/sip/QtNetwork/qnetworkrequest.sip
+-rw-r--r-- root/root usr/share/sip/QtNetwork/qnetworksession.sip
-rw-r--r-- root/root usr/share/sip/QtNetwork/qssl.sip
-rw-r--r-- root/root usr/share/sip/QtNetwork/qsslcertificate.sip
-rw-r--r-- root/root usr/share/sip/QtNetwork/qsslcipher.sip
@@ -444,6 +472,15 @@ drwxr-xr-x root/root usr/share/sip/QtNetwork/
-rw-r--r-- root/root usr/share/sip/QtNetwork/qtcpsocket.sip
-rw-r--r-- root/root usr/share/sip/QtNetwork/qudpsocket.sip
-rw-r--r-- root/root usr/share/sip/QtNetwork/qurlinfo.sip
+drwxr-xr-x root/root usr/share/sip/QtOpenGL/
+-rw-r--r-- root/root usr/share/sip/QtOpenGL/QtOpenGLmod.sip
+-rw-r--r-- root/root usr/share/sip/QtOpenGL/opengl_types.sip
+-rw-r--r-- root/root usr/share/sip/QtOpenGL/qgl.sip
+-rw-r--r-- root/root usr/share/sip/QtOpenGL/qglbuffer.sip
+-rw-r--r-- root/root usr/share/sip/QtOpenGL/qglcolormap.sip
+-rw-r--r-- root/root usr/share/sip/QtOpenGL/qglframebufferobject.sip
+-rw-r--r-- root/root usr/share/sip/QtOpenGL/qglpixelbuffer.sip
+-rw-r--r-- root/root usr/share/sip/QtOpenGL/qglshaderprogram.sip
drwxr-xr-x root/root usr/share/sip/QtScript/
-rw-r--r-- root/root usr/share/sip/QtScript/QtScriptmod.sip
-rw-r--r-- root/root usr/share/sip/QtScript/qscriptclass.sip
diff --git a/extra/pyqt/.md5sum b/extra/pyqt/.md5sum
index e26d276c1..4b5e4f1fb 100644
--- a/extra/pyqt/.md5sum
+++ b/extra/pyqt/.md5sum
@@ -1,2 +1,2 @@
-b7b30ab25ee976407b37052f2f724bce PyQt-x11-gpl-4.7.7.tar.gz
-8484f787214d55d23bc3b790fc80b450 fix-kdebindings-4.5.2.patch
+142a32f126f205a2bd77f6a9910f5333 PyQt-x11-gpl-4.8.2.tar.gz
+fad4f593388a466d19d7274d74d435ff fix-stackedwidget-bug.patch
diff --git a/extra/pyqt/Pkgfile b/extra/pyqt/Pkgfile
index de16e3ff5..6fc1d2a02 100644
--- a/extra/pyqt/Pkgfile
+++ b/extra/pyqt/Pkgfile
@@ -5,19 +5,23 @@
# Depends on: sip, qscintilla, qt, phonon
name=pyqt
-version=4.7.7
-release=3
+version=4.8.2
+release=1
source=(http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-$version.tar.gz
- http://nutyx.meticul.eu/files/patchs/$name/fix-kdebindings-4.5.2.patch)
+ fix-stackedwidget-bug.patch)
+
+# http://nutyx.meticul.eu/files/patchs/$name/fix-kdebindings-4.5.2.patch)
build() {
cd PyQt-x11-gpl-$version
-# patch -Np0 -i ../fix-kdebindings-4.5.2.patch
+ patch -Np1 -i ../fix-stackedwidget-bug.patch
-# echo yes |
- python2 configure.py -b /usr/bin \
+ echo yes | python2 configure.py -b /usr/bin \
-d /usr/lib/python2.7/site-packages \
- -v /usr/share/sip/
+ -v /usr/share/sip \
+ --qsci-api
+
+ find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
make
make DESTDIR=$PKG install
}
diff --git a/extra/pyqt/fix-stackedwidget-bug.patch b/extra/pyqt/fix-stackedwidget-bug.patch
new file mode 100644
index 000000000..70b6118a9
--- /dev/null
+++ b/extra/pyqt/fix-stackedwidget-bug.patch
@@ -0,0 +1,12 @@
+--- 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
+
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-02 05:45:53 +0000