On 2020/03/03 18:16, Rafael Sadowski wrote:
> On Mon Mar 02, 2020 at 06:09:01PM +0100, Rafael Sadowski wrote:
> > On Mon Mar 02, 2020 at 03:41:55PM +0100, Landry Breuil wrote:
> > > On Mon, Mar 02, 2020 at 02:34:05PM +0000, Stuart Henderson wrote:
> > > > On 2020/02/29 18:38, Landry Breuil wrote:
> > > > > On Sat, Feb 29, 2020 at 03:51:13PM +0000, Stuart Henderson wrote:
> > > > > > On 2020/02/29 07:27, Landry Breuil wrote:
> > > > > > > On Thu, Feb 27, 2020 at 08:48:55AM +0100, Rafael Sadowski wrote:
> > > >
> > > > Looking at
> > > > https://www.riverbankcomputing.com/static/Docs/PyQt5/installation.html
> > > >
> > > > "It is not necessary to install the PyQt5.sip module before building
> > > > PyQt5 but it must be installed before PyQt5 can be used.
> >
> > Fu** I missed this in my diff! BIG SORRY
> >
> > > >
> > > > The module is built using setuptools and is available from the PyQt5-sip
> > > > project at PyPI. It uses setuptools as its build system and can be
> > > > installed by pip or you can also unpack the sdist and install it by
> > > > running its setup.py script."
> > > >
> > > > So it looks like this should probably be a separate port ..
> > >
> > > ah, so its now a separate port, that should be a RUN_DEPENDS for py-qt5
> > > ? rafael, does it ring a bell to you ?
> >
> > Yeah, this is necessary, sorry for missing this in my last diff. It's
> > hard to painful to create such large diffs!
> >
>
> New diff which includes the missing py-sip bits. Not yet adjusted,
> landrys py-qt5 diff.
>
>
> Index: devel/py-sip/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-sip/Makefile,v
> retrieving revision 1.49
> diff -u -p -r1.49 Makefile
> --- devel/py-sip/Makefile 19 Feb 2020 15:27:01 -0000 1.49
> +++ devel/py-sip/Makefile 3 Mar 2020 17:07:58 -0000
> @@ -5,7 +5,7 @@ COMMENT= automatically generate Python b
> # 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}
> @@ -33,6 +33,7 @@ CONFIGURE_ARGS= -b ${PREFIX}/bin \
> -d ${MODPY_SITEPKG} \
> -e ${MODPY_INCDIR} \
> -v ${PREFIX}/share/sip \
> + --sip-module PyQt5.sip \
> INCDIR=${LOCALBASE}/include \
> LIBDIR=${LOCALBASE}/lib \
> CC=${CC} CXX=${CXX} \
> Index: devel/py-sip/distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-sip/distinfo,v
> retrieving revision 1.20
> diff -u -p -r1.20 distinfo
> --- devel/py-sip/distinfo 19 Feb 2020 15:27:01 -0000 1.20
> +++ devel/py-sip/distinfo 3 Mar 2020 17:07:58 -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: devel/py-sip/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-sip/pkg/PLIST,v
> retrieving revision 1.11
> diff -u -p -r1.11 PLIST
> --- devel/py-sip/pkg/PLIST 27 Jan 2020 10:31:00 -0000 1.11
> +++ devel/py-sip/pkg/PLIST 3 Mar 2020 17:07:58 -0000
> @@ -1,15 +1,16 @@
> @comment $OpenBSD: PLIST,v 1.11 2020/01/27 10:31:00 rsadowski Exp $
> @bin bin/sip${MODPY_BIN_SUFFIX}
> include/python${MODPY_VERSION}${MODPY_LIB_SUFFIX}/sip.h
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/sip.pyi
> +@so lib/python${MODPY_VERSION}/site-packages/PyQt5/sip.so
> +lib/python${MODPY_VERSION}/site-packages/PyQt5_sip-${MODPY_EGG_VERSION}.dist-info/
> +lib/python${MODPY_VERSION}/site-packages/PyQt5_sip-${MODPY_EGG_VERSION}.dist-info/INSTALLER
> +lib/python${MODPY_VERSION}/site-packages/PyQt5_sip-${MODPY_EGG_VERSION}.dist-info/METADATA
> +lib/python${MODPY_VERSION}/site-packages/PyQt5_sip-${MODPY_EGG_VERSION}.dist-info/RECORD
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sipconfig.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sipdistutils.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/sip-${MODPY_EGG_VERSION}.dist-info/
> -lib/python${MODPY_VERSION}/site-packages/sip-${MODPY_EGG_VERSION}.dist-info/INSTALLER
> -lib/python${MODPY_VERSION}/site-packages/sip-${MODPY_EGG_VERSION}.dist-info/METADATA
> -lib/python${MODPY_VERSION}/site-packages/sip-${MODPY_EGG_VERSION}.dist-info/RECORD
> -lib/python${MODPY_VERSION}/site-packages/sip.pyi
> -@so lib/python${MODPY_VERSION}/site-packages/sip.so
> lib/python${MODPY_VERSION}/site-packages/sipconfig.py
> lib/python${MODPY_VERSION}/site-packages/sipdistutils.py
> share/doc/${MODPY_PY_PREFIX}sip/
This looks wrong. py-qt5 is not the only thing using py-sip, I think you
need either a separate port or a flavour for this.
> Index: x11/py-qt5/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/py-qt5/Makefile,v
> retrieving revision 1.21
> diff -u -p -r1.21 Makefile
> --- x11/py-qt5/Makefile 19 Feb 2020 15:27:46 -0000 1.21
> +++ x11/py-qt5/Makefile 3 Mar 2020 17:08:32 -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,34 @@ MAINTAINER= KDE porting team <openbsd-kd
> # 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/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 +50,19 @@ LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
>
> 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
> +PYQT_VERSION = PyQt5
> +.else
> +PYQT_VERSION = PyQt5-${MODPY_MAJOR_VERSION}
> +.endif
> +
> CONFIGURE_STYLE=simple
> CONFIGURE_SCRIPT=${MODPY_BIN} configure.py
> CONFIGURE_ARGS= --verbose \
> @@ -63,6 +74,7 @@ CONFIGURE_ARGS= --verbose \
> --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 +85,7 @@ CONFIGURE_ARGS= --verbose \
> FAKE_FLAGS= INSTALL_ROOT=${DESTDIR}
> CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
>
> -SUBST_VARS += MODPY_MAJOR_VERSION
> +SUBST_VARS += MODPY_MAJOR_VERSION PYQT_VERSION
>
> # the distfile has pyuic for both python 2 and 3, normally both are
> # installed and they're selected at runtime. this breaks bytecode
> Index: x11/py-qt5/distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/py-qt5/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- x11/py-qt5/distinfo 19 Feb 2020 15:27:46 -0000 1.4
> +++ x11/py-qt5/distinfo 3 Mar 2020 17:08:32 -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: x11/py-qt5/patches/patch-configure_py
> ===================================================================
> RCS file: /cvs/ports/x11/py-qt5/patches/patch-configure_py,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-configure_py
> --- x11/py-qt5/patches/patch-configure_py 19 Feb 2020 15:27:46 -0000
> 1.3
> +++ x11/py-qt5/patches/patch-configure_py 3 Mar 2020 17:08:32 -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-configure_py,v 1.3 2020/
> 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 @@ Index: configure.py
> 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: x11/py-qt5/pkg/PFRAG.python3
> ===================================================================
> RCS file: x11/py-qt5/pkg/PFRAG.python3
> diff -N x11/py-qt5/pkg/PFRAG.python3
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ x11/py-qt5/pkg/PFRAG.python3 3 Mar 2020 17:08:32 -0000
> @@ -0,0 +1,34 @@
> +@comment $OpenBSD: PLIST,v 1.5 2020/02/19 15:27:47 bket Exp $
> +@pkgpath x11/py-qt5,-main
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtBluetooth.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtCore.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtDBus.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtDesigner.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtGui.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtHelp.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtLocation.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimedia.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimediaWidgets.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNetwork.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNetworkAuth.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNfc.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtOpenGL.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtPositioning.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtPrintSupport.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQml.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQuick.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQuickWidgets.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtRemoteObjects.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSensors.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSerialPort.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSql.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSvg.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtTest.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebChannel.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKit.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKitWidgets.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebSockets.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWidgets.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtX11Extras.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtXml.pyi
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/QtXmlPatterns.pyi
PFRAG.python3 is not needed, these entries were fine how they were
in PLIST with the ${MODPY_COMMENT} prefix.
> Index: x11/py-qt5/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/py-qt5/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- x11/py-qt5/pkg/PLIST 19 Feb 2020 15:27:47 -0000 1.5
> +++ x11/py-qt5/pkg/PLIST 3 Mar 2020 17:08:32 -0000
> @@ -3,73 +3,48 @@
> 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-5.13.2.dist-info/
> +lib/python${MODPY_VERSION}/site-packages/PyQt5-5.13.2.dist-info/INSTALLER
> +lib/python${MODPY_VERSION}/site-packages/PyQt5-5.13.2.dist-info/METADATA
> +lib/python${MODPY_VERSION}/site-packages/PyQt5-5.13.2.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
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtCore.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtCore.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtDBus.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtDBus.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtDesigner.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtDesigner.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtGui.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtGui.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtHelp.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtHelp.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtLocation.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtLocation.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimedia.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimedia.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimediaWidgets.pyi
> @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/QtNfc.pyi
> +@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNetworkAuth.so
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNfc.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtOpenGL.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtOpenGL.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtPositioning.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtPositioning.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtPrintSupport.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtPrintSupport.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQml.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQml.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQuick.pyi
> @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/QtSensors.pyi
> +@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtRemoteObjects.so
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSensors.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSerialPort.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSerialPort.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSql.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSql.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSvg.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSvg.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtTest.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtTest.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebChannel.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebChannel.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKit.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKit.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKitWidgets.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKitWidgets.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebSockets.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebSockets.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWidgets.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWidgets.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtX11Extras.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtX11Extras.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtXml.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtXml.so
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtXmlPatterns.pyi
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtXmlPatterns.so
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/_QOpenGLFunctions_2_0.so
> @so lib/python${MODPY_VERSION}/site-packages/PyQt5/_QOpenGLFunctions_2_1.so
> @so
> lib/python${MODPY_VERSION}/site-packages/PyQt5/_QOpenGLFunctions_4_1_Core.so
> lib/python${MODPY_VERSION}/site-packages/PyQt5/__init__.py
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/PyQt5/${MODPY_PYCACHE}/
${MODPY_COMMENT} should be reinstated here.
>
> lib/python${MODPY_VERSION}/site-packages/PyQt5/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/PyQt5/${MODPY_PYCACHE}pylupdate_main.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/PyQt5/${MODPY_PYCACHE}pyrcc_main.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -118,7 +93,7 @@ lib/python${MODPY_VERSION}/site-packages
> 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}/
port_v3 should be reinstated here.
>
> 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
> @@ -152,821 +127,829 @@ lib/qt5/plugins/PyQt5/
> @so lib/qt5/plugins/PyQt5/libpyqt5qmlplugin${MODPY_BIN_SUFFIX}.so
> @so lib/qt5/plugins/designer/libpyqt5${MODPY_BIN_SUFFIX}.so
> share/sip/
> -share/sip/PyQt5${MODPY_BIN_SUFFIX}/
> -share/sip/PyQt5${MODPY_BIN_SUFFIX}/Enginio/
<snip rest and x11/qt5 pieces, all of which reads ok>
Question: does the *existing* py-qt5 work with the new x11/qt5 pieces?
If it does, it would be really useful to get the x11/qt5 parts out the way
first.
