py-qt4: update to 4.12.1

6 files changed, 77 insertions, 30 deletions

diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index 2e8069068a1..517bd5b17a2 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2016/08/28 15:48:37 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2018/01/17 19:18:47 markd Exp $
 
 PKGNAME=	${PYPKGPREFIX}-qt4-${PYQT_VERSION}
-PYQT_VERSION=	4.11.4
-PKGREVISION=	3
+PYQT_VERSION=	4.12.1
 CATEGORIES=	x11 python
 #MASTER_SITES=	http://www.riverbankcomputing.com/static/Downloads/PyQt4/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
@@ -18,10 +17,11 @@ USE_LANGUAGES=		c c++
 
 CONFIGURE_ARGS+=	-b ${PREFIX}/bin
 CONFIGURE_ARGS+=	-d ${PREFIX}/${PYSITELIB}
-CONFIGURE_ARGS+=	-v ${PREFIX}/share/sip${PYVERSSUFFIX}
+CONFIGURE_ARGS+=	--sipdir ${PREFIX}/share/sip${PYVERSSUFFIX}
 CONFIGURE_ARGS+=	-q ${QTDIR}/bin/qmake
 CONFIGURE_ARGS+=	--confirm-license
 CONFIGURE_ARGS+=	--qsci-api
+#CONFIGURE_ARGS+=	--sip ${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
 
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 
@@ -54,9 +54,9 @@ SUBST_MESSAGE.PIC=	Adding -fPIC to CXXFLAGS.
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
-DISTNAME=		PyQt-mac-gpl-${PYQT_VERSION}
+DISTNAME=		PyQt4_gpl_mac-${PYQT_VERSION}
 .else
-DISTNAME=		PyQt-x11-gpl-${PYQT_VERSION}
+DISTNAME=		PyQt4_gpl_x11-${PYQT_VERSION}
 .endif
 
 .include "../../lang/python/extension.mk"
@@ -94,6 +94,7 @@ post-install:
 # needs the QtXmlPatterns fix
 BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.6.1nb3
 .include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-qdbus/buildlink3.mk"
 BUILDLINK_API_DEPENDS.qt4-tools+=	qt4-tools>=4.4.0nb1
 BUILDLINK_DEPMETHOD.qt4-tools=		full
 .include "../../x11/qt4-tools/buildlink3.mk"
diff --git a/x11/py-qt4/PLIST b/x11/py-qt4/PLIST
index 71348b588c4..2fcb6fbf051 100644
--- a/x11/py-qt4/PLIST
+++ b/x11/py-qt4/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2016/04/11 04:05:05 dbj Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/01/17 19:18:47 markd Exp $
 bin/pylupdate4
 bin/pyrcc4
 bin/pyuic4
 ${PYSITELIB}/PyQt4/Qt.so
 ${PYSITELIB}/PyQt4/QtCore.so
+${PYSITELIB}/PyQt4/QtDBus.so
 ${PYSITELIB}/PyQt4/QtDeclarative.so
 ${PYSITELIB}/PyQt4/QtDesigner.so
 ${PYSITELIB}/PyQt4/QtGui.so
@@ -199,6 +200,21 @@ 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}/QtDBus/QtDBusmod.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qdbusabstractadaptor.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qdbusabstractinterface.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qdbusargument.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qdbusconnection.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qdbusconnectioninterface.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qdbuserror.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qdbusextratypes.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qdbusinterface.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qdbusmessage.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qdbuspendingcall.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qdbusservicewatcher.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qdbusunixfiledescriptor.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qpydbuspendingreply.sip
+share/sip${PYVERSSUFFIX}/QtDBus/qpydbusreply.sip
 share/sip${PYVERSSUFFIX}/QtDeclarative/QtDeclarativemod.sip
 share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativecomponent.sip
 share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativecontext.sip
diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo
index 1eac9e2ea85..4c97e8d6d0e 100644
--- a/x11/py-qt4/distinfo
+++ b/x11/py-qt4/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.36 2015/11/23 15:18:19 adam Exp $
+$NetBSD: distinfo,v 1.37 2018/01/17 19:18:47 markd Exp $
 
