update to 4.9.4

This is a minor feature release and includes initial support for Qt v5.

4 files changed, 28 insertions, 26 deletions

diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index 6c3b7454155..a61b106cfa8 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2012/06/06 14:17:11 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2012/07/03 18:13:07 drochner Exp $
 
 PKGNAME=	${PYPKGPREFIX}-qt4-${PYQT_VERSION}
-PYQT_VERSION=	4.9.1
-PKGREVISION=	3
+PYQT_VERSION=	4.9.4
 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 359586ffe15..067d6760bee 100644
--- a/x11/py-qt4/PLIST.common
+++ b/x11/py-qt4/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.17 2012/01/17 19:04:46 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.18 2012/07/03 18:13:07 drochner Exp $
 bin/pylupdate4
 bin/pyrcc4
 bin/pyuic4
@@ -25,7 +25,7 @@ ${PYSITELIB}/PyQt4/uic/Compiler/__init__.py
 ${PYSITELIB}/PyQt4/uic/Compiler/compiler.py
 ${PYSITELIB}/PyQt4/uic/Compiler/indenter.py
 ${PYSITELIB}/PyQt4/uic/Compiler/misc.py
-${PYSITELIB}/PyQt4/uic/Compiler/proxy_type.py
+${PYSITELIB}/PyQt4/uic/Compiler/proxy_metaclass.py
 ${PYSITELIB}/PyQt4/uic/Compiler/qobjectcreator.py
 ${PYSITELIB}/PyQt4/uic/Compiler/qtproxies.py
 ${PYSITELIB}/PyQt4/uic/Loader/__init__.py
@@ -273,6 +273,7 @@ share/sip${PYVERSSUFFIX}/QtGui/qgraphicsview.sip
 share/sip${PYVERSSUFFIX}/QtGui/qgraphicswidget.sip
 share/sip${PYVERSSUFFIX}/QtGui/qgridlayout.sip
 share/sip${PYVERSSUFFIX}/QtGui/qgroupbox.sip
+share/sip${PYVERSSUFFIX}/QtGui/qguiapplication.sip
 share/sip${PYVERSSUFFIX}/QtGui/qheaderview.sip
 share/sip${PYVERSSUFFIX}/QtGui/qicon.sip
 share/sip${PYVERSSUFFIX}/QtGui/qiconengine.sip
@@ -307,6 +308,7 @@ share/sip${PYVERSSUFFIX}/QtGui/qmessagebox.sip
 share/sip${PYVERSSUFFIX}/QtGui/qmime.sip
 share/sip${PYVERSSUFFIX}/QtGui/qmouseeventtransition.sip
 share/sip${PYVERSSUFFIX}/QtGui/qmovie.sip
+share/sip${PYVERSSUFFIX}/QtGui/qpagedpaintdevice.sip
 share/sip${PYVERSSUFFIX}/QtGui/qpagesetupdialog.sip
 share/sip${PYVERSSUFFIX}/QtGui/qpaintdevice.sip
 share/sip${PYVERSSUFFIX}/QtGui/qpaintengine.sip
@@ -381,6 +383,7 @@ share/sip${PYVERSSUFFIX}/QtGui/qtoolbar.sip
 share/sip${PYVERSSUFFIX}/QtGui/qtoolbox.sip
 share/sip${PYVERSSUFFIX}/QtGui/qtoolbutton.sip
 share/sip${PYVERSSUFFIX}/QtGui/qtooltip.sip
+share/sip${PYVERSSUFFIX}/QtGui/qtouchdevice.sip
 share/sip${PYVERSSUFFIX}/QtGui/qtransform.sip
 share/sip${PYVERSSUFFIX}/QtGui/qtreeview.sip
 share/sip${PYVERSSUFFIX}/QtGui/qtreewidget.sip
diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo
index a43ca1b948a..92227db04bf 100644
--- a/x11/py-qt4/distinfo
+++ b/x11/py-qt4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2012/02/17 18:37:41 drochner Exp $
+$NetBSD: distinfo,v 1.25 2012/07/03 18:13:07 drochner Exp $
 
-SHA1 (PyQt-x11-gpl-4.9.1.tar.gz) = 6aa0e64cdcca0f23946c5e6c244b19189c234306
-RMD160 (PyQt-x11-gpl-4.9.1.tar.gz) = 056d6570ffc5ad873ef36d8181122cbb79d7b5ef
-Size (PyQt-x11-gpl-4.9.1.tar.gz) = 9742132 bytes
-SHA1 (patch-aa) = 519c32dc5924e399ad1616c400993fa4847f614e
+SHA1 (PyQt-x11-gpl-4.9.4.tar.gz) = 05425e0590d709ac28cdd551ad52e76f0b02eca5
+RMD160 (PyQt-x11-gpl-4.9.4.tar.gz) = 30684642147120b2234f06759e57e87021577e57
+Size (PyQt-x11-gpl-4.9.4.tar.gz) = 9801300 bytes
+SHA1 (patch-aa) = 9fce845d6aaa62070e28b408aacdb42d6d888aff
diff --git a/x11/py-qt4/patches/patch-aa b/x11/py-qt4/patches/patch-aa
index 6b9166ffdd0..ca6cdd8dc52 100644
--- a/x11/py-qt4/patches/patch-aa
+++ b/x11/py-qt4/patches/patch-aa
@@ -1,28 +1,28 @@
-$NetBSD: patch-aa,v 1.5 2012/02/16 20:12:12 hans Exp $
+$NetBSD: patch-aa,v 1.6 2012/07/03 18:13:07 drochner Exp $
 
---- configure.py.orig	2011-08-02 11:18:51.000000000 +0200
-+++ configure.py	2011-10-11 16:36:11.233813486 +0200
-@@ -355,7 +355,7 @@ class ConfigurePyQt4:
+--- configure.py.orig	2012-06-20 18:18:11.000000000 +0000
++++ configure.py
+@@ -358,7 +358,7 @@ class ConfigurePyQt4:
          pyqt_modules.append("QtCore")
  
          check_module("QtGui", "qwidget.h", "new QWidget()")
--        check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")")
-+        check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")", extra_libs=["QtCore"])
-         check_module("QtMultimedia", "QAudioDeviceInfo",
+-        if qt_version < 0x050000: check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")")
++        if qt_version < 0x050000: check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")", extra_libs=["QtCore"])
+         if qt_version < 0x050000: check_module("QtMultimedia", "QAudioDeviceInfo",
                  "new QAudioDeviceInfo()")
-         check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
-@@ -372,8 +372,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",
+         if qt_version < 0x050000: check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
+@@ -377,8 +377,8 @@ class ConfigurePyQt4:
+         if qt_version < 0x050000: check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
+         if qt_version < 0x050000: check_module("QtXml", "qdom.h", "new QDomDocument()")
+         if qt_version < 0x050000: check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
+-        if qt_version < 0x050000: check_module("phonon", "phonon/videowidget.h",
 -                "new Phonon::VideoWidget()")
-+#        check_module("phonon", "phonon/videowidget.h",
++#        if qt_version < 0x050000: check_module("phonon", "phonon/videowidget.h",
 +#                "new Phonon::VideoWidget()")
-         check_module("QtAssistant", "qassistantclient.h",
+         if qt_version < 0x050000: check_module("QtAssistant", "qassistantclient.h",
                  "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
                  extra_libs=ass_libs)
-@@ -1981,11 +1981,7 @@ int main(int, char **)
+@@ -2046,11 +2046,7 @@ int main(int argc, char **argv)
  
      out << QLibraryInfo::licensee() << '\\n';