Here is an update diff to update:
- x11/py-qt5
- x11/py-qtawesome
- x11/py-qtpy
- x11/py-sip-qt5
- editors/qscintilla
- editors/py-qscintilla
- devel/py-qt-builder
- devel/py-sip
- www/py-qtwebengine
veusz need to be fixed before we can discuss to update this but I think
it makes sense to share is work. I tested geo/qgis and www/qutebrowser
with the qt5.15.5 update and the diff below at runtime.
Here some notable changes/informations:
- sip-build no longer support following options:
--qmake ${MODQT5_QMAKE} --jobs ${MAKE_JOBS} --no-make
We have to set qmake in PATH. I solve this by:
+post-extract:
+ # Need to run sip-6.5+ sip-build
+ ln -sf ${MODQT5_QMAKE} ${WRKDIR}/bin/qmake
- qgis builds fine with:
devel/py-sip/patches/patch-sipbuild_generator_parser_instantiations_py
See: https://github.com/qgis/QGIS/issues/49214
- XXX math/veusz broken
ImportError: cannot import name 'parse' from 'sipbuild.code_generator'
(/usr/local/lib/python3.9/site-packages/sipbuild/code_generator.abi3.so)
https://github.com/veusz/veusz/issues/595
Rafael
Index: x11/py-qt5/Makefile
===================================================================
RCS file: /cvs/ports/x11/py-qt5/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- x11/py-qt5/Makefile 11 Mar 2022 20:16:57 -0000 1.31
+++ x11/py-qt5/Makefile 7 Jul 2022 06:11:48 -0000
@@ -2,10 +2,9 @@ COMMENT= Python bindings for Qt5
DPB_PROPERTIES= parallel
-MODPY_EGG_VERSION= 5.15.6
+MODPY_EGG_VERSION= 5.15.7
DISTNAME= PyQt5-${MODPY_EGG_VERSION}
PKGNAME= py-qt5-${MODPY_EGG_VERSION}
-REVISION= 0
CATEGORIES= x11 devel
@@ -29,10 +28,12 @@ FLAVORS= python3
FLAVOR= python3
BUILD_DEPENDS= devel/py-qt-builder${MODPY_FLAVOR} \
+ devel/py-ply${MODPY_FLAVOR} \
x11/dbus-python${MODPY_FLAVOR}
RUN_DEPENDS= devel/py-sip${MODPY_FLAVOR}>=5.5.0v0 \
x11/py-sip-qt5${MODPY_FLAVOR}>=12.8 \
+ devel/py-ply${MODPY_FLAVOR} \
x11/dbus-python${MODPY_FLAVOR}
LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
@@ -62,11 +63,7 @@ MODPY_PI= Yes
#
https://www.riverbankcomputing.com/static/Docs/PyQt5/installation.html#building-pyqt5
CONFIGURE_STYLE= simple
CONFIGURE_SCRIPT= ${LOCALBASE}/bin/sip-build
-CONFIGURE_ARGS= --verbose \
- --qmake ${MODQT5_QMAKE} \
- --jobs ${MAKE_JOBS} \
- --no-make \
- --confirm-license
+CONFIGURE_ARGS = --verbose --confirm-license
MAKE_FLAGS= -C build \
CC=${CC} \
@@ -75,6 +72,10 @@ MAKE_FLAGS= -C build \
CXXOPTS="${CXXFLAGS}"
FAKE_FLAGS= INSTALL_ROOT=${DESTDIR}
+
+post-extract:
+ # Need to run sip-6.5+ sip-build
+ ln -sf ${MODQT5_QMAKE} ${WRKDIR}/bin/qmake
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
Index: x11/py-qt5/distinfo
===================================================================
RCS file: /cvs/ports/x11/py-qt5/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- x11/py-qt5/distinfo 31 Oct 2021 17:08:38 -0000 1.8
+++ x11/py-qt5/distinfo 7 Jul 2022 06:11:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (PyQt5-5.15.6.tar.gz) = gDQ7yrlf+6YZ8u0kZ/2Cj/6wolGtciW+X8BtzDM69FI=
-SIZE (PyQt5-5.15.6.tar.gz) = 3239505
+SHA256 (PyQt5-5.15.7.tar.gz) = dVEhpSs6CMsHJ1wQ67lldtNuMg5XJZHbFs/bxVgQFZQ=
+SIZE (PyQt5-5.15.7.tar.gz) = 3238978
Index: x11/py-qt5/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/py-qt5/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- x11/py-qt5/pkg/PLIST 11 Mar 2022 20:16:57 -0000 1.11
+++ x11/py-qt5/pkg/PLIST 7 Jul 2022 06:11:48 -0000
@@ -78,6 +78,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/
lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/QtCore.toml
lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/QtCoremod.sip
+lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/pyqt-gpl.sip5
lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/qabstractanimation.sip
lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/qabstracteventdispatcher.sip
lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtCore/qabstractitemmodel.sip
Index: x11/py-qtawesome/Makefile
===================================================================
RCS file: /cvs/ports/x11/py-qtawesome/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- x11/py-qtawesome/Makefile 11 Mar 2022 20:16:57 -0000 1.10
+++ x11/py-qtawesome/Makefile 7 Jul 2022 06:11:48 -0000
@@ -1,10 +1,9 @@
COMMENT = FontAwesome icons in PyQt and PySide applications
-MODPY_EGG_VERSION = 1.0.2
+MODPY_EGG_VERSION = 1.1.1
DISTNAME = QtAwesome-${MODPY_EGG_VERSION}
PKGNAME = py-qtawesome-${MODPY_EGG_VERSION}
CATEGORIES = x11
-REVISION = 0
HOMEPAGE = https://github.com/spyder-ide/qtawesome
Index: x11/py-qtawesome/distinfo
===================================================================
RCS file: /cvs/ports/x11/py-qtawesome/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- x11/py-qtawesome/distinfo 15 Feb 2021 21:28:12 -0000 1.4
+++ x11/py-qtawesome/distinfo 7 Jul 2022 06:11:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (QtAwesome-1.0.2.tar.gz) = dx3ZWsT1DWR9GLTokv0xClgLVtJYR2VUx7NJhZPf2Ic=
-SIZE (QtAwesome-1.0.2.tar.gz) = 878664
+SHA256 (QtAwesome-1.1.1.tar.gz) = 7ALiACMfpooUapOEWJCqBDKn7cuhS/gR/2l1z5rNq10=
+SIZE (QtAwesome-1.1.1.tar.gz) = 2277767
Index: x11/py-qtawesome/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/py-qtawesome/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- x11/py-qtawesome/pkg/PLIST 11 Mar 2022 20:16:57 -0000 1.5
+++ x11/py-qtawesome/pkg/PLIST 7 Jul 2022 06:11:48 -0000
@@ -15,9 +15,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/qtawesome/${MODPY_PYCACHE}animation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtawesome/${MODPY_PYCACHE}icon_browser.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtawesome/${MODPY_PYCACHE}iconic_font.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtawesome/${MODPY_PYCACHE}styles.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtawesome/_version.py
lib/python${MODPY_VERSION}/site-packages/qtawesome/animation.py
lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/codicon-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/codicon.ttf
lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/elusiveicons-webfont-charmap.json
lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/elusiveicons-webfont.ttf
lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome4.7-webfont-charmap.json
@@ -28,10 +31,17 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-regular-webfont.ttf
lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-solid-webfont-charmap.json
lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-solid-webfont.ttf
-lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/materialdesignicons-webfont-charmap.json
-lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/materialdesignicons-webfont.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/materialdesignicons5-webfont-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/materialdesignicons5-webfont.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/materialdesignicons6-webfont-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/materialdesignicons6-webfont.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/phosphor-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/phosphor.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/remixicon-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/remixicon.ttf
lib/python${MODPY_VERSION}/site-packages/qtawesome/icon_browser.py
lib/python${MODPY_VERSION}/site-packages/qtawesome/iconic_font.py
+lib/python${MODPY_VERSION}/site-packages/qtawesome/styles.py
lib/python${MODPY_VERSION}/site-packages/qtawesome/tests/
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/qtawesome/tests/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/qtawesome/tests/${MODPY_PYCACHE}test_icon_browser.${MODPY_PYC_MAGIC_TAG}pyc
Index: x11/py-qtpy/Makefile
===================================================================
RCS file: /cvs/ports/x11/py-qtpy/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- x11/py-qtpy/Makefile 11 Mar 2022 20:16:57 -0000 1.16
+++ x11/py-qtpy/Makefile 7 Jul 2022 06:11:48 -0000
@@ -1,10 +1,9 @@
COMMENT = provides an abstraction layer of various Qt bindings
-MODPY_EGG_VERSION = 1.9.0
+MODPY_EGG_VERSION = 2.1.0
DISTNAME = QtPy-${MODPY_EGG_VERSION}
PKGNAME = py-qtpy-${MODPY_EGG_VERSION}
CATEGORIES = x11
-REVISION = 0
HOMEPAGE = https://github.com/spyder-ide/qtpy
Index: x11/py-qtpy/distinfo
===================================================================
RCS file: /cvs/ports/x11/py-qtpy/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- x11/py-qtpy/distinfo 13 Feb 2021 23:01:10 -0000 1.8
+++ x11/py-qtpy/distinfo 7 Jul 2022 06:11:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (QtPy-1.9.0.tar.gz) = LbcsRLVdD+FAe+j7o1yDitDW07uB8jAHiG3B/A9FnI0=
-SIZE (QtPy-1.9.0.tar.gz) = 35522
+SHA256 (QtPy-2.1.0.tar.gz) = yozUIXF1GGNEKZ7kwPfnrc82LHCFK6NbJVpTQHcCXAY=
+SIZE (QtPy-2.1.0.tar.gz) = 46470
Index: x11/py-qtpy/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/py-qtpy/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- x11/py-qtpy/pkg/PLIST 11 Mar 2022 20:16:57 -0000 1.7
+++ x11/py-qtpy/pkg/PLIST 7 Jul 2022 06:11:48 -0000
@@ -1,8 +1,12 @@
@pkgpath x11/py-qtpy
+bin/qtpy
lib/python${MODPY_VERSION}/site-packages/QtPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/QtPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/QtPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/QtPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/QtPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/QtPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/QtPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/QtPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/qtpy/
lib/python${MODPY_VERSION}/site-packages/qtpy/Qt3DAnimation.py
@@ -13,7 +17,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/qtpy/Qt3DRender.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtCharts.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtCore.py
-lib/python${MODPY_VERSION}/site-packages/qtpy/QtDatavisualization.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtDBus.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtDataVisualization.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtDesigner.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtGui.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtHelp.py
@@ -21,20 +26,33 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/qtpy/QtMultimedia.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtMultimediaWidgets.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtNetwork.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtNetworkAuth.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtOpenGL.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtOpenGLWidgets.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtPositioning.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtPrintSupport.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtQml.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtQuick.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtQuickWidgets.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtRemoteObjects.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtSensors.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtSerialPort.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtSql.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtSvg.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtTest.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtTextToSpeech.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtWebChannel.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtWebEngine.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtWebEngineCore.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtWebEngineQuick.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtWebEngineWidgets.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtWebSockets.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtWidgets.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtWinExtras.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/QtXml.py
lib/python${MODPY_VERSION}/site-packages/qtpy/QtXmlPatterns.py
lib/python${MODPY_VERSION}/site-packages/qtpy/__init__.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/__main__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}Qt3DAnimation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}Qt3DCore.${MODPY_PYC_MAGIC_TAG}pyc
@@ -44,7 +62,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}Qt3DRender.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtCharts.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtCore.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtDatavisualization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtDBus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtDataVisualization.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtDesigner.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtGui.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtHelp.${MODPY_PYC_MAGIC_TAG}pyc
@@ -52,45 +71,51 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtMultimedia.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtMultimediaWidgets.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtNetwork.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtNetworkAuth.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtOpenGL.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtOpenGLWidgets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtPositioning.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtPrintSupport.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtQml.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtQuick.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtQuickWidgets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtRemoteObjects.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtSensors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtSerialPort.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtSql.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtSvg.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtTest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtTextToSpeech.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtWebChannel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtWebEngine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtWebEngineCore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtWebEngineQuick.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtWebEngineWidgets.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtWebSockets.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtWidgets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtWinExtras.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtXml.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}QtXmlPatterns.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}py3compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}enums_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}sip.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/${MODPY_PYCACHE}uic.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/qtpy/_patch/
-lib/python${MODPY_VERSION}/site-packages/qtpy/_patch/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/qtpy/_patch/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/qtpy/_patch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/qtpy/_patch/${MODPY_PYCACHE}qcombobox.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/qtpy/_patch/${MODPY_PYCACHE}qheaderview.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/qtpy/_patch/qcombobox.py
-lib/python${MODPY_VERSION}/site-packages/qtpy/_patch/qheaderview.py
-lib/python${MODPY_VERSION}/site-packages/qtpy/_version.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/cli.py
lib/python${MODPY_VERSION}/site-packages/qtpy/compat.py
-lib/python${MODPY_VERSION}/site-packages/qtpy/py3compat.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/enums_compat.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/py.typed
+lib/python${MODPY_VERSION}/site-packages/qtpy/sip.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}runtests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_cli.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_macos_checks.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_main.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_patch_qcombobox.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_patch_qheaderview.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qdesktopservice_split.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qt3danimation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qt3dcore.${MODPY_PYC_MAGIC_TAG}pyc
@@ -101,30 +126,46 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtcharts.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtcore.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtdatavisualization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtdbus.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtdesigner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtgui.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qthelp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtlocation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtmultimedia.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtmultimediawidgets.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtnetwork.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtnetworkauth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtopengl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtopenglwidgets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtpositioning.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtprintsupport.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtqml.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtquick.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtquickwidgets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtremoteobjects.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtsensors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtserialport.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtsql.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtsvg.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qttest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qttexttospeech.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtwebchannel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtwebenginecore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtwebenginequick.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtwebenginewidgets.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtwebsockets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtwidgets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtwinextras.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtxml.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_qtxmlpatterns.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}test_uic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/conftest.py
-lib/python${MODPY_VERSION}/site-packages/qtpy/tests/runtests.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test.ui
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_cli.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_custom.ui
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_macos_checks.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_main.py
-lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_patch_qcombobox.py
-lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_patch_qheaderview.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qdesktopservice_split.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qt3danimation.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qt3dcore.py
@@ -135,22 +176,38 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtcharts.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtcore.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtdatavisualization.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtdbus.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtdesigner.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtgui.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qthelp.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtlocation.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtmultimedia.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtmultimediawidgets.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtnetwork.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtnetworkauth.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtopengl.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtopenglwidgets.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtpositioning.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtprintsupport.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtqml.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtquick.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtquickwidgets.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtremoteobjects.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtsensors.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtserialport.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtsql.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtsvg.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qttest.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qttexttospeech.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtwebchannel.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtwebenginecore.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtwebenginequick.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtwebenginewidgets.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtwebsockets.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtwidgets.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtwinextras.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtxml.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_qtxmlpatterns.py
lib/python${MODPY_VERSION}/site-packages/qtpy/tests/test_uic.py
+lib/python${MODPY_VERSION}/site-packages/qtpy/tests/utils.py
lib/python${MODPY_VERSION}/site-packages/qtpy/uic.py
Index: x11/py-sip-qt5/Makefile
===================================================================
RCS file: /cvs/ports/x11/py-sip-qt5/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- x11/py-sip-qt5/Makefile 27 Mar 2022 16:23:10 -0000 1.9
+++ x11/py-sip-qt5/Makefile 7 Jul 2022 06:11:48 -0000
@@ -1,10 +1,9 @@
COMMENT= sip module support for PyQt5
-MODPY_EGG_VERSION= 12.9.0
+MODPY_EGG_VERSION= 12.11.0
DISTNAME= PyQt5_sip-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME:L}
-REVISION= 1
WANTLIB = pthread
CATEGORIES= x11
Index: x11/py-sip-qt5/distinfo
===================================================================
RCS file: /cvs/ports/x11/py-sip-qt5/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- x11/py-sip-qt5/distinfo 31 Oct 2021 17:08:42 -0000 1.4
+++ x11/py-sip-qt5/distinfo 7 Jul 2022 06:11:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (PyQt5_sip-12.9.0.tar.gz) = 0+RInXwrDs6dIDrmblc5Off2DU0p4InJ8R2qF8/qrjI=
-SIZE (PyQt5_sip-12.9.0.tar.gz) = 103007
+SHA256 (PyQt5_sip-12.11.0.tar.gz) =
tHEP2FtX7e9xbMVfrkW/1b+sb8e6kQNvHcw/Mxyg6zk=
+SIZE (PyQt5_sip-12.11.0.tar.gz) = 122792
Index: editors/qscintilla/Makefile
===================================================================
RCS file: /cvs/ports/editors/qscintilla/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- editors/qscintilla/Makefile 11 Mar 2022 18:58:33 -0000 1.31
+++ editors/qscintilla/Makefile 7 Jul 2022 06:11:48 -0000
@@ -1,9 +1,9 @@
COMMENT = Qt port of the Scintilla source code editor
# XXX update py-qscintilla alongside this port (same distfile).
-VERSION = 2.11.6
-DISTNAME = QScintilla-${VERSION}
-PKGNAME = ${DISTNAME:L}
+VERSION = 2.13.3
+DISTNAME = QScintilla_src-${VERSION}
+PKGNAME = qscintilla-${VERSION}
CATEGORIES = editors x11
@@ -26,7 +26,7 @@ SEPARATE_BUILD = No
CONFIGURE_ENV = HOME=${WRKDIR}
-WRKSRC = ${WRKDIST}/Qt4Qt5
+WRKSRC = ${WRKDIST}/src
NO_TEST = Yes
Index: editors/qscintilla/distinfo
===================================================================
RCS file: /cvs/ports/editors/qscintilla/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- editors/qscintilla/distinfo 19 Jan 2021 06:26:49 -0000 1.10
+++ editors/qscintilla/distinfo 7 Jul 2022 06:11:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (QScintilla-2.11.6.tar.gz) =
5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc=
-SIZE (QScintilla-2.11.6.tar.gz) = 3027764
+SHA256 (QScintilla_src-2.13.3.tar.gz) =
cR0o43yPzKqCKejjmls7LZfz//xj2hC3HHG4T6Nkk5g=
+SIZE (QScintilla_src-2.13.3.tar.gz) = 3060031
Index: editors/qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h
===================================================================
RCS file: editors/qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h
diff -N editors/qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h
--- editors/qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h 11 Mar
2022 18:58:33 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-Index: Qt4Qt5/Qsci/qsciscintillabase.h
---- Qt4Qt5/Qsci/qsciscintillabase.h.orig
-+++ Qt4Qt5/Qsci/qsciscintillabase.h
-@@ -26,6 +26,7 @@
- #include <QAbstractScrollArea>
- #include <QByteArray>
- #include <QPoint>
-+#include <QUrl>
- #include <QTimer>
-
- #include <Qsci/qsciglobal.h>
-@@ -37,7 +38,6 @@ class QImage;
- class QMimeData;
- class QPainter;
- class QPixmap;
--class QUrl;
- QT_END_NAMESPACE
-
- class QsciScintillaQt;
Index: editors/qscintilla/patches/patch-Qt4Qt5_qscintilla_pro
===================================================================
RCS file: editors/qscintilla/patches/patch-Qt4Qt5_qscintilla_pro
diff -N editors/qscintilla/patches/patch-Qt4Qt5_qscintilla_pro
--- editors/qscintilla/patches/patch-Qt4Qt5_qscintilla_pro 11 Mar 2022
18:58:33 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: Qt4Qt5/qscintilla.pro
---- Qt4Qt5/qscintilla.pro.orig
-+++ Qt4Qt5/qscintilla.pro
-@@ -72,7 +72,7 @@ unix:!macx {
- # Scintilla namespace rather than pollute the global namespace.
- #DEFINES += SCI_NAMESPACE
-
--target.path = $$[QT_INSTALL_LIBS]
-+target.path = ${LOCALBASE}/lib
- INSTALLS += target
-
- header.path = $$[QT_INSTALL_HEADERS]
Index: editors/qscintilla/patches/patch-src_RunStyles_cpp
===================================================================
RCS file: editors/qscintilla/patches/patch-src_RunStyles_cpp
diff -N editors/qscintilla/patches/patch-src_RunStyles_cpp
--- editors/qscintilla/patches/patch-src_RunStyles_cpp 11 Mar 2022 18:58:33
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-32-bits consumers fix for
-"undefined reference to Scintilla::RunStyles<long, char>::RunStyles()"
-
-Index: src/RunStyles.cpp
---- src/RunStyles.cpp.orig
-+++ src/RunStyles.cpp
-@@ -308,7 +308,8 @@ void RunStyles<DISTANCE, STYLE>::Check() const {
-
- template class Scintilla::RunStyles<int, int>;
- template class Scintilla::RunStyles<int, char>;
--#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU
-+#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU || \
-+ ( defined(__OpenBSD__) && !defined(__LP64__) )
- template class Scintilla::RunStyles<ptrdiff_t, int>;
- template class Scintilla::RunStyles<ptrdiff_t, char>;
- #endif
Index: editors/qscintilla/patches/patch-src_qscintilla_pro
===================================================================
RCS file: editors/qscintilla/patches/patch-src_qscintilla_pro
diff -N editors/qscintilla/patches/patch-src_qscintilla_pro
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ editors/qscintilla/patches/patch-src_qscintilla_pro 7 Jul 2022 06:11:48
-0000
@@ -0,0 +1,12 @@
+Index: src/qscintilla.pro
+--- src/qscintilla.pro.orig
++++ src/qscintilla.pro
+@@ -70,7 +70,7 @@ unix:!macx {
+ # Scintilla namespace rather than pollute the global namespace.
+ #DEFINES += SCI_NAMESPACE
+
+-target.path = $$[QT_INSTALL_LIBS]
++target.path = ${LOCALBASE}/lib
+ INSTALLS += target
+
+ header.path = $$[QT_INSTALL_HEADERS]
Index: editors/py-qscintilla/Makefile
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- editors/py-qscintilla/Makefile 11 Mar 2022 18:58:33 -0000 1.31
+++ editors/py-qscintilla/Makefile 7 Jul 2022 06:11:48 -0000
@@ -1,10 +1,9 @@
COMMENT = Python binding for the Scintilla source code editor
-VERSION = 2.11.6
+VERSION = 2.13.3
MODPY_EGG_VERSION = ${VERSION}
-DISTNAME = QScintilla-${VERSION}
+DISTNAME = QScintilla_src-${VERSION}
PKGNAME = py-qscintilla-${VERSION}
-REVISION = 1
CATEGORIES = editors x11 devel
@@ -39,10 +38,10 @@ NO_TEST = Yes
CONFIGURE_STYLE = simple
CONFIGURE_SCRIPT = ${LOCALBASE}/bin/sip-build
-CONFIGURE_ARGS = --verbose \
- --qmake ${MODQT5_QMAKE} \
- --jobs ${MAKE_JOBS} \
- --no-make
+
+CONFIGURE_ARGS = --verbose
+
+WRKSRC = ${WRKDIST}/Python
MAKE_FLAGS = -C build \
CC=${CC} \
@@ -53,5 +52,10 @@ MAKE_FLAGS = -C build \
FAKE_FLAGS = INSTALL_ROOT=${DESTDIR}
SUBST_VARS += QTVER PYQTVER
+
+post-extract:
+ # Need to run sip-6.5+ sip-build
+ ln -sf ${MODQT5_QMAKE} ${WRKDIR}/bin/qmake
+ cp ${WRKSRC}/pyproject-qt5.toml ${WRKSRC}/pyproject.toml
.include <bsd.port.mk>
Index: editors/py-qscintilla/distinfo
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- editors/py-qscintilla/distinfo 19 Jan 2021 06:26:49 -0000 1.8
+++ editors/py-qscintilla/distinfo 7 Jul 2022 06:11:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (QScintilla-2.11.6.tar.gz) =
5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc=
-SIZE (QScintilla-2.11.6.tar.gz) = 3027764
+SHA256 (QScintilla_src-2.13.3.tar.gz) =
cR0o43yPzKqCKejjmls7LZfz//xj2hC3HHG4T6Nkk5g=
+SIZE (QScintilla_src-2.13.3.tar.gz) = 3060031
Index: devel/py-qt-builder/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-qt-builder/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- devel/py-qt-builder/Makefile 11 Mar 2022 18:52:54 -0000 1.8
+++ devel/py-qt-builder/Makefile 7 Jul 2022 06:11:48 -0000
@@ -1,10 +1,9 @@
COMMENT= PEP 517 compliant PyQt build system
-MODPY_EGG_VERSION= 1.12.2
+MODPY_EGG_VERSION= 1.13.0
DISTNAME= PyQt-builder-${MODPY_EGG_VERSION}
PKGNAME= py-qt-builder-${MODPY_EGG_VERSION}
-REVISION= 0
CATEGORIES= devel
Index: devel/py-qt-builder/distinfo
===================================================================
RCS file: /cvs/ports/devel/py-qt-builder/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- devel/py-qt-builder/distinfo 31 Oct 2021 17:08:22 -0000 1.5
+++ devel/py-qt-builder/distinfo 7 Jul 2022 06:11:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (PyQt-builder-1.12.2.tar.gz) =
9iu2iNcOCv2IxBOo2ZS9qCTmzr0SthKQLRlFxaZ+3Nc=
-SIZE (PyQt-builder-1.12.2.tar.gz) = 5727071
+SHA256 (PyQt-builder-1.13.0.tar.gz) =
SHdYDDjOtTIOEps4HQg7CoYBxoFm2LmXB/CPoKFonu8=
+SIZE (PyQt-builder-1.13.0.tar.gz) = 3906564
Index: devel/py-qt-builder/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-qt-builder/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- devel/py-qt-builder/pkg/PLIST 11 Mar 2022 18:52:54 -0000 1.6
+++ devel/py-qt-builder/pkg/PLIST 7 Jul 2022 06:11:48 -0000
@@ -49,14 +49,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/dlls/msvc-64/vcruntime140_1.dll
lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/dlls/openssl-32/
lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/dlls/openssl-32/libcrypto-1_1.dll
-lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/dlls/openssl-32/libeay32.dll
lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/dlls/openssl-32/libssl-1_1.dll
-lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/dlls/openssl-32/ssleay32.dll
lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/dlls/openssl-64/
lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/dlls/openssl-64/libcrypto-1_1-x64.dll
-lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/dlls/openssl-64/libeay32.dll
lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/dlls/openssl-64/libssl-1_1-x64.dll
-lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/dlls/openssl-64/ssleay32.dll
lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/packages/
lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/packages/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyqtbuild/bundle/packages/${MODPY_PYCACHE}/
Index: devel/py-sip/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-sip/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- devel/py-sip/Makefile 11 Mar 2022 18:52:57 -0000 1.57
+++ devel/py-sip/Makefile 7 Jul 2022 06:11:48 -0000
@@ -3,12 +3,11 @@ COMMENT= automatically generate Python b
# The following ports often usually need updating together:
# devel/py-sip, www/py-qtwebengine, x11/py-qt5, x11/py-sip-qt5
# API changes fairly often, be sure to test dependent ports when updating.
-MODPY_EGG_VERSION= 6.4.0
+MODPY_EGG_VERSION= 6.6.2
DISTNAME= sip-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
EPOCH= 0
-REVISION= 0
CATEGORIES= devel
@@ -17,7 +16,7 @@ HOMEPAGE= https://www.riverbankcomputing
# SIP license (Python like) or GPLv2/v3
PERMIT_PACKAGE= Yes
-WANTLIB= m ${COMPILER_LIBCXX}
+WANTLIB += pthread
COMPILER= base-clang ports-gcc
Index: devel/py-sip/distinfo
===================================================================
RCS file: /cvs/ports/devel/py-sip/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- devel/py-sip/distinfo 31 Oct 2021 17:08:26 -0000 1.24
+++ devel/py-sip/distinfo 7 Jul 2022 06:11:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (sip-6.4.0.tar.gz) = Quw2hSC42koJhyGFELG1ILSYHkQFCGwb44RzOv/CvLA=
-SIZE (sip-6.4.0.tar.gz) = 1201890
+SHA256 (sip-6.6.2.tar.gz) = Dj76wcXf2OUlrlcUCSffJpk+E/WLidFXfDFPQQW/2Q0=
+SIZE (sip-6.6.2.tar.gz) = 1143535
Index: devel/py-sip/patches/patch-sipbuild_generator_parser_instantiations_py
===================================================================
RCS file: devel/py-sip/patches/patch-sipbuild_generator_parser_instantiations_py
diff -N devel/py-sip/patches/patch-sipbuild_generator_parser_instantiations_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/py-sip/patches/patch-sipbuild_generator_parser_instantiations_py
7 Jul 2022 06:11:48 -0000
@@ -0,0 +1,14 @@
+https://github.com/qgis/QGIS/issues/49214
+
+Index: sipbuild/generator/parser/instantiations.py
+--- sipbuild/generator/parser/instantiations.py.orig
++++ sipbuild/generator/parser/instantiations.py
+@@ -434,7 +434,7 @@ def _instantiate_value(proto_value, expansions):
+ proto_name = proto_value.value.result.definition
+
+ if proto_name.is_simple:
+- i_name = ScopedName.parse(template_string(proto_name, expansions))
++ i_name = ScopedName.parse(template_string(proto_name.base_name,
expansions))
+ i_result = Argument(type=ArgumentType.DEFINED, definition=i_name)
+ i_fcall = FunctionCall(result=i_result,
+ args=proto_value.value.args)
Index: devel/py-sip/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-sip/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST
--- devel/py-sip/pkg/PLIST 11 Mar 2022 18:52:57 -0000 1.15
+++ devel/py-sip/pkg/PLIST 7 Jul 2022 06:11:48 -0000
@@ -24,12 +24,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sipbuild/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/${MODPY_PYCACHE}argument_parser.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/${MODPY_PYCACHE}bindings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/${MODPY_PYCACHE}bindings_configuration.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/${MODPY_PYCACHE}buildable.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/${MODPY_PYCACHE}builder.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/${MODPY_PYCACHE}configurable.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/${MODPY_PYCACHE}distutils_builder.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/sipbuild/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/${MODPY_PYCACHE}installable.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/${MODPY_PYCACHE}project.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/${MODPY_PYCACHE}py_versions.${MODPY_PYC_MAGIC_TAG}pyc
@@ -41,6 +41,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sipbuild/api.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/argument_parser.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/bindings.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/bindings_configuration.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/buildable.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/builder.py
@so
lib/python${MODPY_VERSION}/site-packages/sipbuild/code_generator${MODPY_ABI3SO}.so
@@ -55,7 +56,38 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sipbuild/distinfo/main.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/distutils_builder.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/sipbuild/helpers.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/${MODPY_PYCACHE}python_slots.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/${MODPY_PYCACHE}specification.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/${MODPY_PYCACHE}templates.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/${MODPY_PYCACHE}annotations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/${MODPY_PYCACHE}instantiations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/${MODPY_PYCACHE}parser_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/${MODPY_PYCACHE}parsetab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/${MODPY_PYCACHE}python_exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/${MODPY_PYCACHE}rules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/annotations.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/instantiations.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/parser.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/parser_manager.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/parsetab.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/python_exceptions.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/rules.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/tokens.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/python_slots.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/specification.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/templates.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/utils.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/installable.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/__init__.py
@@ -75,8 +107,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/MANIFEST.in
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/README.in
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/apiversions.c
-lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/array.c
-lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/array.h
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/bool.cpp
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/descriptors.c
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/int_convertors.c
@@ -88,6 +118,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/sip.h.in
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/sip.pyi
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/sip.rst.in
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/sip_array.c
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/sip_array.h
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/sipint.h
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/siplib.c
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/12/threads.c
@@ -98,22 +130,24 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/LICENSE-GPL3
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/MANIFEST.in
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/README.in
-lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/array.c
-lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/array.h
-lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/bool.cpp
-lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/descriptors.c
-lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/int_convertors.c
-lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/objmap.c
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/pyproject.toml
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/setup.cfg.in
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/setup.py.in
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip.h.in
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip.pyi
lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip.rst.in
-lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sipint.h
-lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/siplib.c
-lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/threads.c
-lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/voidptr.c
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip_array.c
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip_array.h
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip_bool.cpp
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip_core.c
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip_core.h
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip_descriptors.c
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip_enum.c
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip_enum.h
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip_int_convertors.c
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip_object_map.c
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip_threads.c
+lib/python${MODPY_VERSION}/site-packages/sipbuild/module/source/13/sip_voidptr.c
lib/python${MODPY_VERSION}/site-packages/sipbuild/project.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/py_versions.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/pyproject.py
Index: www/py-qtwebengine/Makefile
===================================================================
RCS file: /cvs/ports/www/py-qtwebengine/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- www/py-qtwebengine/Makefile 11 Mar 2022 20:10:48 -0000 1.9
+++ www/py-qtwebengine/Makefile 7 Jul 2022 06:11:48 -0000
@@ -1,9 +1,8 @@
COMMENT = python Qt5WebEngine bindings
-MODPY_EGG_VERSION = 5.15.5
+MODPY_EGG_VERSION = 5.15.6
DISTNAME = PyQtWebEngine-${MODPY_EGG_VERSION}
PKGNAME = py-qtwebengine-${MODPY_EGG_VERSION}
-REVISION = 0
CATEGORIES = www devel
@@ -42,10 +41,7 @@ SUBST_VARS += QTVER PYQTVER
CONFIGURE_STYLE = simple
CONFIGURE_SCRIPT = ${LOCALBASE}/bin/sip-build
-CONFIGURE_ARGS = --verbose \
- --qmake ${MODQT5_QMAKE} \
- --jobs ${MAKE_JOBS} \
- --no-make
+CONFIGURE_ARGS = --verbose
MAKE_FLAGS = -C build \
CC=${CC} \
@@ -56,5 +52,9 @@ MAKE_FLAGS = -C build \
FAKE_FLAGS = INSTALL_ROOT=${DESTDIR}
NO_TEST = Yes
+
+post-extract:
+ # Need to run sip-6.5+ sip-build
+ ln -sf ${MODQT5_QMAKE} ${WRKDIR}/bin/qmake
.include <bsd.port.mk>
Index: www/py-qtwebengine/distinfo
===================================================================
RCS file: /cvs/ports/www/py-qtwebengine/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- www/py-qtwebengine/distinfo 31 Oct 2021 17:08:31 -0000 1.4
+++ www/py-qtwebengine/distinfo 7 Jul 2022 06:11:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (PyQtWebEngine-5.15.5.tar.gz) =
q0dgjczyteS5UNWjzHBLF3Ea8DUCTQeptxrSn8EDuUE=
-SIZE (PyQtWebEngine-5.15.5.tar.gz) = 48610
+SHA256 (PyQtWebEngine-5.15.6.tar.gz) =
riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE=
+SIZE (PyQtWebEngine-5.15.6.tar.gz) = 48871
