packages: python-PyQt4/python-PyQt4-sip.patch - updated

[shadzik]

Author: shadzik                      Date: Wed Oct  6 19:12:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated

---- Files affected:
packages/python-PyQt4:
   python-PyQt4-sip.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/python-PyQt4/python-PyQt4-sip.patch
diff -u packages/python-PyQt4/python-PyQt4-sip.patch:1.1 packages/python-PyQt4/python-PyQt4-sip.patch:1.2
--- packages/python-PyQt4/python-PyQt4-sip.patch:1.1	Sun Oct  3 11:28:29 2010
+++ packages/python-PyQt4/python-PyQt4-sip.patch	Wed Oct  6 21:12:47 2010
@@ -1,6 +1,29 @@
---- PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip.org	2010-10-03 11:23:40.811024429 +0200
-+++ PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip	2010-10-03 11:23:46.104789071 +0200
-@@ -312,12 +312,12 @@
+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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-PyQt4/python-PyQt4-sip.patch?r1=1.1&r2=1.2&f=u