update to 4.7.5

changes:
added QStringRef.__str__() and QStringRef.__unicode__() to the
 QString v1 API
the destruction by Qt of internally constructed QObject instances is now
 automatically detected
a signal defined with pyqtSignal() can now be used with methods that make
 an internal call to QObject::connect(), e.g. QTimer.singleShot()
added the --from-imports command line argument to pyuic4 and the
 from_imports argument to PyQt4.uic.compileUi()
added support for Python v3.2

4 files changed, 24 insertions, 13 deletions

diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index 871141c52d3..f0632f5732f 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/07/13 18:22:54 drochner Exp $
+# $NetBSD: Makefile,v 1.27 2010/09/02 09:20:19 drochner Exp $
 #
 
 PKGNAME=		${PYPKGPREFIX}-qt4-${PYQT_VERSION}
-PYQT_VERSION=		4.7.4
+PYQT_VERSION=		4.7.5
 CATEGORIES=		x11 python
 MASTER_SITES=		http://www.riverbankcomputing.com/static/Downloads/PyQt4/
 
diff --git a/x11/py-qt4/PLIST.common b/x11/py-qt4/PLIST.common
index a3bf4206177..25a8453c5d9 100644
--- a/x11/py-qt4/PLIST.common
+++ b/x11/py-qt4/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.12 2010/04/20 09:35:05 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.13 2010/09/02 09:20:19 drochner Exp $
 bin/pylupdate4
 bin/pyrcc4
 bin/pyuic4
@@ -37,15 +37,15 @@ ${PYSITELIB}/PyQt4/uic/exceptions.py
 ${PYSITELIB}/PyQt4/uic/icon_cache.py
 ${PYSITELIB}/PyQt4/uic/objcreator.py
 ${PYSITELIB}/PyQt4/uic/port_v2/__init__.py
+${PYSITELIB}/PyQt4/uic/port_v2/as_string.py
 ${PYSITELIB}/PyQt4/uic/port_v2/ascii_upper.py
-${PYSITELIB}/PyQt4/uic/port_v2/encode_utf8.py
 ${PYSITELIB}/PyQt4/uic/port_v2/invoke.py
 ${PYSITELIB}/PyQt4/uic/port_v2/load_plugin.py
 ${PYSITELIB}/PyQt4/uic/port_v2/proxy_base.py
 ${PYSITELIB}/PyQt4/uic/port_v2/string_io.py
 ${PYSITELIB}/PyQt4/uic/port_v3/__init__.py
+${PYSITELIB}/PyQt4/uic/port_v3/as_string.py
 ${PYSITELIB}/PyQt4/uic/port_v3/ascii_upper.py
-${PYSITELIB}/PyQt4/uic/port_v3/encode_utf8.py
 ${PYSITELIB}/PyQt4/uic/port_v3/invoke.py
 ${PYSITELIB}/PyQt4/uic/port_v3/load_plugin.py
 ${PYSITELIB}/PyQt4/uic/port_v3/proxy_base.py
diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo
index 46a043b3897..6bfc9cf5e2c 100644
--- a/x11/py-qt4/distinfo
+++ b/x11/py-qt4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2010/07/13 18:22:54 drochner Exp $
+$NetBSD: distinfo,v 1.14 2010/09/02 09:20:19 drochner Exp $
 
-SHA1 (PyQt-x11-gpl-4.7.4.tar.gz) = dd1d9eb22f9780c54e3811c8958512847eacc302
-RMD160 (PyQt-x11-gpl-4.7.4.tar.gz) = d93f83c40277829008d9a7e47f7f9c651b36e0d7
-Size (PyQt-x11-gpl-4.7.4.tar.gz) = 7812552 bytes
-SHA1 (patch-aa) = ff6010dec03d1e17e2023d2f6d4418a03bf21bcc
+SHA1 (PyQt-x11-gpl-4.7.5.tar.gz) = 0c7c96872b8dfc1822618fbaacae735e91d8405f
+RMD160 (PyQt-x11-gpl-4.7.5.tar.gz) = ae389c724d248ebbcc2445f044a4e1965b3d89f5
+Size (PyQt-x11-gpl-4.7.5.tar.gz) = 7816707 bytes
+SHA1 (patch-aa) = 2313842ad3dd2650bc89d06e88b5cd75e5affdbd
diff --git a/x11/py-qt4/patches/patch-aa b/x11/py-qt4/patches/patch-aa
index 17f55ace1a8..8c4951bdd88 100644
--- a/x11/py-qt4/patches/patch-aa
+++ b/x11/py-qt4/patches/patch-aa
@@ -1,8 +1,19 @@
-$NetBSD: patch-aa,v 1.3 2009/07/29 19:47:24 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2010/09/02 09:20:19 drochner Exp $
 
---- configure.py.orig	2009-07-14 15:31:43.000000000 +0200
+--- configure.py.orig	2010-08-31 08:28:48.000000000 +0000
 +++ configure.py
-@@ -1680,11 +1680,7 @@ int main(int, char **)
+@@ -365,8 +365,8 @@ class ConfigurePyQt4:
+         check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
+         check_module("QtXml", "qdom.h", "new QDomDocument()")
+         check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
+-        check_module("phonon", "phonon/videowidget.h",
+-                "new Phonon::VideoWidget()")
++#        check_module("phonon", "phonon/videowidget.h",
++#                "new Phonon::VideoWidget()")
+         check_module("QtAssistant", "qassistantclient.h",
+                 "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
+                 extra_libs=ass_libs)
+@@ -1855,11 +1855,7 @@ int main(int, char **)
  
      out << QLibraryInfo::licensee() << '\\n';