Date: Thu, 20 Jun 2024 23:19:47 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: 9d28e4f06ca6 - 2024Q2 - PySide6: Update to 6.7.2 Message-ID: <202406202319.45KNJld5009313@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=9d28e4f06ca6faecac578676bebbe082b141b3b2 commit 9d28e4f06ca6faecac578676bebbe082b141b3b2 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2024-06-20 22:55:56 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2024-06-20 23:09:49 +0000 PySide6: Update to 6.7.2 MFH: 2024Q2 (cherry picked from commit 85b42eed6e6194b3d756915aa06a3458cc93ccd7) --- Mk/Uses/qt.mk | 2 +- devel/pyside6-tools/distinfo | 6 +++--- devel/pyside6/distinfo | 6 +++--- devel/shiboken6/distinfo | 6 +++--- devel/shiboken6/files/patch-libshiboken_sbkmodule.cpp | 16 ---------------- 5 files changed, 10 insertions(+), 26 deletions(-) diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index b7d5279f7b2c..b0e0a156477c 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.14 QT6_VERSION?= 6.7.2 -PYSIDE6_VERSION?= 6.7.1 +PYSIDE6_VERSION?= 6.7.2 # 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/distinfo b/devel/pyside6-tools/distinfo index 32be724deb74..d917fa059bb7 100644 --- a/devel/pyside6-tools/distinfo +++ b/devel/pyside6-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716604746 -SHA256 (pyside-setup-everywhere-src-6.7.1.tar.xz) = 6f33de37f4121e547064023edb344b95e2ab454234fa8fce27ea73df96f933cd -SIZE (pyside-setup-everywhere-src-6.7.1.tar.xz) = 14400976 +TIMESTAMP = 1718779305 +SHA256 (pyside-setup-everywhere-src-6.7.2.tar.xz) = 3a2b0d0d6e78c9aa5ddc7f06ca4b6f11a3fe14560baeb148eea53b5d98e368c7 +SIZE (pyside-setup-everywhere-src-6.7.2.tar.xz) = 14402156 diff --git a/devel/pyside6/distinfo b/devel/pyside6/distinfo index 09c4651772a8..9d5cb59bc83d 100644 --- a/devel/pyside6/distinfo +++ b/devel/pyside6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716606581 -SHA256 (pyside-setup-everywhere-src-6.7.1.tar.xz) = 6f33de37f4121e547064023edb344b95e2ab454234fa8fce27ea73df96f933cd -SIZE (pyside-setup-everywhere-src-6.7.1.tar.xz) = 14400976 +TIMESTAMP = 1718779292 +SHA256 (pyside-setup-everywhere-src-6.7.2.tar.xz) = 3a2b0d0d6e78c9aa5ddc7f06ca4b6f11a3fe14560baeb148eea53b5d98e368c7 +SIZE (pyside-setup-everywhere-src-6.7.2.tar.xz) = 14402156 diff --git a/devel/shiboken6/distinfo b/devel/shiboken6/distinfo index 1fbb49dd62fb..7f37a195ca1f 100644 --- a/devel/shiboken6/distinfo +++ b/devel/shiboken6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716604707 -SHA256 (pyside-setup-everywhere-src-6.7.1.tar.xz) = 6f33de37f4121e547064023edb344b95e2ab454234fa8fce27ea73df96f933cd -SIZE (pyside-setup-everywhere-src-6.7.1.tar.xz) = 14400976 +TIMESTAMP = 1718779285 +SHA256 (pyside-setup-everywhere-src-6.7.2.tar.xz) = 3a2b0d0d6e78c9aa5ddc7f06ca4b6f11a3fe14560baeb148eea53b5d98e368c7 +SIZE (pyside-setup-everywhere-src-6.7.2.tar.xz) = 14402156 diff --git a/devel/shiboken6/files/patch-libshiboken_sbkmodule.cpp b/devel/shiboken6/files/patch-libshiboken_sbkmodule.cpp deleted file mode 100644 index c3871ac52328..000000000000 --- a/devel/shiboken6/files/patch-libshiboken_sbkmodule.cpp +++ /dev/null @@ -1,16 +0,0 @@ -/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?202406202319.45KNJld5009313>