Please find below a simple Qt6 LTS update to 6.8.3.
This is a pure bugfix update without security fixes (except for
QtWebEngine, where there was certainly a bug fixes):
https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.8.3/release-note.md
I don't necessarily want to push it into 7.7. But I think it would be right.
CC jjt@ (pyside maintainer)
Cheers, Rafael
diff --git a/x11/qt6/Makefile.version b/x11/qt6/Makefile.version
index fa2f63d9ed9..da658644d90 100644
--- a/x11/qt6/Makefile.version
+++ b/x11/qt6/Makefile.version
@@ -1,6 +1,6 @@
# Common source for Qt6 version
-QT6_VERSION = 6.8.2
-PYSIDE_VERSION = 6.8.2.1
+QT6_VERSION = 6.8.3
+PYSIDE_VERSION = 6.8.3
# This one is used for building dependencies for examples and documentation,
# which obviously should be in sync with core packages.
diff --git a/x11/qt6/pyside6/Makefile.inc b/x11/qt6/pyside6/Makefile.inc
index ca4c3a9519f..546a731ec4b 100644
--- a/x11/qt6/pyside6/Makefile.inc
+++ b/x11/qt6/pyside6/Makefile.inc
@@ -11,5 +11,3 @@ PERMIT_PACKAGE = Yes
QTSRC = https://download.qt.io/official_releases/QtForPython
SITES = ${QTSRC}/pyside6/PySide6-${VERSION}-src/
-
-WRKDIST = ${WRKDIR}/${DISTNAME:R}
diff --git a/x11/qt6/pyside6/pyside/Makefile b/x11/qt6/pyside6/pyside/Makefile
index 5c59aefd8f3..fc7db64481f 100644
--- a/x11/qt6/pyside6/pyside/Makefile
+++ b/x11/qt6/pyside6/pyside/Makefile
@@ -1,6 +1,5 @@
COMMENT = Python Qt bindings for Qt 6
PKGNAME = pyside6-${VERSION}
-REVISION = 0
SHARED_LIBS += pyside6.abi3 1.0 # 0.0
SHARED_LIBS += pyside6qml.abi3 0.0 # 0.0
diff --git a/x11/qt6/pyside6/pyside/distinfo b/x11/qt6/pyside6/pyside/distinfo
index 8e1a3a3c605..1745fff75d3 100644
--- a/x11/qt6/pyside6/pyside/distinfo
+++ b/x11/qt6/pyside6/pyside/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/pyside-setup-everywhere-src-6.8.2.1.tar.xz) = E/egCzYKWGkIT8wIXEi6I2kVogC7WhPBVI7Yq3qLYGs=
-SIZE (qt/pyside-setup-everywhere-src-6.8.2.1.tar.xz) = 16609240
+SHA256 (qt/pyside-setup-everywhere-src-6.8.3.tar.xz) = 0siW9/Gmp+pMn5jP4xcnL9E5cD3fYSuGmZ8J5Iru8OY=
+SIZE (qt/pyside-setup-everywhere-src-6.8.3.tar.xz) = 16611768
diff --git a/x11/qt6/pyside6/pyside/pkg/PLIST b/x11/qt6/pyside6/pyside/pkg/PLIST
index 6a7ba80d50b..ef89a483481 100644
--- a/x11/qt6/pyside6/pyside/pkg/PLIST
+++ b/x11/qt6/pyside6/pyside/pkg/PLIST
@@ -376,7 +376,6 @@ share/PySide6/typesystems/glue/plugins.h
share/PySide6/typesystems/glue/qeasingcurve_glue.cpp
share/PySide6/typesystems/glue/qeasingcurve_glue.h
share/PySide6/typesystems/gui_common.xml
-share/PySide6/typesystems/opengl_common.xml
share/PySide6/typesystems/typesystem_3danimation.xml
share/PySide6/typesystems/typesystem_3dcore.xml
share/PySide6/typesystems/typesystem_3dextras.xml
diff --git a/x11/qt6/pyside6/shiboken/Makefile b/x11/qt6/pyside6/shiboken/Makefile
index c657225e278..3780c2d62a0 100644
--- a/x11/qt6/pyside6/shiboken/Makefile
+++ b/x11/qt6/pyside6/shiboken/Makefile
@@ -1,6 +1,5 @@
COMMENT = Python binding generator for C++ libraries
PKGNAME = shiboken6-${VERSION}
-REVISION = 1
SHARED_LIBS += shiboken6.abi3 1.0 # 0.0
diff --git a/x11/qt6/pyside6/shiboken/distinfo b/x11/qt6/pyside6/shiboken/distinfo
index 8e1a3a3c605..1745fff75d3 100644
--- a/x11/qt6/pyside6/shiboken/distinfo
+++ b/x11/qt6/pyside6/shiboken/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/pyside-setup-everywhere-src-6.8.2.1.tar.xz) = E/egCzYKWGkIT8wIXEi6I2kVogC7WhPBVI7Yq3qLYGs=
-SIZE (qt/pyside-setup-everywhere-src-6.8.2.1.tar.xz) = 16609240
+SHA256 (qt/pyside-setup-everywhere-src-6.8.3.tar.xz) = 0siW9/Gmp+pMn5jP4xcnL9E5cD3fYSuGmZ8J5Iru8OY=
+SIZE (qt/pyside-setup-everywhere-src-6.8.3.tar.xz) = 16611768
diff --git a/x11/qt6/pyside6/tools/Makefile b/x11/qt6/pyside6/tools/Makefile
index ae570adf13c..7241a289d67 100644
--- a/x11/qt6/pyside6/tools/Makefile
+++ b/x11/qt6/pyside6/tools/Makefile
@@ -1,6 +1,5 @@
COMMENT = PySide6 development tools
PKGNAME = pyside6-tools-${VERSION}
-REVISION = 1
WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6Designer
WANTLIB += Qt6DesignerComponents Qt6Gui Qt6Help Qt6Network Qt6OpenGL
@@ -12,6 +11,7 @@ WANTLIB += Qt6Sql Qt6UiTools Qt6Widgets Qt6Xml c execinfo m xkbcommon
WANTLIB += zstd
WANTLIB += llvm${MODCLANG_VERSION}/lib/clang
+WANTLIB += llvm${MODCLANG_VERSION}/lib/LLVM
MODULES += lang/clang \
lang/python
diff --git a/x11/qt6/pyside6/tools/distinfo b/x11/qt6/pyside6/tools/distinfo
index 8e1a3a3c605..1745fff75d3 100644
--- a/x11/qt6/pyside6/tools/distinfo
+++ b/x11/qt6/pyside6/tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/pyside-setup-everywhere-src-6.8.2.1.tar.xz) = E/egCzYKWGkIT8wIXEi6I2kVogC7WhPBVI7Yq3qLYGs=
-SIZE (qt/pyside-setup-everywhere-src-6.8.2.1.tar.xz) = 16609240
+SHA256 (qt/pyside-setup-everywhere-src-6.8.3.tar.xz) = 0siW9/Gmp+pMn5jP4xcnL9E5cD3fYSuGmZ8J5Iru8OY=
+SIZE (qt/pyside-setup-everywhere-src-6.8.3.tar.xz) = 16611768
diff --git a/x11/qt6/qt3d/distinfo b/x11/qt6/qt3d/distinfo
index 38a7cca8e4a..01180dea39d 100644
--- a/x11/qt6/qt3d/distinfo
+++ b/x11/qt6/qt3d/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qt3d-everywhere-src-6.8.2.tar.xz) = V3pjUvCRqNX9CHoKyUi++xhVg5We5ASACQc/Czd7jEQ=
-SIZE (qt/qt3d-everywhere-src-6.8.2.tar.xz) = 141821364
+SHA256 (qt/qt3d-everywhere-src-6.8.3.tar.xz) = CV4b53/9SxWNnlfxbuiYyvfQ1uVAb0ZtnYMV1bHnlWM=
+SIZE (qt/qt3d-everywhere-src-6.8.3.tar.xz) = 141825440
diff --git a/x11/qt6/qt5compat/distinfo b/x11/qt6/qt5compat/distinfo
index c0ea60ba1e1..5d027999d33 100644
--- a/x11/qt6/qt5compat/distinfo
+++ b/x11/qt6/qt5compat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qt5compat-everywhere-src-6.8.2.tar.xz) = tTFUvJXsCOLdwma+8lD71oS06y35a8jCfSax6VNJUxY=
-SIZE (qt/qt5compat-everywhere-src-6.8.2.tar.xz) = 14637788
+SHA256 (qt/qt5compat-everywhere-src-6.8.3.tar.xz) = VLnIS/80tCPdjEcoYs4QCXU/9QXkGLTvM5B0FtoWuC4=
+SIZE (qt/qt5compat-everywhere-src-6.8.3.tar.xz) = 14634168
diff --git a/x11/qt6/qtbase/Makefile b/x11/qt6/qtbase/Makefile
index fa4c7877bd2..13eb050c57d 100644
--- a/x11/qt6/qtbase/Makefile
+++ b/x11/qt6/qtbase/Makefile
@@ -4,7 +4,6 @@ COMMENT-main = C++ general-purpose toolkit
COMMENT-global = global Qt6 documentation internals
COMMENT-mysql = MySQL plugin for Qt6
COMMENT-psql = PostgresSQL plugin for Qt6
-REVISION-main = 1
PKGSPEC-main = qt6-qtbase-${QT6_PKGSPEC}
diff --git a/x11/qt6/qtbase/distinfo b/x11/qt6/qtbase/distinfo
index 91ad8bef2c7..44306a1b709 100644
--- a/x11/qt6/qtbase/distinfo
+++ b/x11/qt6/qtbase/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtbase-everywhere-src-6.8.2.tar.xz) = ASBDzm1BHm6Kkf3E4F5r7c+hD8sTR9PDOQj3/dEN/gU=
-SIZE (qt/qtbase-everywhere-src-6.8.2.tar.xz) = 48264736
+SHA256 (qt/qtbase-everywhere-src-6.8.3.tar.xz) = VgAbkFYBu5Aj05nzungNf6lA8+SGHklqfEkDMfSeC4A=
+SIZE (qt/qtbase-everywhere-src-6.8.3.tar.xz) = 48426536
diff --git a/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake b/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake
index 3c305b5630b..92d61b23df3 100644
--- a/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake
+++ b/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake
@@ -1,7 +1,7 @@
Index: cmake/QtFeature.cmake
--- cmake/QtFeature.cmake.orig
+++ cmake/QtFeature.cmake
-@@ -1205,7 +1205,23 @@ function(qt_get_platform_try_compile_vars out_var)
+@@ -1214,7 +1214,23 @@ function(qt_get_platform_try_compile_vars out_var)
set("${out_var}" "${flags_cmd_line}" PARENT_SCOPE)
endfunction()
diff --git a/x11/qt6/qtbase/patches/patch-src_corelib_global_qlibraryinfo_cpp b/x11/qt6/qtbase/patches/patch-src_corelib_global_qlibraryinfo_cpp
deleted file mode 100644
index b4d66578005..00000000000
--- a/x11/qt6/qtbase/patches/patch-src_corelib_global_qlibraryinfo_cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-QLibraryInfo: speed up checking if ":/qt/etc/qt.conf" resource exists
-
-Go straight for QResource, because this is run very early in Qt's
-initialization, usually as a result of some debug message, via
-QLoggingRegistry::initializeRules(). This bypasses the need to create
-QResourceFileEnginePrivate, QResourceFileEngine, QFileInfoPrivate, and
-QFileInfo, all of which would end up in this .isValid() call.
-
-Additionally, I'm making it query in the C locale, which will also avoid
-initializing the system & default QLocales. If a resource exists in any
-language, the C locale query will find it.
-
-Task-number: QTBUG-133206
-
-https://invent.kde.org/qt/qt/qtbase/-/commit/a43c7e58046604796aa69974ea1c5d3e2648c755
-
-Index: src/corelib/global/qlibraryinfo.cpp
---- src/corelib/global/qlibraryinfo.cpp.orig
-+++ src/corelib/global/qlibraryinfo.cpp
-@@ -6,6 +6,7 @@
- #include "qstringlist.h"
- #include "qfile.h"
- #if QT_CONFIG(settings)
-+#include "qresource.h"
- #include "qsettings.h"
-
No comments:
Post a Comment