PySide6: Update to 6.6.1

https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-6.6.1?h=6.6.1
freebsd · Dec 7, 2023 · a89c24e · a89c24e
1 parent f6f3911
commit a89c24e
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 33 deletions.
diff --git 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.11
 QT6_VERSION?=		6.6.1
-PYSIDE6_VERSION?=	6.6.0
+PYSIDE6_VERSION?=	6.6.1
 
 # We accept the Qt version to be passed by either or all of the three mk files.
 .  if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)

diff --git a/devel/pyside6-tools/Makefile b/devel/pyside6-tools/Makefile
@@ -26,7 +26,7 @@ USE_QT=		base declarative languageserver tools
 SHEBANG_FILES=	pyside_tool.py qtpy2cpp_lib/tests/baseline/basic_test.py
 
 PLIST_SUB=	PYSIDE_BINDIR_REL=${PYSIDE_BINDIR_REL}
-WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION:R}/sources/pyside-tools
+WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/pyside-tools
 
 PYSIDE_RELNAME=		${PORTNAME}
 PYSIDE_BINDIR_REL?=	bin/${PYSIDE_RELNAME}

diff --git a/devel/pyside6-tools/distinfo b/devel/pyside6-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697908000
-SHA256 (pyside-setup-everywhere-src-6.6.0.tar.xz) = 2dd002db8851a87173354f38aa8c6ec42d0ff1fac99ea422b29e2dfce52d1638
-SIZE (pyside-setup-everywhere-src-6.6.0.tar.xz) = 14054860
+TIMESTAMP = 1701836838
+SHA256 (pyside-setup-everywhere-src-6.6.1.tar.xz) = 341f42483fbe58c88fa5b353eefa83ffcc4ec440bf6e87c1c7ffd278ed54d1ca
+SIZE (pyside-setup-everywhere-src-6.6.1.tar.xz) = 13887704
diff --git a/devel/pyside6/Makefile b/devel/pyside6/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	pyside6
 DISTVERSION=	${PYSIDE6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION}-src
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -27,15 +26,18 @@ USE_QT=		3d base charts connectivity datavis3d declarative doc graphs \
 
 CMAKE_ARGS=	-DPYTHON_EXECUTABLE=${PYTHON_CMD}
 
-WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION:R}/sources/pyside6
+WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/pyside6
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == amd64 || ${ARCH} == i386
+.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	WEBENGINE=""
 USE_QT+=	webengine
 .else
+CMAKE_ON+=	CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore \
+		CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick \
+		CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets
 PLIST_SUB+=	WEBENGINE="@comment "
 .endif
 

diff --git a/devel/pyside6/distinfo b/devel/pyside6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697907967
-SHA256 (pyside-setup-everywhere-src-6.6.0.tar.xz) = 2dd002db8851a87173354f38aa8c6ec42d0ff1fac99ea422b29e2dfce52d1638
-SIZE (pyside-setup-everywhere-src-6.6.0.tar.xz) = 14054860
+TIMESTAMP = 1701812245
+SHA256 (pyside-setup-everywhere-src-6.6.1.tar.xz) = 341f42483fbe58c88fa5b353eefa83ffcc4ec440bf6e87c1c7ffd278ed54d1ca
+SIZE (pyside-setup-everywhere-src-6.6.1.tar.xz) = 13887704
diff --git a/devel/pyside6/files/patch-PySide6_CMakeLists.txt b/devel/pyside6/files/patch-PySide6_CMakeLists.txt
diff --git a/devel/pyside6/files/patch-cmake_Macros_PySideModules.cmake b/devel/pyside6/files/patch-cmake_Macros_PySideModules.cmake
@@ -1,11 +1,11 @@
---- cmake/Macros/PySideModules.cmake.orig	2023-10-14 09:37:51 UTC
+--- cmake/Macros/PySideModules.cmake.orig	2023-11-27 12:04:49 UTC
 +++ cmake/Macros/PySideModules.cmake
 @@ -107,7 +107,7 @@ macro(create_pyside_module)
      get_target_property(qt_core_includes Qt${QT_MAJOR_VERSION}::Core
                          INTERFACE_INCLUDE_DIRECTORIES)
      set(shiboken_include_dir_list ${pyside6_SOURCE_DIR} ${qt_platform_includes}
 -        ${qt_core_includes})
 +        ${qt_core_includes} ${CMAKE_INSTALL_PREFIX}/include)
-
-     # Transform the path separators into something shiboken understands.
-     make_path(shiboken_include_dirs ${shiboken_include_dir_list})
+     if(module_ADDITIONAL_INCLUDE_DIRS)
+         list(APPEND shiboken_include_dir_list ${${module_ADDITIONAL_INCLUDE_DIRS}})
+     endif()
diff --git a/devel/pyside6/pkg-plist b/devel/pyside6/pkg-plist
@@ -260,8 +260,8 @@ lib/libpyside6qml.abi3.so.%%DISTVERSION%%
 %%PYTHON_SITELIBDIR%%/PySide6/support/__pycache__/generate_pyi%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/PySide6/support/deprecated.py
 %%PYTHON_SITELIBDIR%%/PySide6/support/generate_pyi.py
+%%QT_PLUGINDIR%%/designer/libPySidePlugin.so
 libdata/pkgconfig/pyside6.pc
-plugins/designer/libPySidePlugin.so
 share/PySide6/glue/qtcharts.cpp
 share/PySide6/glue/qtcore.cpp
 share/PySide6/glue/qtdatavisualization.cpp
@@ -315,6 +315,7 @@ share/PySide6/typesystems/typesystem_graphs.xml
 share/PySide6/typesystems/typesystem_gui.xml
 share/PySide6/typesystems/typesystem_gui_common.xml
 share/PySide6/typesystems/typesystem_gui_mac.xml
+share/PySide6/typesystems/typesystem_gui_rhi.xml
 share/PySide6/typesystems/typesystem_gui_win.xml
 share/PySide6/typesystems/typesystem_gui_x11.xml
 share/PySide6/typesystems/typesystem_help.xml

diff --git a/devel/shiboken6/Makefile b/devel/shiboken6/Makefile
@@ -29,7 +29,7 @@ CMAKE_ARGS=	-DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \
 		-DUSE_PYTHON_VERSION=${PYTHON_VER} \
 		-DBUILD_TESTS:BOOL=false
 
-WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION:R}/sources/shiboken6
+WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/shiboken6
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=	DOCS

diff --git a/devel/shiboken6/distinfo b/devel/shiboken6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697907858
-SHA256 (pyside-setup-everywhere-src-6.6.0.tar.xz) = 2dd002db8851a87173354f38aa8c6ec42d0ff1fac99ea422b29e2dfce52d1638
-SIZE (pyside-setup-everywhere-src-6.6.0.tar.xz) = 14054860
+TIMESTAMP = 1701812223
+SHA256 (pyside-setup-everywhere-src-6.6.1.tar.xz) = 341f42483fbe58c88fa5b353eefa83ffcc4ec440bf6e87c1c7ffd278ed54d1ca
+SIZE (pyside-setup-everywhere-src-6.6.1.tar.xz) = 13887704