[packages/qt6] up to 6.9.1
atler
atler at pld-linux.org
Wed Jun 4 03:52:33 CEST 2025
commit 272e7884fbf6834d8a5560f0ed56705d62353a50
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Jun 4 02:07:45 2025 +0200
up to 6.9.1
QTBUG-136257.patch | 2 +-
qt6.spec | 28 +++++++++++++++++-----------
qtwebengine-cmake-build-type.patch | 4 ++--
qtwebengine-missing-dep.patch | 10 ----------
webengine-seccomp-glibc2.41.patch | 34 ----------------------------------
5 files changed, 20 insertions(+), 58 deletions(-)
---
diff --git a/qt6.spec b/qt6.spec
index 6b37e4b..a16ad84 100644
--- a/qt6.spec
+++ b/qt6.spec
@@ -149,12 +149,12 @@
Summary: Qt6 Library
Summary(pl.UTF-8): Biblioteka Qt6
Name: qt6
-Version: 6.9.0
+Version: 6.9.1
Release: 1
License: LGPL v3 or GPL v2 or GPL v3 or commercial
Group: X11/Libraries
Source0: https://download.qt.io/official_releases/qt/6.9/%{version}/single/qt-everywhere-src-%{version}.tar.xz
-# Source0-md5: 6c3e4eceffe8a0e76c7a89a74d33be00
+# Source0-md5: 96dd62d709cc6bd626750ef41777cf2f
Patch0: system-cacerts.patch
Patch1: ninja-program.patch
Patch2: arm-no-xnnpack.patch
@@ -162,9 +162,7 @@ Patch3: no-implicit-sse2.patch
Patch4: x32.patch
Patch5: qtwebengine-cmake-build-type.patch
Patch6: qtquick3d-6.6.2-gcc14.patch
-Patch7: webengine-seccomp-glibc2.41.patch
-Patch8: qtwebengine-missing-dep.patch
-Patch9: QTBUG-136257.patch
+Patch7: QTBUG-136257.patch
URL: https://www.qt.io/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: EGL-devel
@@ -3798,9 +3796,7 @@ narzędzia.
%patch -P4 -p1
%patch -P5 -p1
%patch -P6 -p1 -d qtquick3d
-%patch -P7 -p1 -d qtwebengine/src/3rdparty/chromium
-%patch -P8 -p1 -d qtwebengine
-%patch -P9 -p1 -d qtwebengine
+%patch -P7 -p1 -d qtwebengine
%{__sed} -i -e 's,usr/X11R6/,usr/,g' qtbase/mkspecs/linux-g++-64/qmake.conf
@@ -4441,6 +4437,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %ghost %{_libdir}/libQt63DQuickExtras.so.6
%attr(755,root,root) %{_libdir}/libQt63DQuickInput.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libQt63DQuickInput.so.6
+%attr(755,root,root) %{_libdir}/libQt63DQuickLogic.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQt63DQuickLogic.so.6
%attr(755,root,root) %{_libdir}/libQt63DQuickRender.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libQt63DQuickRender.so.6
%attr(755,root,root) %{_libdir}/libQt63DQuickScene2D.so.*.*.*
@@ -4483,7 +4481,7 @@ rm -rf $RPM_BUILD_ROOT
%{qt6dir}/qml/Qt3D/Input/plugins.qmltypes
%{qt6dir}/qml/Qt3D/Input/qmldir
%dir %{qt6dir}/qml/Qt3D/Logic
-%attr(755,root,root) %{qt6dir}/qml/Qt3D/Logic/libquick3dlogicplugin.so
+%attr(755,root,root) %{qt6dir}/qml/Qt3D/Logic/lib3dquicklogicplugin.so
%{qt6dir}/qml/Qt3D/Logic/plugins.qmltypes
%{qt6dir}/qml/Qt3D/Logic/qmldir
%dir %{qt6dir}/qml/Qt3D/Render
@@ -4509,6 +4507,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libQt63DQuickAnimation.so
%attr(755,root,root) %{_libdir}/libQt63DQuickExtras.so
%attr(755,root,root) %{_libdir}/libQt63DQuickInput.so
+%attr(755,root,root) %{_libdir}/libQt63DQuickLogic.so
%attr(755,root,root) %{_libdir}/libQt63DQuickRender.so
%attr(755,root,root) %{_libdir}/libQt63DQuickScene2D.so
%attr(755,root,root) %{_libdir}/libQt63DQuickScene3D.so
@@ -4522,6 +4521,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libQt63DQuickAnimation.prl
%{_libdir}/libQt63DQuickExtras.prl
%{_libdir}/libQt63DQuickInput.prl
+%{_libdir}/libQt63DQuickLogic.prl
%{_libdir}/libQt63DQuick.prl
%{_libdir}/libQt63DQuickRender.prl
%{_libdir}/libQt63DQuickScene2D.prl
@@ -4536,6 +4536,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/qt6/Qt3DQuickAnimation
%{_includedir}/qt6/Qt3DQuickExtras
%{_includedir}/qt6/Qt3DQuickInput
+%{_includedir}/qt6/Qt3DQuickLogic
%{_includedir}/qt6/Qt3DQuickRender
%{_includedir}/qt6/Qt3DQuickScene2D
%{_includedir}/qt6/Qt3DQuickScene3D
@@ -4548,6 +4549,7 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/Qt63DQuickAnimation.pc
%{_pkgconfigdir}/Qt63DQuickExtras.pc
%{_pkgconfigdir}/Qt63DQuickInput.pc
+%{_pkgconfigdir}/Qt63DQuickLogic.pc
%{_pkgconfigdir}/Qt63DQuick.pc
%{_pkgconfigdir}/Qt63DQuickRender.pc
%{_pkgconfigdir}/Qt63DQuickScene2D.pc
@@ -4571,6 +4573,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/cmake/Qt63DQuickExtrasPrivate
%{_libdir}/cmake/Qt63DQuickInput
%{_libdir}/cmake/Qt63DQuickInputPrivate
+%{_libdir}/cmake/Qt63DQuickLogic
+%{_libdir}/cmake/Qt63DQuickLogicPrivate
%{_libdir}/cmake/Qt63DQuickRender
%{_libdir}/cmake/Qt63DQuickRenderPrivate
%{_libdir}/cmake/Qt63DQuickScene2D
@@ -4588,6 +4592,7 @@ rm -rf $RPM_BUILD_ROOT
%{qt6dir}/metatypes/qt63dquickanimation_pld_metatypes.json
%{qt6dir}/metatypes/qt63dquickextras_pld_metatypes.json
%{qt6dir}/metatypes/qt63dquickinput_pld_metatypes.json
+%{qt6dir}/metatypes/qt63dquicklogic_pld_metatypes.json
%{qt6dir}/metatypes/qt63dquickrender_pld_metatypes.json
%{qt6dir}/metatypes/qt63dquickscene2d_pld_metatypes.json
%{qt6dir}/metatypes/qt63dquickscene3d_pld_metatypes.json
@@ -4608,6 +4613,8 @@ rm -rf $RPM_BUILD_ROOT
%{qt6dir}/mkspecs/modules/qt_lib_3dquickextras_private.pri
%{qt6dir}/mkspecs/modules/qt_lib_3dquickinput.pri
%{qt6dir}/mkspecs/modules/qt_lib_3dquickinput_private.pri
+%{qt6dir}/mkspecs/modules/qt_lib_3dquicklogic.pri
+%{qt6dir}/mkspecs/modules/qt_lib_3dquicklogic_private.pri
%{qt6dir}/mkspecs/modules/qt_lib_3dquick.pri
%{qt6dir}/mkspecs/modules/qt_lib_3dquick_private.pri
%{qt6dir}/mkspecs/modules/qt_lib_3dquickrender.pri
@@ -4627,6 +4634,7 @@ rm -rf $RPM_BUILD_ROOT
%{qt6dir}/modules/3DQuickAnimation.json
%{qt6dir}/modules/3DQuickExtras.json
%{qt6dir}/modules/3DQuickInput.json
+%{qt6dir}/modules/3DQuickLogic.json
%{qt6dir}/modules/3DQuickRender.json
%{qt6dir}/modules/3DQuickScene2D.json
%{qt6dir}/modules/3DQuickScene3D.json
@@ -6370,7 +6378,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{qt6dir}/qml/QtQuick/Controls/Basic/libqtquickcontrols2basicstyleplugin.so
%dir %{qt6dir}/qml/QtQuick/Controls/Basic/impl
%attr(755,root,root) %{qt6dir}/qml/QtQuick/Controls/Basic/impl/libqtquickcontrols2basicstyleimplplugin.so
-%{qt6dir}/qml/QtQuick/Controls/Basic/impl/*.qml
%{qt6dir}/qml/QtQuick/Controls/Basic/impl/plugins.qmltypes
%{qt6dir}/qml/QtQuick/Controls/Basic/impl/qmldir
@@ -6436,7 +6443,6 @@ rm -rf $RPM_BUILD_ROOT
%{qt6dir}/qml/QtQuick/Controls/designer/qtquickcontrols2.metainfo
%dir %{qt6dir}/qml/QtQuick/Controls/impl
-%{qt6dir}/qml/QtQuick/Controls/impl/*.qml
%attr(755,root,root) %{qt6dir}/qml/QtQuick/Controls/impl/libqtquickcontrols2implplugin.so
%{qt6dir}/qml/QtQuick/Controls/impl/plugins.qmltypes
%{qt6dir}/qml/QtQuick/Controls/impl/qmldir
diff --git a/QTBUG-136257.patch b/QTBUG-136257.patch
index 8b3e24d..e609885 100644
--- a/QTBUG-136257.patch
+++ b/QTBUG-136257.patch
@@ -153,7 +153,7 @@ index d12280f..1ed679d 100644
- (EGLClientBuffer)textureId, NULL);
+ EGLImage eglImage = m_functions->eglCreateDRMImageMESA(m_eglDisplay, attribs);
if (eglImage == EGL_NO_IMAGE) {
- qWarning() << "EGL: Failed to create EGLImage:" << getLastEGLErrorString();
+ qWarning("EGL: Failed to create EGLImage: %s", getLastEGLErrorString());
return;
diff --git a/src/core/ozone/egl_helper.h b/src/core/ozone/egl_helper.h
index a1a1aa0..7594e1f 100644
diff --git a/qtwebengine-cmake-build-type.patch b/qtwebengine-cmake-build-type.patch
index c31fd82..d177f57 100644
--- a/qtwebengine-cmake-build-type.patch
+++ b/qtwebengine-cmake-build-type.patch
@@ -1,5 +1,5 @@
---- qt-everywhere-src-6.5.0/qtwebengine/cmake/Functions.cmake.orig 2023-04-04 18:57:25.754463285 +0200
-+++ qt-everywhere-src-6.5.0/qtwebengine/cmake/Functions.cmake 2023-04-04 18:58:51.778567461 +0200
+--- qt-everywhere-src-6.5.0/qtwebengine/cmake/QtToolchainHelpers.cmake.orig 2023-04-04 18:57:25.754463285 +0200
++++ qt-everywhere-src-6.5.0/qtwebengine/cmake/QtToolchainHelpers.cmake 2023-04-04 18:58:51.778567461 +0200
@@ -848,7 +848,7 @@
if(WIN32)
list(APPEND gnArgArg enable_iterator_debugging=true)
diff --git a/qtwebengine-missing-dep.patch b/qtwebengine-missing-dep.patch
deleted file mode 100644
index 21f6716..0000000
--- a/qtwebengine-missing-dep.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qtwebengine/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn.orig 2025-03-18 20:28:59.000000000 +0100
-+++ qtwebengine/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn 2025-04-04 21:08:15.145686277 +0200
-@@ -445,6 +445,7 @@
- "//net",
- "//net/traffic_annotation:test_support",
- "//services/network/public/mojom",
-+ "//ui/gl:buildflags",
- ]
-
- if (is_mac && is_component_ffmpeg) {
diff --git a/webengine-seccomp-glibc2.41.patch b/webengine-seccomp-glibc2.41.patch
deleted file mode 100644
index e854216..0000000
--- a/webengine-seccomp-glibc2.41.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-glibc 2.41 ships with support for getrandom() in vdso on x86-65 and aarch64. in
-turn it started using mmap() sysctl internally on these platforms. chromium's
-seccomp filter allows mmap() but only with specific set of flags which do not
-include newly introduced one for getrandom(): MAP_DROPPABLE. it results in
-blocking syscall usually on chromium->fontconfig->expat code path and an
-eventual crash.
-
-add MAP_DROPPABLE to allowed flags and define it if not yet defined to avoid
-dependency on most recent glibc
-
-Signed-off-by: Jan Palus <atler at pld-linux.org>
---- chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.orig 2025-01-24 11:49:20.000000000 +0100
-+++ chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2025-02-06 15:52:33.188403354 +0100
-@@ -68,6 +68,11 @@
- #define PROT_BTI 0x10
- #endif
-
-+// Introduced in glibc 2.41
-+#ifndef MAP_DROPPABLE
-+#define MAP_DROPPABLE 0x08 /* Zero memory under memory pressure. */
-+#endif
-+
- namespace {
-
- inline bool IsArchitectureX86_64() {
-@@ -238,7 +243,7 @@
- // TODO(davidung), remove MAP_DENYWRITE with updated Tegra libraries.
- const uint64_t kAllowedMask = MAP_SHARED | MAP_PRIVATE | MAP_ANONYMOUS |
- MAP_STACK | MAP_NORESERVE | MAP_FIXED |
-- MAP_DENYWRITE | MAP_LOCKED |
-+ MAP_DENYWRITE | MAP_LOCKED | MAP_DROPPABLE |
- kArchSpecificAllowedMask;
- const Arg<int> flags(3);
- return If((flags & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS());
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt6.git/commitdiff/272e7884fbf6834d8a5560f0ed56705d62353a50
More information about the pld-cvs-commit
mailing list