Date: Sat, 25 May 2024 04:56:34 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: e3a42f16b673 - 2024Q2 - PySide6: Update to 6.7.1 Message-ID: <202405250456.44P4uYE7061497@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q2 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3a42f16b6735a77702551e2ded2135813f76c33 commit e3a42f16b6735a77702551e2ded2135813f76c33 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2024-05-25 04:50:11 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2024-05-25 04:56:29 +0000 PySide6: Update to 6.7.1 MFH: 2024Q2 (cherry picked from commit f0b5a8b91927a1b215fdc523738a1a4f8b939bab) --- Mk/Uses/qt.mk | 2 +- devel/pyside6-tools/Makefile | 2 +- devel/pyside6-tools/distinfo | 6 +++--- devel/pyside6-tools/pkg-plist | 3 +++ devel/pyside6/Makefile | 3 --- devel/pyside6/distinfo | 8 +++----- devel/shiboken6/distinfo | 6 +++--- devel/shiboken6/files/patch-libshiboken_sbkmodule.cpp | 16 ++++++++++++++++ 8 files changed, 30 insertions(+), 16 deletions(-) diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index a5d832c65a3d..470415891192 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -24,7 +24,7 @@ _QT_MK_INCLUDED= qt.mk _QT_SUPPORTED?= 5 6 QT5_VERSION?= 5.15.13 QT6_VERSION?= 6.7.1 -PYSIDE6_VERSION?= 6.7.0 +PYSIDE6_VERSION?= 6.7.1 # Support for intermediate Qt6 releases. This partially defines # _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk, diff --git a/devel/pyside6-tools/Makefile b/devel/pyside6-tools/Makefile index ebcf57f007e9..e6acf9df55e7 100644 --- a/devel/pyside6-tools/Makefile +++ b/devel/pyside6-tools/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= libshiboken6.abi${PYTHON_MAJOR_VER}.so:devel/shiboken6@${PY_FLAVOR} USES= cmake gl llvm:lib,noexport python qt:6 shebangfix tar:xz USE_GL= opengl USE_PYTHON= flavors -USE_QT= base declarative languageserver tools +USE_QT= base declarative languageserver quick3d shadertools tools SHEBANG_FILES= pyside_tool.py qtpy2cpp_lib/tests/baseline/basic_test.py diff --git a/devel/pyside6-tools/distinfo b/devel/pyside6-tools/distinfo index 4698008effb1..32be724deb74 100644 --- a/devel/pyside6-tools/distinfo +++ b/devel/pyside6-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714321552 -SHA256 (pyside-setup-everywhere-src-6.7.0.tar.xz) = 82eae370737df5ecf539c165d09d7c81d5fc6153a541b8d3d37b11275f9e3e8f -SIZE (pyside-setup-everywhere-src-6.7.0.tar.xz) = 14382456 +TIMESTAMP = 1716604746 +SHA256 (pyside-setup-everywhere-src-6.7.1.tar.xz) = 6f33de37f4121e547064023edb344b95e2ab454234fa8fce27ea73df96f933cd +SIZE (pyside-setup-everywhere-src-6.7.1.tar.xz) = 14400976 diff --git a/devel/pyside6-tools/pkg-plist b/devel/pyside6-tools/pkg-plist index 11d945b6bae8..7c4547659f22 100644 --- a/devel/pyside6-tools/pkg-plist +++ b/devel/pyside6-tools/pkg-plist @@ -1,5 +1,7 @@ %%PYSIDE_BINDIR_REL%%/android_deploy.py %%PYSIDE_BINDIR_REL%%/assistant +%%PYSIDE_BINDIR_REL%%/balsam +%%PYSIDE_BINDIR_REL%%/balsamui %%PYSIDE_BINDIR_REL%%/deploy.py %%PYSIDE_BINDIR_REL%%/deploy_lib/__init__.py %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc @@ -66,6 +68,7 @@ %%PYSIDE_BINDIR_REL%%/qmllint %%PYSIDE_BINDIR_REL%%/qmlls %%PYSIDE_BINDIR_REL%%/qmltyperegistrar +%%PYSIDE_BINDIR_REL%%/qsb %%PYSIDE_BINDIR_REL%%/qtpy2cpp.py %%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/astdump%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/astdump%%PYTHON_EXT_SUFFIX%%.pyc diff --git a/devel/pyside6/Makefile b/devel/pyside6/Makefile index 28c40a7c11ec..de3d0b1c68c5 100644 --- a/devel/pyside6/Makefile +++ b/devel/pyside6/Makefile @@ -5,9 +5,6 @@ MASTER_SITES= QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION}- PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= pyside-setup-everywhere-src-${DISTVERSION} -PATCH_SITES= https://github.com/qtproject/pyside-pyside-setup/commit/ -PATCHFILES+= 3b2ad15ec75b082699dbde6c695c19b467eb0008.patch:-p1 # Adapt to revert of QAudio->QtAudio namespace renaming - MAINTAINER= kde@FreeBSD.org COMMENT= Python Qt bindings for Qt 6 WWW= https://wiki.qt.io/Qt_for_Python diff --git a/devel/pyside6/distinfo b/devel/pyside6/distinfo index 5c3bcc4bb142..09c4651772a8 100644 --- a/devel/pyside6/distinfo +++ b/devel/pyside6/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1714344956 -SHA256 (pyside-setup-everywhere-src-6.7.0.tar.xz) = 82eae370737df5ecf539c165d09d7c81d5fc6153a541b8d3d37b11275f9e3e8f -SIZE (pyside-setup-everywhere-src-6.7.0.tar.xz) = 14382456 -SHA256 (3b2ad15ec75b082699dbde6c695c19b467eb0008.patch) = 9fe5ce2d8e8fa1d90069dc9c9ccf86ef40e2fbf393c348822eea9afe697b2ec6 -SIZE (3b2ad15ec75b082699dbde6c695c19b467eb0008.patch) = 10764 +TIMESTAMP = 1716606581 +SHA256 (pyside-setup-everywhere-src-6.7.1.tar.xz) = 6f33de37f4121e547064023edb344b95e2ab454234fa8fce27ea73df96f933cd +SIZE (pyside-setup-everywhere-src-6.7.1.tar.xz) = 14400976 diff --git a/devel/shiboken6/distinfo b/devel/shiboken6/distinfo index cc2142b76825..1fbb49dd62fb 100644 --- a/devel/shiboken6/distinfo +++ b/devel/shiboken6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714321386 -SHA256 (pyside-setup-everywhere-src-6.7.0.tar.xz) = 82eae370737df5ecf539c165d09d7c81d5fc6153a541b8d3d37b11275f9e3e8f -SIZE (pyside-setup-everywhere-src-6.7.0.tar.xz) = 14382456 +TIMESTAMP = 1716604707 +SHA256 (pyside-setup-everywhere-src-6.7.1.tar.xz) = 6f33de37f4121e547064023edb344b95e2ab454234fa8fce27ea73df96f933cd +SIZE (pyside-setup-everywhere-src-6.7.1.tar.xz) = 14400976 diff --git a/devel/shiboken6/files/patch-libshiboken_sbkmodule.cpp b/devel/shiboken6/files/patch-libshiboken_sbkmodule.cpp new file mode 100644 index 000000000000..c3871ac52328 --- /dev/null +++ b/devel/shiboken6/files/patch-libshiboken_sbkmodule.cpp @@ -0,0 +1,16 @@ +/wrkdirs/usr/ports/devel/shiboken6/work-py39/pyside-setup-everywhere-src-6.7.1/sources/shiboken6/libshiboken/sbkmodule.cpp:459:15: +error: no member named 'Conversions' in namespace 'Shiboken' + Shiboken::Conversions::clearNegativeLazyCache(); + +Regressed by: https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?h=6.7.1&id=d332a3e3a7a35f8e5825fc10fb649f085243f323 + +--- libshiboken/sbkmodule.cpp.orig 2024-05-17 17:05:40 UTC ++++ libshiboken/sbkmodule.cpp +@@ -7,6 +7,7 @@ + #include "bindingmanager.h" + #include "sbkstring.h" + #include "sbkcppstring.h" ++#include "sbkconverter_p.h" + + #include <unordered_map> + #include <unordered_set>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405250456.44P4uYE7061497>