From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 20 Oct 2010 21:29:22 +0000 (+0200)
Subject: pyQt: Update to 4.8-snapshot.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa3b09af5738c5922034febe89cb0004ad3841ec;p=ipfire-3.x.git

pyQt: Update to 4.8-snapshot.
---

diff --git a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch b/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
deleted file mode 100644
index bafa4ec2b..000000000
--- a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py
---- PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang	2009-06-16 03:37:46.000000000 -0500
-+++ PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py	2009-07-02 14:01:44.218147410 -0500
-@@ -1,3 +1,5 @@
-+#!/usr/bin/python -tt
-+
- import sys
- import optparse
- 
diff --git a/pkgs/core/pyQt/patches/PyQt4-4.7.7-fix-scpk-and-flags.patch b/pkgs/core/pyQt/patches/PyQt4-4.7.7-fix-scpk-and-flags.patch
deleted file mode 100644
index 38083e76e..000000000
--- a/pkgs/core/pyQt/patches/PyQt4-4.7.7-fix-scpk-and-flags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py
-===================================================================
---- PyQt-x11-gpl-4.7.7.orig/pyuic/uic/Loader/loader.py
-+++ PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py
-@@ -1,3 +1,5 @@
-+import os.path
-+
- from PyQt4 import QtGui, QtCore
- from PyQt4.uic.uiparser import UIParser
- from PyQt4.uic.Loader.qobjectcreator import LoaderCreatorPolicy
-@@ -19,6 +21,7 @@ class DynamicUILoader(UIParser):
-     def loadUi(self, filename, toplevelInst=None):
-         self.toplevelInst = toplevelInst
- 
--        # By using QFileInfo.path() rather than os.path.dirname() we allow
--        # QString file names.
--        return self.parse(filename, QtCore.QFileInfo(filename).path())
-+        # Allow the filename to be a QString.
-+        filename = str(filename)
-+
-+        return self.parse(filename, os.path.dirname(filename))
-Index: PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip
-===================================================================
---- PyQt-x11-gpl-4.7.7.orig/sip/QtCore/qglobal.sip
-+++ PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip
-@@ -312,12 +312,12 @@ public:
-     // Qt.Alignment class.
-     QFlags operator|(int f);
- %MethodCode
--        sipRes = new QFlags(*a0 | (ENUM(a1)));
-+        sipRes = new QFlags(*a0 | a1);
- %End
- 
-     QFlags operator^(int f);
- %MethodCode
--        sipRes = new QFlags(*a0 ^ (ENUM(a1)));
-+        sipRes = new QFlags(*a0 ^ a1);
- %End
- 
-     // These are necessary to prevent Python comparing object IDs.
diff --git a/pkgs/core/pyQt/pyQt.nm b/pkgs/core/pyQt/pyQt.nm
index ae85dde36..7e85eadda 100644
--- a/pkgs/core/pyQt/pyQt.nm
+++ b/pkgs/core/pyQt/pyQt.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = pyQt
-PKG_VER        = 4.7.7
+PKG_VER        = snapshot-4.8-3011e73e866d
 PKG_REL        = 0
 
 PKG_MAINTAINER =
@@ -63,3 +63,8 @@ define STAGE_BUILD
 endef
 
 STAGE_INSTALLTARGET += INSTALL_ROOT=$(BUILDROOT)
+
+define STAGE_INSTALL_CMDS
+	# Remove python3 port
+	rm -rfv $(BUILDROOT)/usr/lib/python*/site-packages/PyQt4/uic/port_v3
+endef