pyqt#4.7.7-3, maj python

2 files changed, 72 insertions, 81 deletions

diff --git a/extra/pyqt/.footprint b/extra/pyqt/.footprint
index 21e899d36..697b0f769 100644
--- a/extra/pyqt/.footprint
+++ b/extra/pyqt/.footprint
@@ -4,73 +4,72 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/pyrcc4
 -rwxr-xr-x	root/root	usr/bin/pyuic4
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/python2.6/
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/Qt.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtCore.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtDesigner.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtGui.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtHelp.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtMultimedia.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtNetwork.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtOpenGL.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtScript.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtScriptTools.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtSql.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtSvg.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtTest.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtWebKit.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtXml.so
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/QtXmlPatterns.so
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/__init__.py
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/phonon.so
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/pyqtconfig.py
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/Compiler/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/Compiler/__init__.py (EMPTY)
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/Compiler/compiler.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/Compiler/indenter.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/Compiler/misc.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/Compiler/proxy_type.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/Compiler/qobjectcreator.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/Compiler/qtproxies.py
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/Loader/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/Loader/__init__.py (EMPTY)
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/Loader/loader.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/Loader/qobjectcreator.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/__init__.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/driver.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/exceptions.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/icon_cache.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/objcreator.py
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v2/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v2/__init__.py (EMPTY)
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v2/as_string.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v2/ascii_upper.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v2/invoke.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v2/load_plugin.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v2/proxy_base.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v2/string_io.py
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v3/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v3/__init__.py (EMPTY)
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v3/as_string.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v3/ascii_upper.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v3/invoke.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v3/load_plugin.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v3/proxy_base.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/port_v3/string_io.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/properties.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/pyuic.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/uiparser.py
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/widget-plugins/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/widget-plugins/phonon.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/widget-plugins/qaxcontainer.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/widget-plugins/qscintilla.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/PyQt4/uic/widget-plugins/qtwebkit.py
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/dbus/
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/dbus/mainloop/
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/dbus/mainloop/qt.so
+drwxr-xr-x	root/root	usr/lib/python2.7/
+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/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/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
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/PyQt4/QtSvg.so
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/PyQt4/QtTest.so
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/PyQt4/QtWebKit.so
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/PyQt4/QtXml.so
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/PyQt4/QtXmlPatterns.so
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/PyQt4/__init__.py
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/PyQt4/phonon.so
+-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/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
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/PyQt4/uic/Compiler/proxy_type.py
+-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/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
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/PyQt4/uic/driver.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/PyQt4/uic/exceptions.py
+-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/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
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/PyQt4/uic/port_v2/load_plugin.py
+-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/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
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/PyQt4/uic/port_v3/load_plugin.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/PyQt4/uic/port_v3/proxy_base.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/PyQt4/uic/port_v3/string_io.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/PyQt4/uic/properties.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/PyQt4/uic/pyuic.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/PyQt4/uic/uiparser.py
+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/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/
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/dbus/mainloop/qt.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/qt/
 drwxr-xr-x	root/root	usr/share/qt/qsci/
@@ -445,14 +444,6 @@ 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/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/Pkgfile b/extra/pyqt/Pkgfile
index 2919ac36f..de16e3ff5 100644
--- a/extra/pyqt/Pkgfile
+++ b/extra/pyqt/Pkgfile
@@ -6,18 +6,18 @@
 
 name=pyqt
 version=4.7.7
-release=2
+release=3
 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)
 
 build() {
 	cd PyQt-x11-gpl-$version
+#	patch -Np0 -i ../fix-kdebindings-4.5.2.patch	
 
-	patch -Np0 -i ../fix-kdebindings-4.5.2.patch
-
-	echo yes | python configure.py -b /usr/bin \
-	-d /usr/lib/python2.6/site-packages \
-	-v /usr/share/sip
+#	echo yes | 
+	python2 configure.py -b /usr/bin \
+		-d /usr/lib/python2.7/site-packages \
+		-v /usr/share/sip/
 	make
 	make DESTDIR=$PKG install
 }