-SHA1 (PyQt-mac-gpl-4.11.4.tar.gz) = c319f273e40afe68a2e65ff2b9c01e0d43e980f7
-RMD160 (PyQt-mac-gpl-4.11.4.tar.gz) = 55ab22e65a2681b7af3680db9462967578a907f0
-SHA512 (PyQt-mac-gpl-4.11.4.tar.gz) = 9aa8b860dc72eea5ccee33cc62d6935ac2dac21cfff8b1ed18c584d075f58a717fa2880284b0b27615f63bfafd1a50a0f7f40c1a1f43dd513aeb0da7e8cae900
-Size (PyQt-mac-gpl-4.11.4.tar.gz) = 11312655 bytes
-SHA1 (PyQt-x11-gpl-4.11.4.tar.gz) = 5c489e655279f85d47c8a275d97a12dfa0c8fd87
-RMD160 (PyQt-x11-gpl-4.11.4.tar.gz) = d3ade67c4433852474c86220ea8611eb7f7cd0b1
-SHA512 (PyQt-x11-gpl-4.11.4.tar.gz) = 58d0c5e30b0480c1b6ce1a3cc3ef0a1841bb15631830fb937d1f17f5d3d8cbe66a5e2adcfb2c3990fae38db66dd430668bd25413e254e72064a38c48f689f170
-Size (PyQt-x11-gpl-4.11.4.tar.gz) = 11317088 bytes
-SHA1 (patch-configure.py) = 516da08fad535a7b743b400e9e613689982d057d
-SHA1 (patch-sip_QtCore_qlist.sip) = 4fb548d4ee755cbc955ec32a6b1702a71a9815f1
+SHA1 (PyQt4_gpl_mac-4.12.1.tar.gz) = 028f3fc979428687e8e8fd78288b41f1b5735a7c
+RMD160 (PyQt4_gpl_mac-4.12.1.tar.gz) = 07125dd79a1d76dd83680a4f940f267f792486aa
+SHA512 (PyQt4_gpl_mac-4.12.1.tar.gz) = 399e35e56bb0e8cb8c843dbfc1b0650f37f29c081be5dcb2cb78964f66401a5782a30ff243e52be5d820cdb5c3957f6de3819c297a7756582fe619b0a72e4dbc
+Size (PyQt4_gpl_mac-4.12.1.tar.gz) = 11324734 bytes
+SHA1 (PyQt4_gpl_x11-4.12.1.tar.gz) = 5c34b883f9dda0b96fc6ed2637aa70aa63c0f0bd
+RMD160 (PyQt4_gpl_x11-4.12.1.tar.gz) = 28631c1d1eca8f40b6f627c55f963671064ddd06
+SHA512 (PyQt4_gpl_x11-4.12.1.tar.gz) = 0651816ed5a371c24827e182eac5b2a2afe67928d95a09f63bd8158117aacd3e835b1efa06d4fc0c147a28038613a5bc088bd736a1348de68199da7952299af1
+Size (PyQt4_gpl_x11-4.12.1.tar.gz) = 11328010 bytes
+SHA1 (patch-configure-ng.py) = 33774cb4365566d9978fd59745143bee6380dcb8
+SHA1 (patch-configure.py) = aebd8a287f3d24b8d1d6133d689cdb9c9eda1ad9
+SHA1 (patch-sip_QtCore_qlist.sip) = 9227b40ac8c0c37f7a1dcd7a3337686cfa8298f5
diff --git a/x11/py-qt4/patches/patch-configure-ng.py b/x11/py-qt4/patches/patch-configure-ng.py
new file mode 100644
index 00000000000..2a202d3f323
--- /dev/null
+++ b/x11/py-qt4/patches/patch-configure-ng.py
@@ -0,0 +1,29 @@
+$NetBSD: patch-configure-ng.py,v 1.1 2018/01/17 19:18:47 markd Exp $
+
+--- configure-ng.py.orig	2017-06-30 08:44:36.000000000 +0000
++++ configure-ng.py
+@@ -591,11 +591,7 @@ int main(int argc, char **argv)
+ 
+     out << QLibraryInfo::licensee() << '\\n';
+ 
+-#if defined(QT_SHARED) || defined(QT_DLL)
+     out << "shared\\n";
+-#else
+-    out << "static\\n";
+-#endif
+ 
+     // Determine which features should be disabled.
+ 
+@@ -1290,9 +1286,9 @@ def check_modules(target_config, verbose
+     check_module(target_config, verbose, 'QtXmlPatterns', 'qxmlname.h',
+             'new QXmlName()')
+ 
+-    if target_config.qt_version < 0x050000:
+-        check_module(target_config, verbose, 'phonon', 'phonon/videowidget.h',
+-                'new Phonon::VideoWidget()')
++#    if target_config.qt_version < 0x050000:
++#        check_module(target_config, verbose, 'phonon', 'phonon/videowidget.h',
++#                'new Phonon::VideoWidget()')
+ 
+     if target_config.qt_version < 0x040700:
+         check_module(target_config, verbose, 'QtAssistant',
diff --git a/x11/py-qt4/patches/patch-configure.py b/x11/py-qt4/patches/patch-configure.py
index 7ba0c553d36..ee6e00207a9 100644
--- a/x11/py-qt4/patches/patch-configure.py
+++ b/x11/py-qt4/patches/patch-configure.py
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure.py,v 1.1 2015/01/27 06:10:15 dbj Exp $
+$NetBSD: patch-configure.py,v 1.2 2018/01/17 19:18:47 markd Exp $
 
---- configure.py.orig	2014-07-03 14:00:02.000000000 +0000
+--- configure.py.orig	2017-06-30 08:44:36.000000000 +0000
 +++ configure.py
-@@ -346,7 +346,7 @@ class ConfigurePyQt4:
+@@ -341,7 +341,7 @@ class ConfigurePyQt4:
          pyqt_modules.append("QtCore")
  
          check_module("QtGui", "qwidget.h", "new QWidget()")
@@ -11,9 +11,9 @@ $NetBSD: patch-configure.py,v 1.1 2015/01/27 06:10:15 dbj Exp $
          check_module("QtMultimedia", "QAudioDeviceInfo",
                  "new QAudioDeviceInfo()")
          check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
-@@ -372,8 +372,8 @@ class ConfigurePyQt4:
-         check_module("QtTest", "QtTest", "QTest::qSleep(0)")
+@@ -367,8 +367,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()")
@@ -22,7 +22,7 @@ $NetBSD: patch-configure.py,v 1.1 2015/01/27 06:10:15 dbj Exp $
          check_module("QtAssistant", "qassistantclient.h",
                  "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
                  extra_libs=ass_libs)
-@@ -968,7 +968,7 @@ include(%s)
+@@ -963,7 +963,7 @@ include(%s)
  
                  config_args = ducfg.get("CONFIG_ARGS", "")
  
@@ -31,7 +31,7 @@ $NetBSD: patch-configure.py,v 1.1 2015/01/27 06:10:15 dbj Exp $
                      dynamic_pylib = "--enable-framework" in config_args
  
                      # It's probably a Python bug that the library name doesn't
-@@ -1963,8 +1963,8 @@ def get_qt_configuration():
+@@ -1950,8 +1950,8 @@ def get_qt_configuration():
          else:
              exe_file = os.path.join("release", app + ".exe")
              make_target = " release"
@@ -42,7 +42,7 @@ $NetBSD: patch-configure.py,v 1.1 2015/01/27 06:10:15 dbj Exp $
      else:
          exe_file = os.path.join(".", app)
  
-@@ -2027,11 +2027,7 @@ int main(int argc, char **argv)
+@@ -2014,11 +2014,7 @@ int main(int argc, char **argv)
  
      out << QLibraryInfo::licensee() << '\\n';
  
diff --git a/x11/py-qt4/patches/patch-sip_QtCore_qlist.sip b/x11/py-qt4/patches/patch-sip_QtCore_qlist.sip
index bff0c1db8d8..6a1d44d9dea 100644
--- a/x11/py-qt4/patches/patch-sip_QtCore_qlist.sip
+++ b/x11/py-qt4/patches/patch-sip_QtCore_qlist.sip
@@ -1,10 +1,10 @@
-$NetBSD: patch-sip_QtCore_qlist.sip,v 1.1 2013/06/10 15:37:36 jperkin Exp $
+$NetBSD: patch-sip_QtCore_qlist.sip,v 1.2 2018/01/17 19:18:47 markd Exp $
 
 Implement QList<long> for SunOS 32-bit pid_t.
 
---- sip/QtCore/qlist.sip.orig	2013-04-21 12:02:19.000000000 +0000
+--- sip/QtCore/qlist.sip.orig	2017-06-30 08:44:43.000000000 +0000
 +++ sip/QtCore/qlist.sip
-@@ -683,6 +683,68 @@ template<qreal, TYPE>
+@@ -682,6 +682,68 @@ template<qreal, TYPE>
      return sipGetState(sipTransferObj);
  %End
  };
@@ -71,5 +71,5 @@ Implement QList<long> for SunOS 32-bit pid_t.
 +%End
 +};
  // QList<unsigned> is implemented as a Python list of unsigned longs.
- %MappedType QList<unsigned> /DocType="list-of-int"/
+ %MappedType QList<unsigned> /TypeHintIn="Sequence[int]", TypeHintOut="List[int]", TypeHintValue="[]"/
  {