6.7.1

Resolves: RHEL-36430

.gitignore

@@ -26,3 +26,4 @@
 /qtbase-everywhere-src-6.6.0.tar.xz
 /qtbase-everywhere-src-6.6.1.tar.xz
 /qtbase-everywhere-src-6.7.0.tar.xz
+/qtbase-everywhere-src-6.7.1.tar.xz

qt6-qtbase.spec

@@ -46,8 +46,8 @@ BuildRequires: pkgconfig(libsystemd)
 
 Name:    qt6-qtbase
 Summary: Qt6 - QtBase components
-Version: 6.7.0
-Release: 3%{?dist}
+Version: 6.7.1
+Release: 1%{?dist}
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:     http://qt-project.org/
@@ -74,8 +74,8 @@ Source6: 10-qt6-check-opengl2.sh
 # macros
 Source10: macros.qt6-qtbase
 
-Patch1: qtbase-tell-the-truth-about-private-API.patch
-Patch2: qtbase-CMake-Install-objects-files-into-ARCHDATADIR.patch
+Patch1:  qtbase-CMake-Install-objects-files-into-ARCHDATADIR.patch
+Patch2:  qtbase-use-only-major-minor-for-private-api-tag.patch
 
 # upstreamable patches
 # namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
@@ -106,8 +106,7 @@ Patch100: qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch
 %endif
 
 ## upstream patches
-Patch200: qtbase-use-ifdefs-instead-if-for-cpp-lib-span.patch
-Patch201: qtbase-qgtk3theme-add-support-for-xdp-to-get-color-scheme.patch
+Patch200: qtbase-qgtk3theme-add-support-for-xdp-to-get-color-scheme.patch
 
 ## RHEL specific patches
 # Patch300: qtbase-fix-tests.patch
@@ -405,6 +404,7 @@ export MAKEFLAGS="%{?_smp_mflags}"
  -DQT_FEATURE_sql_sqlite=ON \
  -DQT_FEATURE_rpath=OFF \
  -DQT_FEATURE_zstd=ON \
+ -DQT_FEATURE_elf_private_full_version=ON \
  %{?dbus_linked:-DQT_FEATURE_dbus_linked=ON} \
  %{?pcre:-DQT_FEATURE_system_pcre2=ON} \
  %{?sqlite:-DQT_FEATURE_system_sqlite=ON} \
@@ -456,7 +456,7 @@ translationdir=%{_qt6_translationdir}
 
 Name: Qt6
 Description: Qt6 Configuration
-Version: 6.7.0
+Version: 6.7.1
 EOF
 
 # rpm macros
@@ -646,6 +646,7 @@ make check -k ||:
 %{_qt6_libexecdir}/qt-cmake-private
 %{_qt6_libexecdir}/qt-cmake-standalone-test
 %{_qt6_libexecdir}/cmake_automoc_parser
+%{_qt6_libexecdir}/qt-internal-configure-examples
 %{_qt6_libexecdir}/qt-internal-configure-tests
 %{_qt6_libexecdir}/sanitizer-testrunner.py
 %{_qt6_libexecdir}/syncqt
@@ -764,7 +765,7 @@ make check -k ||:
 %{_qt6_libdir}/cmake/Qt6XcbQpaPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6Xml/*.cmake
 %{_qt6_libdir}/qt6/metatypes/*.json
-%{_qt6_libdir}/qt6/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons_init.cpp.o
+%{_qt6_libdir}/qt6/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o
 %{_qt6_libdir}/pkgconfig/*.pc
 
 %if 0%{?egl}
@@ -878,6 +879,10 @@ make check -k ||:
 
 
 %changelog
+* Fri May 31 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-1
+- 6.7.1
+  Resolves: RHEL-36430
+
 * Mon May 13 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-3
 - QGtk3Theme: Add support for xdg-desktop-portal to get color scheme
   Resolves: RHEL-36168

qtbase-tell-the-truth-about-private-API.patch

@@ -1,13 +0,0 @@
-diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
-index 28231cb5..018d697b 100644
---- a/cmake/QtFlagHandlingHelpers.cmake
-+++ b/cmake/QtFlagHandlingHelpers.cmake
-@@ -69,7 +69,7 @@ function(qt_internal_add_linker_version_script target)
-             endforeach()
-         endforeach()
- 
--        string(APPEND contents "\n};\nQt_${PROJECT_VERSION_MAJOR}_PRIVATE_API { qt_private_api_tag*;\n")
-+        string(APPEND contents "\n};\nQt_${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}_PRIVATE_API { qt_private_api_tag*;\n")
-         if(arg_PRIVATE_HEADERS)
-             foreach(ph ${arg_PRIVATE_HEADERS})
-                 string(APPEND contents "    @FILE:${ph}@\n")

qtbase-use-ifdefs-instead-if-for-cpp-lib-span.patch

@@ -1,31 +0,0 @@
-From 6810220218cbbf2854ecdedb291f7e4a84b31e54 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Wed, 3 Apr 2024 00:47:01 +0200
-Subject: [PATCH] Use ifdef instead of if for __cpp_lib_span
-
-Like the other times it's used in this file
-
-This is causing compilation errors in projects that use -Werror=undef
-
-Fixes: QTBUG-123937
-Change-Id: I0cdd2910755dc9079890011dd8dbc27a6e64793e
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-(cherry picked from commit 699ddcb15b5e981d32ea65d1c1a12f8fa0b06e0d)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/corelib/tools/qspan.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/corelib/tools/qspan.h b/src/corelib/tools/qspan.h
-index c9de1005a77..d6ae2570ae3 100644
---- a/src/corelib/tools/qspan.h
-+++ b/src/corelib/tools/qspan.h
-@@ -297,7 +297,7 @@ class QSpanBase<T, q20::dynamic_extent> : protected QSpanCommon<T>
-         : QSpanBase(il.begin(), il.size())
-     {}
-
--#if __cpp_lib_span
-+#ifdef __cpp_lib_span
-     template <typename S, size_t N, if_qualification_conversion<S> = true>
-     Q_IMPLICIT constexpr QSpanBase(std::span<S, N> other) noexcept
-         : QSpanBase(other.data(), other.size())

qtbase-use-only-major-minor-for-private-api-tag.patch

@@ -0,0 +1,13 @@
+diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
+index 6a62b85c..1fc1f88d 100644
+--- a/cmake/QtFlagHandlingHelpers.cmake
++++ b/cmake/QtFlagHandlingHelpers.cmake
+@@ -71,7 +71,7 @@ function(qt_internal_add_linker_version_script target)
+ 
+         string(APPEND contents "\n};\nQt_${PROJECT_VERSION_MAJOR}")
+         if(QT_FEATURE_elf_private_full_version)
+-            string(APPEND contents ".${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
++            string(APPEND contents ".${PROJECT_VERSION_MINOR}")
+         endif()
+         string(APPEND contents "_PRIVATE_API { qt_private_api_tag*;\n")
+         if(arg_PRIVATE_HEADERS)

sources

@@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-6.7.0.tar.xz) = 72896cc5a677361779f49d60dbdfc33a21d77bd479e0586b0beb03eee2016d613aee56e798143a489431a07a5e7a7db4c7c046105a11b63dd178768f3a7f195a
+SHA512 (qtbase-everywhere-src-6.7.1.tar.xz) = 864bebfc3659907e52b8dc3f62a65d431573ef2bf406a9f71c688229083a2128c5474f75823275d11948be3d031de1d6427acf373f977df9ee9e73a27ef56efb