git: 9885a583a95d - 2025Q1 - PySide6: Update to 6.8.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 02 Feb 2025 08:39:28 UTC
The branch 2025Q1 has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9885a583a95d737fcd1c2f942788b55f97348e6c
commit 9885a583a95d737fcd1c2f942788b55f97348e6c
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2025-02-02 04:47:56 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2025-02-02 08:34:29 +0000
PySide6: Update to 6.8.2
Announcement:
https://www.qt.io/blog/qt-6.8.2-released
MFH: 2025Q1
(cherry picked from commit 85227e4cb25828ee5b4e9308a33876fcbd4f9384)
---
Mk/Uses/qt.mk | 2 +-
devel/pyside6-tools/Makefile | 5 ++---
devel/pyside6-tools/distinfo | 6 +++---
devel/pyside6-tools/pkg-plist | 33 ++++++++++++++++++---------------
devel/pyside6/Makefile | 5 ++---
devel/pyside6/distinfo | 6 +++---
devel/shiboken6/Makefile | 5 ++---
devel/shiboken6/distinfo | 6 +++---
8 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index a23b179f260d..01b01d38cae5 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.2
-PYSIDE6_VERSION?= 6.8.1.1
+PYSIDE6_VERSION?= 6.8.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/Makefile b/devel/pyside6-tools/Makefile
index 406d5378b9a2..18c5f4959922 100644
--- a/devel/pyside6-tools/Makefile
+++ b/devel/pyside6-tools/Makefile
@@ -1,7 +1,7 @@
PORTNAME= pyside6
DISTVERSION= ${PYSIDE6_VERSION}
CATEGORIES= devel
-MASTER_SITES= QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION:R}-src
+MASTER_SITES= QT/official_releases/QtForPython/${PORTNAME}/PySide6-${DISTVERSION}-src
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= -tools
DISTNAME= pyside-setup-everywhere-src-${DISTVERSION}
@@ -27,7 +27,6 @@ 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}
@@ -48,7 +47,7 @@ post-install:
# Temporarily relocate them to avoid errors.
@${MV} ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/deploy_lib/android/recipes ${WRKDIR}
-.for d in deploy_lib project qtpy2cpp_lib
+.for d in deploy_lib project_lib qtpy2cpp_lib
${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-f -d ${PREFIX}/${PYSIDE_BINDIR_REL}/${d} \
${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/${d}
diff --git a/devel/pyside6-tools/distinfo b/devel/pyside6-tools/distinfo
index 0f5f5dc50fe2..0c60199918c2 100644
--- a/devel/pyside6-tools/distinfo
+++ b/devel/pyside6-tools/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1738430345
+SHA256 (KDE/Qt/6.8.2/pyside-setup-everywhere-src-6.8.2.tar.xz) = 8422e9aa403f4119e3192853e9b0cfa09e57e3e0a1a3393e7fdf394179c112f8
+SIZE (KDE/Qt/6.8.2/pyside-setup-everywhere-src-6.8.2.tar.xz) = 16609596
diff --git a/devel/pyside6-tools/pkg-plist b/devel/pyside6-tools/pkg-plist
index c540202d2f97..4c06414fa8fa 100644
--- a/devel/pyside6-tools/pkg-plist
+++ b/devel/pyside6-tools/pkg-plist
@@ -14,8 +14,6 @@
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/dependency_util%%PYTHON_EXT_SUFFIX%%.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/deploy_util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/deploy_util%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/design_studio%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/design_studio%%PYTHON_EXT_SUFFIX%%.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/nuitka_helper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/nuitka_helper%%PYTHON_EXT_SUFFIX%%.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/python_helper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -27,10 +25,13 @@
%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__pycache__/android_config%%PYTHON_EXT_SUFFIX%%.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__pycache__/android_helper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__pycache__/android_helper%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__pycache__/android_utilities%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__pycache__/android_utilities%%PYTHON_EXT_SUFFIX%%.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__pycache__/buildozer%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__pycache__/buildozer%%PYTHON_EXT_SUFFIX%%.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/android/android_config.py
%%PYSIDE_BINDIR_REL%%/deploy_lib/android/android_helper.py
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/android_utilities.py
%%PYSIDE_BINDIR_REL%%/deploy_lib/android/buildozer.py
%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/PySide6/__init__.tmpl.py
%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/shiboken6/__init__.tmpl.py
@@ -39,7 +40,6 @@
%%PYSIDE_BINDIR_REL%%/deploy_lib/default.spec
%%PYSIDE_BINDIR_REL%%/deploy_lib/dependency_util.py
%%PYSIDE_BINDIR_REL%%/deploy_lib/deploy_util.py
-%%PYSIDE_BINDIR_REL%%/deploy_lib/design_studio.py
%%PYSIDE_BINDIR_REL%%/deploy_lib/nuitka_helper.py
%%PYSIDE_BINDIR_REL%%/deploy_lib/pyside_icon.icns
%%PYSIDE_BINDIR_REL%%/deploy_lib/pyside_icon.ico
@@ -51,18 +51,21 @@
%%PYSIDE_BINDIR_REL%%/lupdate
%%PYSIDE_BINDIR_REL%%/metaobjectdump.py
%%PYSIDE_BINDIR_REL%%/project.py
-%%PYSIDE_BINDIR_REL%%/project/__init__.py
-%%PYSIDE_BINDIR_REL%%/project/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYSIDE_BINDIR_REL%%/project/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYSIDE_BINDIR_REL%%/project/__pycache__/newproject%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYSIDE_BINDIR_REL%%/project/__pycache__/newproject%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYSIDE_BINDIR_REL%%/project/__pycache__/project_data%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYSIDE_BINDIR_REL%%/project/__pycache__/project_data%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYSIDE_BINDIR_REL%%/project/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYSIDE_BINDIR_REL%%/project/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYSIDE_BINDIR_REL%%/project/newproject.py
-%%PYSIDE_BINDIR_REL%%/project/project_data.py
-%%PYSIDE_BINDIR_REL%%/project/utils.py
+%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/design_studio_project%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/design_studio_project%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/newproject%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/newproject%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/project_data%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/project_data%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/project_lib/__init__.py
+%%PYSIDE_BINDIR_REL%%/project_lib/design_studio_project.py
+%%PYSIDE_BINDIR_REL%%/project_lib/newproject.py
+%%PYSIDE_BINDIR_REL%%/project_lib/project_data.py
+%%PYSIDE_BINDIR_REL%%/project_lib/utils.py
%%PYSIDE_BINDIR_REL%%/pyside_tool.py
%%PYSIDE_BINDIR_REL%%/qml.py
%%PYSIDE_BINDIR_REL%%/qmlcachegen
diff --git a/devel/pyside6/Makefile b/devel/pyside6/Makefile
index 05021ad15f2e..185f7a6dc659 100644
--- a/devel/pyside6/Makefile
+++ b/devel/pyside6/Makefile
@@ -1,7 +1,7 @@
PORTNAME= pyside6
DISTVERSION= ${PYSIDE6_VERSION}
CATEGORIES= devel
-MASTER_SITES= QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION:R}-src
+MASTER_SITES= QT/official_releases/QtForPython/${PORTNAME}/PySide6-${DISTVERSION}-src
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyside-setup-everywhere-src-${DISTVERSION}
DIST_SUBDIR= KDE/Qt/${PYSIDE6_VERSION}
@@ -28,11 +28,10 @@ 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} \
- SHLIB_VER=${DISTVERSION:R:R} \
+ SHLIB_VER=${DISTVERSION:R} \
SHLIB_VERSION=${DISTVERSION}
.include <bsd.port.pre.mk>
diff --git a/devel/pyside6/distinfo b/devel/pyside6/distinfo
index 6ad7911b7b90..29faa9fe21e4 100644
--- a/devel/pyside6/distinfo
+++ b/devel/pyside6/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1738430251
+SHA256 (KDE/Qt/6.8.2/pyside-setup-everywhere-src-6.8.2.tar.xz) = 8422e9aa403f4119e3192853e9b0cfa09e57e3e0a1a3393e7fdf394179c112f8
+SIZE (KDE/Qt/6.8.2/pyside-setup-everywhere-src-6.8.2.tar.xz) = 16609596
diff --git a/devel/shiboken6/Makefile b/devel/shiboken6/Makefile
index fe14bd7bd854..06262d87bd21 100644
--- a/devel/shiboken6/Makefile
+++ b/devel/shiboken6/Makefile
@@ -1,7 +1,7 @@
PORTNAME= shiboken6
DISTVERSION= ${PYSIDE6_VERSION}
CATEGORIES= devel
-MASTER_SITES= QT/official_releases/QtForPython/${PORTNAME}/PySide6-${DISTVERSION:R}-src
+MASTER_SITES= QT/official_releases/QtForPython/pyside6/PySide6-${DISTVERSION}-src
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyside-setup-everywhere-src-${DISTVERSION}
DIST_SUBDIR= KDE/Qt/${PYSIDE6_VERSION}
@@ -29,10 +29,9 @@ 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} \
+ SHLIB_VER=${DISTVERSION:R} \
SHLIB_VERSION=${DISTVERSION}
OPTIONS_DEFINE= DOCS NUMPY
diff --git a/devel/shiboken6/distinfo b/devel/shiboken6/distinfo
index 6fbe9ee0336a..da91cfd3bcc5 100644
--- a/devel/shiboken6/distinfo
+++ b/devel/shiboken6/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1738430156
+SHA256 (KDE/Qt/6.8.2/pyside-setup-everywhere-src-6.8.2.tar.xz) = 8422e9aa403f4119e3192853e9b0cfa09e57e3e0a1a3393e7fdf394179c112f8
+SIZE (KDE/Qt/6.8.2/pyside-setup-everywhere-src-6.8.2.tar.xz) = 16609596