[packages/qt6] up to 6.10.3
atler
atler at pld-linux.org
Fri Apr 3 11:21:59 CEST 2026
commit 6008203c0e9fa18e42eaf96cd83f863dfc70483e
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Apr 3 11:16:45 2026 +0200
up to 6.10.3
patch to fix compilation with glib2 >= 2.78 built againtst glibc >= 2.43.
glibc 2.43 added support for free_sized() which glib2 >= 2.78 makes use
of if detected at build time. however g_free() becomes a macro then
causing build failure in qt:
error: expected id-expression before '(' token
glib2.78-glibc2.43.patch | 11 +++++++++++
glibc2.43.patch | 21 ---------------------
ninja-program.patch | 8 ++++----
qt6.spec | 20 ++++++++++++++++----
4 files changed, 31 insertions(+), 29 deletions(-)
---
diff --git a/qt6.spec b/qt6.spec
index c5b24ed..810ed41 100644
--- a/qt6.spec
+++ b/qt6.spec
@@ -128,12 +128,12 @@
Summary: Qt6 Library
Summary(pl.UTF-8): Biblioteka Qt6
Name: qt6
-Version: 6.10.2
-Release: 2
+Version: 6.10.3
+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.10/%{version}/single/qt-everywhere-src-%{version}.tar.xz
-# Source0-md5: c888eeca204d8ee144d9c57c2df9f8f4
+# Source0-md5: 1299e6054496de364f56e8e6dcc0e5e9
Patch0: system-cacerts.patch
Patch1: ninja-program.patch
Patch2: arm-no-xnnpack.patch
@@ -141,7 +141,7 @@ Patch3: no-implicit-sse2.patch
Patch4: x32.patch
Patch5: qtwebengine-cmake-build-type.patch
Patch6: qtquick3d-6.6.2-gcc14.patch
-Patch7: glibc2.43.patch
+Patch7: glib2.78-glibc2.43.patch
URL: https://www.qt.io/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: EGL-devel
@@ -7997,6 +7997,12 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/Qt6WaylandCompositorPresentationTime.pc
%{_pkgconfigdir}/Qt6WaylandCompositorWLShell.pc
%{_pkgconfigdir}/Qt6WaylandCompositorXdgShell.pc
+%{_libdir}/cmake/Qt6Gui/Qt6QWaylandIviShellIntegrationPlugin*.cmake
+%{_libdir}/cmake/Qt6Gui/Qt6QWaylandQtShellIntegrationPlugin*.cmake
+%{_libdir}/cmake/Qt6Gui/Qt6QWaylandWlShellIntegrationPlugin*.cmake
+%{_libdir}/cmake/Qt6Gui/Qt6QWaylandXdgShellIntegrationPlugin*.cmake
+%{_libdir}/cmake/Qt6Gui/Qt6ShmServerBufferPlugin*.cmake
+%{_libdir}/cmake/Qt6Gui/Qt6VulkanServerBufferPlugin*.cmake
%{_libdir}/cmake/Qt6WaylandCompositor
%{_libdir}/cmake/Qt6WaylandCompositorPrivate
%{_libdir}/cmake/Qt6WaylandCompositorIviapplication
@@ -8080,7 +8086,13 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libQt6WaylandClient.prl
%{_includedir}/qt6/QtWaylandClient
%{_pkgconfigdir}/Qt6WaylandClient.pc
+%{_libdir}/cmake/Qt6Gui/Qt6DmaBufServerBufferPlugin*.cmake
+%{_libdir}/cmake/Qt6Gui/Qt6DrmEglServerBufferPlugin*.cmake
%{_libdir}/cmake/Qt6Gui/Qt6QWaylandIntegrationPlugin*.cmake
+%{_libdir}/cmake/Qt6Gui/Qt6QWaylandAdwaitaDecorationPlugin*.cmake
+%{_libdir}/cmake/Qt6Gui/Qt6QWaylandBradientDecorationPlugin*.cmake
+%{_libdir}/cmake/Qt6Gui/Qt6QWaylandEglClientBufferPlugin*.cmake
+%{_libdir}/cmake/Qt6Gui/Qt6QWaylandFullScreenShellV1IntegrationPlugin*.cmake
%{_libdir}/cmake/Qt6WaylandClient
%{_libdir}/cmake/Qt6WaylandClientPrivate
%{_libdir}/cmake/Qt6WaylandClientFeaturesPrivate
diff --git a/glib2.78-glibc2.43.patch b/glib2.78-glibc2.43.patch
new file mode 100644
index 0000000..2011453
--- /dev/null
+++ b/glib2.78-glibc2.43.patch
@@ -0,0 +1,11 @@
+--- qt-everywhere-src-6.10.3/qtpositioning/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp.orig 2026-03-30 13:38:37.000000000 +0200
++++ qt-everywhere-src-6.10.3/qtpositioning/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp 2026-04-02 12:48:44.437888803 +0200
+@@ -53,7 +53,7 @@
+
+ void SatelliteGypsyEngine::eng_g_free(gpointer mem)
+ {
+- return ::g_free(mem);
++ return g_free(mem);
+ }
+ // Gypsy symbols
+ GypsyControl *SatelliteGypsyEngine::eng_gypsy_control_get_default (void)
diff --git a/glibc2.43.patch b/glibc2.43.patch
deleted file mode 100644
index 3210e92..0000000
--- a/glibc2.43.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- qt-everywhere-src-6.10.1/qtwebengine/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h.orig 2025-11-14 08:55:10.000000000 +0100
-+++ qt-everywhere-src-6.10.1/qtwebengine/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h 2026-01-29 22:52:59.857202173 +0100
-@@ -5,6 +5,7 @@
- #ifndef SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SECCOMP_H_
- #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SECCOMP_H_
-
-+#include <features.h>
- #include <stdint.h>
- #include <sys/ioctl.h>
-
-@@ -214,8 +215,10 @@
- #define SECCOMP_RET_INVALID 0x00010000U // Illegal return value
- #endif
-
-+#if !defined(__GLIBC__) || !defined(__GLIBC_MINOR__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 43)
- #ifndef SYS_SECCOMP
- #define SYS_SECCOMP 1
- #endif
-+#endif
-
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SECCOMP_H_
diff --git a/ninja-program.patch b/ninja-program.patch
index c162955..d2270be 100644
--- a/ninja-program.patch
+++ b/ninja-program.patch
@@ -1,7 +1,7 @@
---- qt-everywhere-src-6.10.0/qtwebengine/cmake/Functions.cmake.orig 2025-10-02 02:36:39.000000000 +0200
-+++ qt-everywhere-src-6.10.0/qtwebengine/cmake/Functions.cmake 2025-11-20 20:28:09.478389120 +0100
-@@ -549,6 +552,8 @@
- -DWEBENGINE_ROOT_BUILD_DIR=${PROJECT_BINARY_DIR}
+--- qt-everywhere-src-6.10.3/qtwebengine/cmake/Functions.cmake.orig 2026-03-30 14:29:09.000000000 +0200
++++ qt-everywhere-src-6.10.3/qtwebengine/cmake/Functions.cmake 2026-04-02 12:03:21.328240391 +0200
+@@ -654,6 +654,8 @@
+ -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
-DQT_ALLOW_SYMLINK_IN_PATHS=${QT_ALLOW_SYMLINK_IN_PATHS}
-DPython3_EXECUTABLE=${Python3_EXECUTABLE}
+ -DNinja_EXECUTABLE:FILEPATH=${Ninja_EXECUTABLE}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt6.git/commitdiff/6008203c0e9fa18e42eaf96cd83f863dfc70483e
More information about the pld-cvs-commit
mailing list