Thursday, March 05, 2020

Re: UPDATE: Qt 5.13.2

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-sip/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- Makefile 19 Feb 2020 15:27:01 -0000 1.49
+++ Makefile 5 Mar 2020 12:49:24 -0000
@@ -5,7 +5,7 @@
# XXX py-sip updates FREQUENTLY break other ports
# XXX BE ESPECIALLY CAREFUL WHEN TESTING UPDATES!

-MODPY_EGG_VERSION = 4.19.18
+MODPY_EGG_VERSION = 4.19.19
EPOCH= 0
DISTNAME= sip-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-sip/distinfo,v
retrieving revision 1.20
diff -u -r1.20 distinfo
--- distinfo 19 Feb 2020 15:27:01 -0000 1.20
+++ distinfo 5 Mar 2020 12:49:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (sip-4.19.18.tar.gz) = wL2GOADtmxXcrUd8QBfNtz+oBcJZCLAkBWSt101pfh4=
-SIZE (sip-4.19.18.tar.gz) = 1056840
+SHA256 (sip-4.19.19.tar.gz) = VDa2Gnj0jH6AeOk6a1lFOtM3gPgMZE5fOvOflL4e3kQ=
+SIZE (sip-4.19.19.tar.gz) = 1058422
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/py-qt5/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 19 Feb 2020 15:27:46 -0000 1.21
+++ Makefile 5 Mar 2020 16:02:52 -0000
@@ -2,8 +2,8 @@

COMMENT = python Qt5 bindings

-V= 5.9.2
-DISTNAME= PyQt5_gpl-${V}
+V= 5.13.2
+DISTNAME= PyQt5-${V}
PKGNAME= py-qt5-${V}

CATEGORIES= x11 devel
@@ -14,31 +14,35 @@
# GPLv3 with exceptions for use with certain named open-source licenses
PERMIT_PACKAGE= Yes

-WANTLIB = ${COMPILER_LIBCXX} ${MODPY_WANTLIB}
-WANTLIB += dbus-1 glib-2.0 intl m pthread pulse pulse-mainloop-glib
-WANTLIB += GL Qt5Bluetooth Qt5Core Qt5DBus Qt5Designer
-WANTLIB += Qt5Gui Qt5Help Qt5Multimedia Qt5MultimediaWidgets Qt5Network
-WANTLIB += Qt5OpenGL Qt5Positioning Qt5PrintSupport Qt5Qml Qt5Quick
-WANTLIB += Qt5QuickWidgets Qt5Sensors Qt5SerialPort Qt5Sql Qt5Svg
-WANTLIB += Qt5Test Qt5WebChannel Qt5WebKit Qt5WebKitWidgets Qt5WebSockets
-WANTLIB += Qt5Widgets Qt5X11Extras Qt5Xml Qt5XmlPatterns
-WANTLIB += Qt5Location Qt5Nfc
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Bluetooth Qt5Core Qt5DBus
+WANTLIB += Qt5Designer Qt5Gui Qt5Help Qt5Location Qt5Multimedia
+WANTLIB += Qt5MultimediaWidgets Qt5Network Qt5NetworkAuth Qt5Nfc
+WANTLIB += Qt5OpenGL Qt5Positioning Qt5PositioningQuick Qt5PrintSupport
+WANTLIB += Qt5Qml Qt5Quick Qt5QuickWidgets Qt5RemoteObjects Qt5Sensors
+WANTLIB += Qt5SerialPort Qt5Sql Qt5Svg Qt5Test Qt5WebChannel Qt5WebKit
+WANTLIB += Qt5WebKitWidgets Qt5WebSockets Qt5Widgets Qt5X11Extras
+WANTLIB += Qt5Xml Qt5XmlPatterns dbus-1 glib-2.0 intl m pulse
+WANTLIB += pulse-mainloop-glib ${MODPY_WANTLIB}

