update to 4.10.1

changes:
-Qt5 support
-minor feature additions

4 files changed, 20 insertions, 18 deletions

diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index 3729f8fe44a..2665309db0f 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2013/04/10 15:02:58 drochner Exp $
+# $NetBSD: Makefile,v 1.63 2013/05/03 15:48:08 drochner Exp $
 
 PKGNAME=	${PYPKGPREFIX}-qt4-${PYQT_VERSION}
-PYQT_VERSION=	4.9.6
+PYQT_VERSION=	4.10.1
 CATEGORIES=	x11 python
 #MASTER_SITES=	http://www.riverbankcomputing.com/static/Downloads/PyQt4/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
diff --git a/x11/py-qt4/PLIST.common b/x11/py-qt4/PLIST.common
index 79a654a4cc2..da973d4d4da 100644
--- a/x11/py-qt4/PLIST.common
+++ b/x11/py-qt4/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.20 2013/04/10 15:02:58 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.21 2013/05/03 15:48:15 drochner Exp $
 bin/pylupdate4
 bin/pyrcc4
 bin/pyuic4
@@ -67,6 +67,7 @@ share/sip${PYVERSSUFFIX}/QtCore/qabstractanimation.sip
 share/sip${PYVERSSUFFIX}/QtCore/qabstracteventdispatcher.sip
 share/sip${PYVERSSUFFIX}/QtCore/qabstractfileengine.sip
 share/sip${PYVERSSUFFIX}/QtCore/qabstractitemmodel.sip
+share/sip${PYVERSSUFFIX}/QtCore/qabstractnativeeventfilter.sip
 share/sip${PYVERSSUFFIX}/QtCore/qabstractstate.sip
 share/sip${PYVERSSUFFIX}/QtCore/qabstracttransition.sip
 share/sip${PYVERSSUFFIX}/QtCore/qanimationgroup.sip
@@ -157,6 +158,7 @@ share/sip${PYVERSSUFFIX}/QtCore/qvariant.sip
 share/sip${PYVERSSUFFIX}/QtCore/qvariantanimation.sip
 share/sip${PYVERSSUFFIX}/QtCore/qvector.sip
 share/sip${PYVERSSUFFIX}/QtCore/qwaitcondition.sip
+share/sip${PYVERSSUFFIX}/QtCore/qwineventnotifier.sip
 share/sip${PYVERSSUFFIX}/QtCore/qxmlstream.sip
 share/sip${PYVERSSUFFIX}/QtDeclarative/QtDeclarativemod.sip
 share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativecomponent.sip
diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo
index 2a129f37e0b..c52883a2ee3 100644
--- a/x11/py-qt4/distinfo
+++ b/x11/py-qt4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.27 2013/04/10 15:02:58 drochner Exp $
+$NetBSD: distinfo,v 1.28 2013/05/03 15:48:17 drochner Exp $
 
-SHA1 (PyQt-x11-gpl-4.9.6.tar.gz) = 83e649a39643ffc96741bca70177e9c73789e54d
-RMD160 (PyQt-x11-gpl-4.9.6.tar.gz) = 4de97c9da7afd40eb9767861f5b808bf4406a465
-Size (PyQt-x11-gpl-4.9.6.tar.gz) = 9349834 bytes
-SHA1 (patch-aa) = d23c228029986264775c8a9c71830c11ed415de4
+SHA1 (PyQt-x11-gpl-4.10.1.tar.gz) = c7dad20194905d22f110c7d3ab905cd25d69e887
+RMD160 (PyQt-x11-gpl-4.10.1.tar.gz) = 31cbb5a59accbee5a9c4e2dc4e5b0b07a5157905
+Size (PyQt-x11-gpl-4.10.1.tar.gz) = 11279330 bytes
+SHA1 (patch-aa) = 726a9be11f0fa8a275daa61358557cf37a6bf531
diff --git a/x11/py-qt4/patches/patch-aa b/x11/py-qt4/patches/patch-aa
index 897db9a97e7..e7e397025dc 100644
--- a/x11/py-qt4/patches/patch-aa
+++ b/x11/py-qt4/patches/patch-aa
@@ -1,23 +1,23 @@
-$NetBSD: patch-aa,v 1.7 2012/10/10 16:53:39 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2013/05/03 15:48:21 drochner Exp $
 
---- configure.py.orig	2012-09-29 11:34:33.000000000 +0000
+--- configure.py.orig	2013-04-21 12:01:57.000000000 +0000
 +++ configure.py
-@@ -362,7 +362,7 @@ class ConfigurePyQt4:
+@@ -345,7 +345,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"])
-         if qt_version < 0x050000: check_module("QtMultimedia", "QAudioDeviceInfo",
+         check_module("QtMultimedia", "QAudioDeviceInfo",
                  "new QAudioDeviceInfo()")
          check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
-@@ -396,8 +396,8 @@ class ConfigurePyQt4:
-         if qt_version < 0x050000:
-             check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
- 
--        if qt_version < 0x050000: check_module("phonon", "phonon/videowidget.h",
+@@ -369,8 +369,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()")
-+#        if qt_version < 0x050000: check_module("phonon", "phonon/videowidget.h",
++#        check_module("phonon", "phonon/videowidget.h",
 +#                "new Phonon::VideoWidget()")
          check_module("QtAssistant", "qassistantclient.h",
                  "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,