Hi,
Below is a diff that updates devel/py-sip and related ports that must
be upgraded at the same time to their most recent versions (there is
no update for www/py-qtwebengine). As is noted in the Makefile of
devel/py-sip, these updates should be tested well.
I have tested the following ports at build-time and run-time:
- textproc/calibre
I have tested whether the following ports still build:
- devel/py-qt-builder
- editors/py-qscintilla
- geo/qgis
- print/hplip
- www/py-qtwebengine
- www/qutebrowser
I'm looking for feedback and test reports, can others do some
testing of ports that use these ports too?
Caspar
Index: devel/py-sip/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-sip/Makefile,v
diff -u -p -r1.64 Makefile
--- devel/py-sip/Makefile 6 May 2024 12:23:31 -0000 1.64
+++ devel/py-sip/Makefile 27 Jun 2024 17:16:50 -0000
@@ -3,11 +3,10 @@ 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.7.11
+MODPY_EGG_VERSION= 6.8.3
DISTNAME= sip-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
-REVISION= 1
EPOCH= 0
Index: devel/py-sip/distinfo
===================================================================
RCS file: /cvs/ports/devel/py-sip/distinfo,v
diff -u -p -r1.26 distinfo
--- devel/py-sip/distinfo 2 Sep 2023 10:58:57 -0000 1.26
+++ devel/py-sip/distinfo 27 Jun 2024 17:16:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (sip-6.7.11.tar.gz) = 8Nwyh6CxcuVmSTHIeEd1DUfk/c2k/jYrUUr47dZVtGk=
-SIZE (sip-6.7.11.tar.gz) = 1165368
+SHA256 (sip-6.8.3.tar.gz) = iIVHsBi7JMNq3tUZ6T0+UT1MaqC6VbfMGv+9Rc8Qdiw=
+SIZE (sip-6.8.3.tar.gz) = 987656
Index: devel/py-sip/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-sip/pkg/PLIST,v
diff -u -p -r1.18 PLIST
--- devel/py-sip/pkg/PLIST 2 Sep 2023 10:58:57 -0000 1.18
+++ devel/py-sip/pkg/PLIST 27 Jun 2024 17:16:50 -0000
@@ -66,7 +66,6 @@ lib/python${MODPY_VERSION}/site-packages
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
lib/python${MODPY_VERSION}/site-packages/sipbuild/configurable.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/distinfo/
lib/python${MODPY_VERSION}/site-packages/sipbuild/distinfo/__init__.py
@@ -109,6 +108,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/${MODPY_PYCACHE}code.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/${MODPY_PYCACHE}code.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/${MODPY_PYCACHE}extracts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/${MODPY_PYCACHE}extracts.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/${MODPY_PYCACHE}pyi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -118,6 +119,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/${MODPY_PYCACHE}xml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/${MODPY_PYCACHE}xml.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/api.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/code.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/extracts.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/__init__.py
@@ -126,35 +128,26 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}argument.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}argument.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}base_formatter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}base_formatter.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}klass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}klass.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}overload.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}overload.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}scoped.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}scoped.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}signature.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}signature.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}template.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}template.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}value_list.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}value_list.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}variable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/${MODPY_PYCACHE}variable.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/argument.py
-lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/base_formatter.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/enum.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/klass.py
-lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/overload.py
-lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/scoped.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/misc.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/signature.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/template.py
-lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/utils.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/value_list.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/formatters/variable.py
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/outputs/pyi.py
@@ -171,8 +164,6 @@ lib/python${MODPY_VERSION}/site-packages
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}${MODPY_PYOEXTENSION}
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}${MODPY_PYOEXTENSION}
-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}${MODPY_PYOEXTENSION}
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}${MODPY_PYOEXTENSION}
@@ -182,7 +173,17 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/annotations.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/ply/
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/ply/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/ply/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/ply/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/ply/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/ply/${MODPY_PYCACHE}lex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/ply/${MODPY_PYCACHE}lex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/ply/${MODPY_PYCACHE}yacc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/ply/${MODPY_PYCACHE}yacc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/ply/lex.py
+lib/python${MODPY_VERSION}/site-packages/sipbuild/generator/parser/ply/yacc.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
Index: x11/py-qt5/Makefile
===================================================================
RCS file: /cvs/ports/x11/py-qt5/Makefile,v
diff -u -p -r1.41 Makefile
--- x11/py-qt5/Makefile 29 May 2024 08:04:36 -0000 1.41
+++ x11/py-qt5/Makefile 27 Jun 2024 17:16:50 -0000
@@ -2,10 +2,9 @@ COMMENT= Python bindings for Qt5
DPB_PROPERTIES= parallel
-MODPY_EGG_VERSION= 5.15.9
+MODPY_EGG_VERSION= 5.15.10
DISTNAME= PyQt5-${MODPY_EGG_VERSION}
PKGNAME= py-qt5-${MODPY_EGG_VERSION}
-REVISION= 3
CATEGORIES= x11 devel
Index: x11/py-qt5/distinfo
===================================================================
RCS file: /cvs/ports/x11/py-qt5/distinfo,v
diff -u -p -r1.10 distinfo
--- x11/py-qt5/distinfo 25 Apr 2023 19:09:27 -0000 1.10
+++ x11/py-qt5/distinfo 27 Jun 2024 17:16:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (PyQt5-5.15.9.tar.gz) = 3EHoQBqQ3D4raStBG9VJKrVZrieidCTu1L05FVZOxMA=
-SIZE (PyQt5-5.15.9.tar.gz) = 3241160
+SHA256 (PyQt5-5.15.10.tar.gz) = 1Gt4BLGxCk/5F1P4ET5bVYDStEYvMiYoji2ESXM0iYo=
+SIZE (PyQt5-5.15.10.tar.gz) = 3242654
Index: x11/py-sip-qt5/Makefile
===================================================================
RCS file: /cvs/ports/x11/py-sip-qt5/Makefile,v
diff -u -p -r1.14 Makefile
--- x11/py-sip-qt5/Makefile 6 May 2024 12:24:17 -0000 1.14
+++ x11/py-sip-qt5/Makefile 27 Jun 2024 17:16:50 -0000
@@ -1,10 +1,9 @@
COMMENT= sip module support for PyQt5
-MODPY_EGG_VERSION= 12.12.2
+MODPY_EGG_VERSION= 12.13.0
DISTNAME= PyQt5_sip-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME:L}
-REVISION= 0
WANTLIB = pthread
Index: x11/py-sip-qt5/distinfo
===================================================================
RCS file: /cvs/ports/x11/py-sip-qt5/distinfo,v
diff -u -p -r1.6 distinfo
--- x11/py-sip-qt5/distinfo 2 Sep 2023 10:58:56 -0000 1.6
+++ x11/py-sip-qt5/distinfo 27 Jun 2024 17:16:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (PyQt5_sip-12.12.2.tar.gz) =
ENm/qfWfD9HK2Bvhh0eTFv/JVoT1c+/qlFEstCV9Kxc=
-SIZE (PyQt5_sip-12.12.2.tar.gz) = 123020
+SHA256 (PyQt5_sip-12.13.0.tar.gz) =
fzIdr4S5ydvKYbgOHvN72v/A6TMS7a4s19oluVOXHZE=
+SIZE (PyQt5_sip-12.13.0.tar.gz) = 123225
