From 4a4bc9c18aba4c3bbf143201b369805bfffca5b5 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Fri, 23 Aug 2013 11:27:17 +0000
Subject: update to 4.10.3 This is a minor bug fix release.

---
 x11/py-qt4/Makefile         |  6 +++---
 x11/py-qt4/PLIST.common     |  4 ++--
 x11/py-qt4/distinfo         | 10 +++++-----
 x11/py-qt4/patches/patch-aa | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'x11')

diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index 5ced6e4c02c..bf43e641472 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2013/07/04 17:03:19 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2013/08/23 11:27:17 drochner Exp $
 
 PKGNAME=	${PYPKGPREFIX}-qt4-${PYQT_VERSION}
-PYQT_VERSION=	4.10.1
-PKGREVISION=	5
+PYQT_VERSION=	4.10.3
 CATEGORIES=	x11 python
 #MASTER_SITES=	http://www.riverbankcomputing.com/static/Downloads/PyQt4/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
@@ -69,6 +68,7 @@ do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
 
+BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.15
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/py-dbus/buildlink3.mk"
diff --git a/x11/py-qt4/PLIST.common b/x11/py-qt4/PLIST.common
index da973d4d4da..a4e215122e3 100644
--- a/x11/py-qt4/PLIST.common
+++ b/x11/py-qt4/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.21 2013/05/03 15:48:15 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.22 2013/08/23 11:27:17 drochner Exp $
 bin/pylupdate4
 bin/pyrcc4
 bin/pyuic4
@@ -59,7 +59,7 @@ ${PYSITELIB}/PyQt4/uic/widget-plugins/qscintilla.py
 ${PYSITELIB}/PyQt4/uic/widget-plugins/qtdeclarative.py
 ${PYSITELIB}/PyQt4/uic/widget-plugins/qtwebkit.py
 ${PYSITELIB}/dbus/mainloop/qt.so
-qt4/plugins/designer/libpythonplugin.la
+qt4/plugins/designer/libpyqt4.la
 qt4/qsci/api/python/PyQt4.api
 share/sip${PYVERSSUFFIX}/Qt/Qtmod.sip
 share/sip${PYVERSSUFFIX}/QtCore/QtCoremod.sip
diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo
index 4622004fc95..88a46db4988 100644
--- a/x11/py-qt4/distinfo
+++ b/x11/py-qt4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.29 2013/06/10 15:37:36 jperkin Exp $
+$NetBSD: distinfo,v 1.30 2013/08/23 11:27:17 drochner Exp $
 
-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
+SHA1 (PyQt-x11-gpl-4.10.3.tar.gz) = 2866ea9bdb1c30337fb326ca3442c61e3c3e3396
+RMD160 (PyQt-x11-gpl-4.10.3.tar.gz) = 1ca1de91d7445f604968e98b369aa6d2fd7d37ca
+Size (PyQt-x11-gpl-4.10.3.tar.gz) = 11187362 bytes
+SHA1 (patch-aa) = 5939aff0f322a5553a61464e0f7998226ca646e4
 SHA1 (patch-sip_QtCore_qlist.sip) = 4fb548d4ee755cbc955ec32a6b1702a71a9815f1
diff --git a/x11/py-qt4/patches/patch-aa b/x11/py-qt4/patches/patch-aa
index e7e397025dc..1c9b7b09c7b 100644
--- a/x11/py-qt4/patches/patch-aa
+++ b/x11/py-qt4/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2013/05/03 15:48:21 drochner Exp $
+$NetBSD: patch-aa,v 1.9 2013/08/23 11:27:17 drochner Exp $
 
---- configure.py.orig	2013-04-21 12:01:57.000000000 +0000
+--- configure.py.orig	2013-08-21 05:50:47.000000000 +0000
 +++ configure.py
 @@ -345,7 +345,7 @@ class ConfigurePyQt4:
          pyqt_modules.append("QtCore")
@@ -11,9 +11,9 @@ $NetBSD: patch-aa,v 1.8 2013/05/03 15:48:21 drochner Exp $
          check_module("QtMultimedia", "QAudioDeviceInfo",
                  "new QAudioDeviceInfo()")
          check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
-@@ -369,8 +369,8 @@ class ConfigurePyQt4:
+@@ -371,8 +371,8 @@ class ConfigurePyQt4:
+         check_module("QtTest", "QtTest", "QTest::qSleep(0)")
          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()")
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.8 2013/05/03 15:48:21 drochner Exp $
          check_module("QtAssistant", "qassistantclient.h",
                  "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
                  extra_libs=ass_libs)
-@@ -2093,11 +2093,7 @@ int main(int argc, char **argv)
+@@ -2092,11 +2092,7 @@ int main(int argc, char **argv)
  
      out << QLibraryInfo::licensee() << '\\n';
  
-- 
cgit v1.2.3