FLAVORS = python3
FLAVOR ?=

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/py-sip${MODPY_FLAVOR}>=4.19.1v0 \
+RUN_DEPENDS= devel/py-sip${MODPY_FLAVOR}>=4.19.19v0 \
+ x11/py-sip-qt5${MODPY_FLAVOR}>=4.19.19 \
x11/dbus-python${MODPY_FLAVOR}
+
LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
x11/qt5/qtconnectivity \
x11/qt5/qtdeclarative \
x11/qt5/qtlocation \
+ x11/qt5/qtnetworkauth \
x11/qt5/qtmultimedia \
x11/qt5/qtserialport \
x11/qt5/qtsensors \
x11/qt5/qtsvg \
x11/qt5/qttools \
+ x11/qt5/qtremoteobjects \
x11/qt5/qtwebchannel \
x11/qt5/qtwebkit \
x11/qt5/qtwebsockets \
@@ -47,11 +51,16 @@

NO_TEST= Yes

-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyqt/}
+MASTER_SITES= https://www.riverbankcomputing.com/static/Downloads/PyQt5/${V}/

MODULES= lang/python \
x11/qt5

+.if !${FLAVOR:Mpython3}
+BUILD_DEPENDS += devel/py-enum34
+RUN_DEPENDS += devel/py-enum34
+.endif
+
CONFIGURE_STYLE=simple
CONFIGURE_SCRIPT=${MODPY_BIN} configure.py
CONFIGURE_ARGS= --verbose \
@@ -63,6 +72,7 @@
--vendorid-incdir="${MODPY_INCDIR}" \
--vendorid-libdir="${MODPY_LIBDIR}" \
--no-qsci-api \
+ --confirm-license \
INCDIR_QT=${MODQT_INCDIR} \
LIBDIR="${X11BASE}/lib ${LOCALBASE}/lib" \
LIBDIR_QT=${MODQT_LIBDIR} \
@@ -73,7 +83,7 @@
FAKE_FLAGS= INSTALL_ROOT=${DESTDIR}
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}

-SUBST_VARS += MODPY_MAJOR_VERSION
+SUBST_VARS += MODPY_MAJOR_VERSION V

# the distfile has pyuic for both python 2 and 3, normally both are
# installed and they're selected at runtime. this breaks bytecode
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/py-qt5/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 19 Feb 2020 15:27:46 -0000 1.4
+++ distinfo 5 Mar 2020 16:02:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (PyQt5_gpl-5.9.2.tar.gz) = wZDaxZjJewETyl56N8ccYj8C0dcTCIrd+srErPpLg5Q=
-SIZE (PyQt5_gpl-5.9.2.tar.gz) = 3102848
+SHA256 (PyQt5-5.13.2.tar.gz) = rcF8B3vyM5h7jkOtqH0eDeypvXGhPl/V/Dd0gu1pyCc=
+SIZE (PyQt5-5.13.2.tar.gz) = 3162810
Index: patches/patch-configure_py
===================================================================
RCS file: /cvs/ports/x11/py-qt5/patches/patch-configure_py,v
retrieving revision 1.3
diff -u -r1.3 patch-configure_py
--- patches/patch-configure_py 19 Feb 2020 15:27:46 -0000 1.3
+++ patches/patch-configure_py 5 Mar 2020 16:02:52 -0000
@@ -2,7 +2,7 @@
Index: configure.py
--- configure.py.orig
+++ configure.py
-@@ -1991,7 +1991,18 @@ def run_command(cmd, verbose):
+@@ -2158,7 +2158,18 @@ def run_command(cmd, verbose):
""" Run a command and display the output if requested. cmd is the command
to run. verbose is set if the output is to be displayed.
"""
@@ -21,7 +21,7 @@
if verbose:
sys.stdout.write(cmd + "\n")

-@@ -2733,7 +2744,7 @@ Type 'no' to decline the terms of the license.
+@@ -2903,7 +2914,7 @@ Type 'no' to decline the terms of the license.
sys.stdout.flush()

try:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/py-qt5/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 19 Feb 2020 15:27:47 -0000 1.5
+++ pkg/PLIST 5 Mar 2020 16:02:52 -0000
@@ -3,7 +3,10 @@
bin/pylupdate5${MODPY_BIN_SUFFIX}
bin/pyrcc5${MODPY_BIN_SUFFIX}
bin/pyuic5${MODPY_BIN_SUFFIX}
-lib/python${MODPY_VERSION}/site-packages/PyQt5/
+lib/python${MODPY_VERSION}/site-packages/PyQt5-${V}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/PyQt5-${V}.dist-info/INSTALLER
+lib/python${MODPY_VERSION}/site-packages/PyQt5-${V}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/PyQt5-${V}.dist-info/RECORD
@so lib/python${MODPY_VERSION}/site-packages/PyQt5/Qt.so
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtBluetooth.pyi
@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtBluetooth.so
@@ -25,6 +28,8 @@
@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimediaWidgets.so
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNetwork.pyi
@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNetwork.so
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNetworkAuth.pyi
+@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNetworkAuth.so
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNfc.pyi
@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNfc.so
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtOpenGL.pyi
@@ -39,6 +44,8 @@
@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQuick.so
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQuickWidgets.pyi
@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQuickWidgets.so
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtRemoteObjects.pyi
+@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtRemoteObjects.so
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSensors.pyi
@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSensors.so
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSerialPort.pyi
@@ -118,7 +125,7 @@
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/objcreator.py
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v${MODPY_MAJOR_VERSION}/
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v${MODPY_MAJOR_VERSION}/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v3/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v${MODPY_MAJOR_VERSION}/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v${MODPY_MAJOR_VERSION}/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v${MODPY_MAJOR_VERSION}/${MODPY_PYCACHE}as_string.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v${MODPY_MAJOR_VERSION}/${MODPY_PYCACHE}ascii_upper.${MODPY_PYC_MAGIC_TAG}pyc
@@ -214,10 +221,13 @@
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qbuffer.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qbytearray.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qbytearraymatcher.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qcborcommon.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qcborstream.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qchar.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qcollator.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qcommandlineoption.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qcommandlineparser.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qconcatenatetablesproxymodel.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qcoreapplication.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qcoreevent.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qcryptographichash.sip
@@ -251,6 +261,7 @@
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qlocale.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qlockfile.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qlogging.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qloggingcategory.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qmargins.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qmessageauthenticationcode.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qmetaobject.sip
@@ -271,13 +282,16 @@
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qpoint.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qprocess.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qpropertyanimation.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qpycore_onexit.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qpycore_qhash.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qpycore_qlist.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qpycore_qmap.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qpycore_qpair.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qpycore_qset.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qpycore_qvariantmap.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qpycore_qvector.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qpycore_virtual_error_handler.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qrandom.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qreadwritelock.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qrect.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qregexp.sip
@@ -314,6 +328,7 @@
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qtimer.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qtimezone.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qtranslator.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qtransposeproxymodel.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qurl.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/qurlquery.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtCore/quuid.sip
@@ -462,9 +477,12 @@
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtGui/qwindowdefs.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtHelp/
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtHelp/QtHelpmod.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtHelp/qcompressedhelpinfo.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtHelp/qhelpcontentwidget.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtHelp/qhelpengine.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtHelp/qhelpenginecore.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtHelp/qhelpfilterdata.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtHelp/qhelpfilterengine.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtHelp/qhelpindexwidget.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtHelp/qhelpsearchengine.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtHelp/qhelpsearchquerywidget.sip
@@ -587,6 +605,8 @@
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetwork/qnetworkreply.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetwork/qnetworkrequest.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetwork/qnetworksession.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetwork/qocspresponse.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetwork/qpassworddigestor.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetwork/qpynetwork_qhash.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetwork/qpynetwork_qmap.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetwork/qssl.sip
@@ -603,6 +623,16 @@
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetwork/qtcpserver.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetwork/qtcpsocket.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetwork/qudpsocket.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetworkAuth/
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetworkAuth/QtNetworkAuthmod.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetworkAuth/qabstractoauth.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetworkAuth/qabstractoauth2.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetworkAuth/qabstractoauthreplyhandler.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetworkAuth/qoauth1.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetworkAuth/qoauth1signature.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetworkAuth/qoauth2authorizationcodeflow.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetworkAuth/qoauthhttpserverreplyhandler.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNetworkAuth/qoauthoobreplyhandler.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNfc/
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNfc/QtNfcmod.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtNfc/qndeffilter.sip
@@ -628,6 +658,7 @@
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtPositioning/qgeocoordinate.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtPositioning/qgeolocation.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtPositioning/qgeopath.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtPositioning/qgeopolygon.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtPositioning/qgeopositioninfo.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtPositioning/qgeopositioninfosource.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtPositioning/qgeorectangle.sip
@@ -654,6 +685,7 @@
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtQml/qmlattachedpropertiesobject.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtQml/qmlregistertype.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtQml/qpyqmllistproperty.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtQml/qqml.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtQml/qqmlabstracturlinterceptor.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtQml/qqmlapplicationengine.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtQml/qqmlcomponent.sip
@@ -701,6 +733,14 @@
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtQuickWidgets/
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtQuickWidgets/QtQuickWidgetsmod.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtQuickWidgets/qquickwidget.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtRemoteObjects/
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtRemoteObjects/QtRemoteObjectsmod.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtRemoteObjects/qremoteobjectabstractitemmodelreplica.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtRemoteObjects/qremoteobjectdynamicreplica.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtRemoteObjects/qremoteobjectnode.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtRemoteObjects/qremoteobjectregistry.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtRemoteObjects/qremoteobjectreplica.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtRemoteObjects/qtremoteobjectglobal.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtSensors/
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtSensors/QtSensorsmod.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtSensors/qaccelerometer.sip
@@ -751,6 +791,7 @@
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtSvg/qsvgwidget.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtTest/
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtTest/QtTestmod.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtTest/qabstractitemmodeltester.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtTest/qsignalspy.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtTest/qtestcase.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtTest/qtestkeyboard.sip
@@ -761,32 +802,6 @@
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebChannel/QtWebChannelmod.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebChannel/qwebchannel.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebChannel/qwebchannelabstracttransport.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngine/
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngine/QtWebEnginemod.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngine/qquickwebengineprofile.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngine/qquickwebenginescript.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngine/qtwebengineglobal.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineCore/
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineCore/QtWebEngineCoremod.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineCore/qwebenginecookiestore.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineCore/qwebenginehttprequest.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineCore/qwebengineurlrequestinfo.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineCore/qwebengineurlrequestinterceptor.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineCore/qwebengineurlrequestjob.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineCore/qwebengineurlschemehandler.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineWidgets/
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineWidgets/qwebenginecertificateerror.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineWidgets/qwebenginecontextmenudata.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineWidgets/qwebenginedownloaditem.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineWidgets/qwebenginefullscreenrequest.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineWidgets/qwebenginehistory.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineWidgets/qwebenginepage.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineWidgets/qwebengineprofile.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineWidgets/qwebenginescript.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineWidgets/qwebenginescriptcollection.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineWidgets/qwebenginesettings.sip
-share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebEngineWidgets/qwebengineview.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebKit/
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebKit/QtWebKitmod.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtWebKit/qwebdatabase.sip
On Thu, Mar 05, 2020 at 02:14:42PM +0000, Stuart Henderson wrote:
> Looking better! Stray blank line in py-qt5-sip DESCR otherwise OK sthen@
> to import that.

in the end its completely fucked up, because tortoisehg (py2 only) fails
to build with this py-qt5 without its sip counterpart, so i duplicated
the py-sip port as py-sip-qt5 (can of course change the name) with a
4.19.19 version, as the 12.7.1 on pypi explicitely targets py3 only.
argh. dont look at the port itself, i know there are CVS dirs,
CONFIGURE_ARGS is what matters with --no-tools --sip-module.

while here, removed some churn from pyqt5 PLIST diff (thePYQT_VERSION
var serves no purpose), and send the right diffs.

oh boy that's a pain.

Landry

No comments:

Post a Comment