Date: Wed, 8 Jan 2025 23:29:49 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: 486f8dabaaaf - 2025Q1 - PySide6: Update to 6.8.1.1 Message-ID: <202501082329.508NTnMh007988@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2025Q1 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=486f8dabaaafdd88148b8751a795062ba500ec7d commit 486f8dabaaafdd88148b8751a795062ba500ec7d Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2025-01-08 23:13:46 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2025-01-08 23:29:13 +0000 PySide6: Update to 6.8.1.1 This should have been part of the Qt 6.8.1 update, but upstream never published distfiles for 6.8.1 for some reason, so we shipped the lastest compatible version 6.8.0.2 instead. Version 6.8.1.1 is a small bugfix release on top of what would have been 6.8.1 release. MFH: 2025Q1 (cherry picked from commit 528a0408a00033bef072f634ce7c506f95bba4bc) --- Mk/Uses/qt.mk | 2 +- devel/pyside6-tools/Makefile | 5 +++-- devel/pyside6-tools/distinfo | 6 +++--- devel/pyside6/Makefile | 5 +++-- devel/pyside6/distinfo | 6 +++--- .../patch-sources_pyside6_cmake_PySideHelpers.cmake | 13 ------------- devel/pyside6/pkg-plist | 6 ++++++ devel/shiboken6/Makefile | 8 +++----- devel/shiboken6/distinfo | 8 +++----- devel/shiboken6/files/patch-cmake_ShibokenHelpers.cmake | 16 +++++++++++++--- .../patch-libshiboken_signature_signature__globals.cpp | 12 ++++++------ 11 files changed, 44 insertions(+), 43 deletions(-) diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index bc441fe6b651..50ef6aada57f 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.16 QT6_VERSION?= 6.8.1 -PYSIDE6_VERSION?= 6.8.0.2 +PYSIDE6_VERSION?= 6.8.1.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 6d2e86f490a6..406d5378b9a2 100644 --- a/devel/pyside6-tools/Makefile +++ b/devel/pyside6-tools/Makefile @@ -1,10 +1,10 @@ PORTNAME= pyside6 DISTVERSION= ${PYSIDE6_VERSION} CATEGORIES= devel -MASTER_SITES= QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION}-src +MASTER_SITES= QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION:R}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= -tools -DISTNAME= pyside-setup-everywhere-src-${DISTVERSION:R} +DISTNAME= pyside-setup-everywhere-src-${DISTVERSION} DIST_SUBDIR= KDE/Qt/${PYSIDE6_VERSION} MAINTAINER= kde@FreeBSD.org @@ -27,6 +27,7 @@ USE_QT= base declarative languageserver quick3d shadertools tools SHEBANG_FILES= pyside_tool.py \ qtpy2cpp_lib/tests/baseline/basic_test.py +WRKSRC= ${WRKDIR}/${DISTNAME:R} WRKSRC_SUBDIR= sources/pyside-tools PLIST_SUB= PYSIDE_BINDIR_REL=${PYSIDE_BINDIR_REL} diff --git a/devel/pyside6-tools/distinfo b/devel/pyside6-tools/distinfo index 6ec86726653b..0f5f5dc50fe2 100644 --- a/devel/pyside6-tools/distinfo +++ b/devel/pyside6-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1730090384 -SHA256 (KDE/Qt/6.8.0.2/pyside-setup-everywhere-src-6.8.0.tar.xz) = 1a1a219a8f327e340d258275fad3a9f261b8f04bc57041747e73dd6ad252b4e1 -SIZE (KDE/Qt/6.8.0.2/pyside-setup-everywhere-src-6.8.0.tar.xz) = 14646216 +TIMESTAMP = 1736147459 +SHA256 (KDE/Qt/6.8.1.1/pyside-setup-everywhere-src-6.8.1.1.tar.xz) = e1f198f0a9f6f0e694e3b44406166834e27cffa3f23c5a439c934e5c4faba468 +SIZE (KDE/Qt/6.8.1.1/pyside-setup-everywhere-src-6.8.1.1.tar.xz) = 16023376 diff --git a/devel/pyside6/Makefile b/devel/pyside6/Makefile index 836f59d5e108..05021ad15f2e 100644 --- a/devel/pyside6/Makefile +++ b/devel/pyside6/Makefile @@ -1,9 +1,9 @@ PORTNAME= pyside6 DISTVERSION= ${PYSIDE6_VERSION} CATEGORIES= devel -MASTER_SITES= QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION}-src +MASTER_SITES= QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION:R}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= pyside-setup-everywhere-src-${DISTVERSION:R} +DISTNAME= pyside-setup-everywhere-src-${DISTVERSION} DIST_SUBDIR= KDE/Qt/${PYSIDE6_VERSION} MAINTAINER= kde@FreeBSD.org @@ -28,6 +28,7 @@ USE_QT= 3d base charts connectivity datavis3d declarative doc graphs \ CONFIGURE_ENV= LLVM_INSTALL_DIR="${LLVM_PREFIX}/lib/cmake/llvm" +WRKSRC= ${WRKDIR}/${DISTNAME:R} PATCH_WRKSRC= ${WRKSRC:H:H} WRKSRC_SUBDIR= sources/pyside6 PLIST_SUB= PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} \ diff --git a/devel/pyside6/distinfo b/devel/pyside6/distinfo index b59e0648b868..6ad7911b7b90 100644 --- a/devel/pyside6/distinfo +++ b/devel/pyside6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1730090226 -SHA256 (KDE/Qt/6.8.0.2/pyside-setup-everywhere-src-6.8.0.tar.xz) = 1a1a219a8f327e340d258275fad3a9f261b8f04bc57041747e73dd6ad252b4e1 -SIZE (KDE/Qt/6.8.0.2/pyside-setup-everywhere-src-6.8.0.tar.xz) = 14646216 +TIMESTAMP = 1736138451 +SHA256 (KDE/Qt/6.8.1.1/pyside-setup-everywhere-src-6.8.1.1.tar.xz) = e1f198f0a9f6f0e694e3b44406166834e27cffa3f23c5a439c934e5c4faba468 +SIZE (KDE/Qt/6.8.1.1/pyside-setup-everywhere-src-6.8.1.1.tar.xz) = 16023376 diff --git a/devel/pyside6/files/patch-sources_pyside6_cmake_PySideHelpers.cmake b/devel/pyside6/files/patch-sources_pyside6_cmake_PySideHelpers.cmake deleted file mode 100644 index 547a9eaf5d7b..000000000000 --- a/devel/pyside6/files/patch-sources_pyside6_cmake_PySideHelpers.cmake +++ /dev/null @@ -1,13 +0,0 @@ -Find required packages before testing whether they are FOUND. - ---- sources/pyside6/cmake/PySideHelpers.cmake.orig 2024-10-09 13:33:59 UTC -+++ sources/pyside6/cmake/PySideHelpers.cmake -@@ -132,6 +132,8 @@ macro(collect_optional_modules) - list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineCore WebEngineWidgets - WebEngineQuick WebSockets HttpServer) - # for Windows and Linux, QtWebView depends on QtWebEngine to render content -+ find_package(Qt${QT_MAJOR_VERSION}WebEngineCore) -+ find_package(Qt${QT_MAJOR_VERSION}WebEngineQuick) - if ((WIN32 OR UNIX) AND NOT APPLE AND Qt${QT_MAJOR_VERSION}WebEngineCore_FOUND AND - Qt${QT_MAJOR_VERSION}WebEngineQuick_FOUND) - list(APPEND ALL_OPTIONAL_MODULES WebView) diff --git a/devel/pyside6/pkg-plist b/devel/pyside6/pkg-plist index b3ae9504c185..a630ef2b247f 100644 --- a/devel/pyside6/pkg-plist +++ b/devel/pyside6/pkg-plist @@ -273,6 +273,11 @@ lib/libpyside6qml.abi%%PYTHON_MAJOR_VER%%.so.%%SHLIB_VERSION%% %%PYTHON_SITELIBDIR%%/PySide6/support/generate_pyi.py %%QT_PLUGINDIR%%/designer/libPySidePlugin.so libdata/pkgconfig/pyside6.pc +share/PySide6/doc/qtcore.rst +share/PySide6/doc/qtqml.rst +share/PySide6/doc/qtquicktest.rst +share/PySide6/doc/qtuitools.rst +%%WEBENGINE%%share/PySide6/doc/qtwebenginecore.rst share/PySide6/glue/qtcharts.cpp share/PySide6/glue/qtcore.cpp share/PySide6/glue/qtdatavisualization.cpp @@ -287,6 +292,7 @@ share/PySide6/glue/qtpositioning.cpp share/PySide6/glue/qtprintsupport.cpp share/PySide6/glue/qtqml.cpp share/PySide6/glue/qtquick.cpp +share/PySide6/glue/qtquick3d.cpp share/PySide6/glue/qtquicktest.cpp share/PySide6/glue/qtserialbus.cpp share/PySide6/glue/qtsql.cpp diff --git a/devel/shiboken6/Makefile b/devel/shiboken6/Makefile index 5aeb2fde8f17..fe14bd7bd854 100644 --- a/devel/shiboken6/Makefile +++ b/devel/shiboken6/Makefile @@ -1,14 +1,11 @@ PORTNAME= shiboken6 DISTVERSION= ${PYSIDE6_VERSION} CATEGORIES= devel -MASTER_SITES= QT/official_releases/QtForPython/${PORTNAME}/PySide6-${DISTVERSION}-src +MASTER_SITES= QT/official_releases/QtForPython/${PORTNAME}/PySide6-${DISTVERSION:R}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= pyside-setup-everywhere-src-${DISTVERSION:R} +DISTNAME= pyside-setup-everywhere-src-${DISTVERSION} DIST_SUBDIR= KDE/Qt/${PYSIDE6_VERSION} -PATCH_SITES= https://github.com/pyside/pyside-setup/commit/ -PATCHFILES+= dfe3819559ed1e04089f9d5bc009268a7b48b7c2.patch:-p3 # Fix signature handling for 32-bit - MAINTAINER= kde@FreeBSD.org COMMENT= Python binding generator for C++ libraries WWW= http://qt-project.org @@ -32,6 +29,7 @@ CMAKE_ARGS= -DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \ -DBUILD_TESTS:BOOL=false CONFIGURE_ENV= LLVM_INSTALL_DIR="${LLVM_PREFIX}/lib/cmake/llvm" +WRKSRC= ${WRKDIR}/${DISTNAME:R} WRKSRC_SUBDIR= sources/shiboken6 PLIST_SUB= PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} \ SHLIB_VER=${DISTVERSION:R:R} \ diff --git a/devel/shiboken6/distinfo b/devel/shiboken6/distinfo index 890feb7e748e..6fbe9ee0336a 100644 --- a/devel/shiboken6/distinfo +++ b/devel/shiboken6/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1734031404 -SHA256 (KDE/Qt/6.8.0.2/pyside-setup-everywhere-src-6.8.0.tar.xz) = 1a1a219a8f327e340d258275fad3a9f261b8f04bc57041747e73dd6ad252b4e1 -SIZE (KDE/Qt/6.8.0.2/pyside-setup-everywhere-src-6.8.0.tar.xz) = 14646216 -SHA256 (KDE/Qt/6.8.0.2/dfe3819559ed1e04089f9d5bc009268a7b48b7c2.patch) = 16ad2512a5516fdf3484bedd59a700396429ba99f5cf897566174c8e25bc3d9e -SIZE (KDE/Qt/6.8.0.2/dfe3819559ed1e04089f9d5bc009268a7b48b7c2.patch) = 6314 +TIMESTAMP = 1736136234 +SHA256 (KDE/Qt/6.8.1.1/pyside-setup-everywhere-src-6.8.1.1.tar.xz) = e1f198f0a9f6f0e694e3b44406166834e27cffa3f23c5a439c934e5c4faba468 +SIZE (KDE/Qt/6.8.1.1/pyside-setup-everywhere-src-6.8.1.1.tar.xz) = 16023376 diff --git a/devel/shiboken6/files/patch-cmake_ShibokenHelpers.cmake b/devel/shiboken6/files/patch-cmake_ShibokenHelpers.cmake index 1bf82a17406c..61f94f4f5c2f 100644 --- a/devel/shiboken6/files/patch-cmake_ShibokenHelpers.cmake +++ b/devel/shiboken6/files/patch-cmake_ShibokenHelpers.cmake @@ -1,8 +1,18 @@ -We don't need bash for a simple export command. +Hunk 1: Suppress a lot of warnings for Clang when building PySide6. +Hunk 2: We don't need bash for a simple export command. ---- cmake/ShibokenHelpers.cmake.orig 2024-04-05 12:14:13 UTC +--- cmake/ShibokenHelpers.cmake.orig 2024-12-17 09:51:38 UTC +++ cmake/ShibokenHelpers.cmake -@@ -769,7 +769,7 @@ $@") +@@ -55,7 +55,7 @@ else() + else() + set (gcc_warnings_options "-Wall -Wextra -Wno-strict-aliasing") + # Clang has -Wno-bad-function-cast, but does not need it. +- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") ++ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU|Clang) + set (gcc_warnings_options "${gcc_warnings_options} -Wno-cast-function-type") + endif() + if(CMAKE_HOST_UNIX AND NOT CYGWIN) +@@ -774,7 +774,7 @@ $@") $@") else() string(REPLACE ";" ":" path_dirs_native "${path_dirs_native}") diff --git a/devel/shiboken6/files/patch-libshiboken_signature_signature__globals.cpp b/devel/shiboken6/files/patch-libshiboken_signature_signature__globals.cpp index 0dae95aec43f..a50c85c00591 100644 --- a/devel/shiboken6/files/patch-libshiboken_signature_signature__globals.cpp +++ b/devel/shiboken6/files/patch-libshiboken_signature_signature__globals.cpp @@ -1,6 +1,6 @@ ---- libshiboken/signature/signature_globals.cpp.orig 2024-04-29 02:02:21 UTC +--- libshiboken/signature/signature_globals.cpp.orig 2024-12-17 09:51:38 UTC +++ libshiboken/signature/signature_globals.cpp -@@ -210,7 +210,7 @@ static int init_phase_2(safe_globals_struc *p, PyMetho +@@ -208,7 +208,7 @@ static int init_phase_2(safe_globals_struc *p, PyMetho //////////////////////////////////////////////////////////////////////////// // a stack trace for linux-like platforms #include <cstdio> @@ -9,16 +9,16 @@ # include <execinfo.h> #endif #include <signal.h> -@@ -218,7 +218,7 @@ static void handler(int sig) { +@@ -216,7 +216,7 @@ static void handler(int sig) { #include <unistd.h> static void handler(int sig) { -#if defined(__GLIBC__) +#if defined(__GLIBC__) || defined(__FreeBSD__) void *array[30]; - size_t size; - -@@ -228,7 +228,7 @@ static void handler(int sig) { + // get void *'s for all entries on the stack + const int size = backtrace(array, 30); +@@ -224,7 +224,7 @@ static void handler(int sig) { // print out all the frames to stderr #endif std::fprintf(stderr, "Error: signal %d:\n", sig);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501082329.508NTnMh007988>