From nobody Thu Dec 07 00:08:41 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Slvkd3SKBz53Dnb; Thu, 7 Dec 2023 00:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slvkd2lb0z4KHT; Thu, 7 Dec 2023 00:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701907721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oos4TTgru83MHdjjPDFi/H1ZxWQUmfhTKMDw8462uEU=; b=t/EkAQoRxuxipWt4gbZqTX7QbEoN+YFPr5zoMl+YTbz+aFuXNeaGTEuGgTHhdfIfYBLkHh dQYKWBhpbaGgvrdqCE0KRBsl6+sn+mHdO5tPATUXuO1PEh2tcm8ZqaxQSTjWYjqHSThROb f+uFkRxP61ZKOYFT7JfqWfSvGd9MsIsgalue/fTbeaUwsCuJBGz0vj3gM74Vgg0pWbUiOv k9p8DznXSt2uvyvKnWOvIA5oGcJxvGS3lWE/0hxyoOmiEgTXVJnDWVVRg/MJ+gEzyYWH7O PlrQF5v7v3SFe7cVwyrgRYJ18bdpg+dxkDoJ+q5n7hTBIDI+1YQbTxn9aKnOkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701907721; a=rsa-sha256; cv=none; b=itPDN/nbe46QjwqrueI8HKnPnGSoJKcEcJqjktd+SOqHKYtZqRMIss9qHCrBDHglCAiTpN pV1bnGkDTxW+BGHA5WZ8WjFwm4OgTNvN7Y/KIR6BkKR5iteSdcrHvnwv4S84RY85ihwhsh hSEFpN+WYMxHBVhiGP6j6+q3OG+wYQB2DoNERXNW+twpzcj6SMAGs8CxjAH9DZCKOtsLju GS0BHC+5J92aDkF7MCu2iB7UAhz1YQvc3JTGAZb8yA3Nj5d5KHCE53Pac+yoPwOgfkKW/s fX/N5+JuwDB0L5RVT8+zRryRJpEAqnx+rIC6zvEd5dXL91iB1WJT0SUL8fGeUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701907721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oos4TTgru83MHdjjPDFi/H1ZxWQUmfhTKMDw8462uEU=; b=Py88Qv/BPPmZRbSBc3AZX8RslUqWwQ1I16m59xA0NCR+QFfmUvRz80HdPtb/QWMn57pjRS yxzg3nXSuaKuLtL0lTaJjglAFs6hRvWeR9dbrX57weNkcgiVMJvTucgfbYtaTP0hBNAaTi 5Pcjq4Cb4/X7i+9gnIAGPeeEhy/nAp1Ze6Eu60rh4qt4ucs4mAJE/f4Qjpv/8UwPkQirkQ jR1wZPH37yKPI/Xs+i4baygEVNH0G9/1Py5aZ4GVo2FoaysWU67Dlg2uaw4otyv0ykCtwq ZTXGR17RQVYoeJWCfKnatYIX/jX7RzbeQCT9GG3xHrwE4BeJYHRN63HdEDQ7fA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Slvkd1rqNzRk; Thu, 7 Dec 2023 00:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B708fft089473; Thu, 7 Dec 2023 00:08:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B708frX089470; Thu, 7 Dec 2023 00:08:41 GMT (envelope-from git) Date: Thu, 7 Dec 2023 00:08:41 GMT Message-Id: <202312070008.3B708frX089470@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: a89c24e70e02 - main - PySide6: Update to 6.6.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a89c24e70e0208b01fe1bd6d0c0ac1f981a63d2c Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=a89c24e70e0208b01fe1bd6d0c0ac1f981a63d2c commit a89c24e70e0208b01fe1bd6d0c0ac1f981a63d2c Author: Jason E. Hale AuthorDate: 2023-12-06 20:02:21 +0000 Commit: Jason E. Hale CommitDate: 2023-12-07 00:08:31 +0000 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 --- Mk/Uses/qt.mk | 2 +- devel/pyside6-tools/Makefile | 2 +- devel/pyside6-tools/distinfo | 6 +++--- devel/pyside6/Makefile | 8 +++++--- devel/pyside6/distinfo | 6 +++--- devel/pyside6/files/patch-PySide6_CMakeLists.txt | 13 ------------- devel/pyside6/files/patch-cmake_Macros_PySideModules.cmake | 8 ++++---- devel/pyside6/pkg-plist | 3 ++- devel/shiboken6/Makefile | 2 +- devel/shiboken6/distinfo | 6 +++--- 10 files changed, 23 insertions(+), 33 deletions(-) diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 330cf6deaea8..7e9cfc926745 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.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 index c8cca46e6912..d291d6e57606 100644 --- 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 index e7c0f502e1c3..2c1a865fd8f4 100644 --- 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 index 75861d3da2c0..232d6cd0cabe 100644 --- 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 -.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 index f9c9e1bf863e..38b8b2d14d87 100644 --- 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 deleted file mode 100644 index c394b79ddd19..000000000000 --- a/devel/pyside6/files/patch-PySide6_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -Install things where they should be and with the python bytecode instead -of into ${STAGEDIR}${WRKDIR}. Regressed by [1]. - -[1] https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?h=6.6&id=90b3bab77a6465220051f52e72fe24bba862b606 - ---- PySide6/CMakeLists.txt.orig 2023-10-21 18:54:46 UTC -+++ PySide6/CMakeLists.txt -@@ -111,4 +111,4 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/QtAsync - DESTINATION include/${BINDING_NAME}${pyside6_SUFFIX}) - - install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/QtAsyncio" -- DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") -+ DESTINATION "${PYTHON_SITE_PACKAGES}/${BINDING_NAME}${pyside6_SUFFIX}") diff --git a/devel/pyside6/files/patch-cmake_Macros_PySideModules.cmake b/devel/pyside6/files/patch-cmake_Macros_PySideModules.cmake index f3810bf7d5ff..beb57e5a20cf 100644 --- a/devel/pyside6/files/patch-cmake_Macros_PySideModules.cmake +++ b/devel/pyside6/files/patch-cmake_Macros_PySideModules.cmake @@ -1,4 +1,4 @@ ---- 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 @@ -6,6 +6,6 @@ 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 index 972c3f66de1b..5f83305f696e 100644 --- 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 index 9737ec7f9ad8..2e6cad8d62d9 100644 --- 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 index bafdbaa6c0be..5663433f6694 100644 --- 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