Merge remote-tracking branch 'up/f38' into f38-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -19,3 +19,4 @@
 /qtbase-everywhere-src-6.4.2.tar.xz
 /qtbase-everywhere-src-6.4.3.tar.xz
 /qtbase-everywhere-src-6.5.0.tar.xz
+/qtbase-everywhere-src-6.5.1.tar.xz

qt6-qtbase.spec

@@ -37,8 +37,8 @@ BuildRequires: pkgconfig(libsystemd)
 
 Name:    qt6-qtbase
 Summary: Qt6 - QtBase components
-Version: 6.5.0
-Release: 2.0.riscv64%{?dist}
+Version: 6.5.1
+Release: 1.0.riscv64%{?dist}
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:     http://qt-project.org/
@@ -65,6 +65,7 @@ Source6: 10-qt6-check-opengl2.sh
 # macros
 Source10: macros.qt6-qtbase
 
+Patch1: qtbase-tell-the-truth-about-private-API.patch
 Patch2: qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch
 
 # upstreamable patches
@@ -402,7 +403,7 @@ translationdir=%{_qt6_translationdir}
 
 Name: Qt6
 Description: Qt6 Configuration
-Version: 6.5.0
+Version: 6.5.1
 EOF
 
 # rpm macros
@@ -465,6 +466,9 @@ rm %{buildroot}/%{_qt6_libexecdir}/qt-cmake-private-install.cmake
 # Use better location for some new scripts in qtbase-6.0.1
 mv %{buildroot}/%{_qt6_libexecdir}/ensure_pro_file.cmake %{buildroot}/%{_qt6_libdir}/cmake/Qt6/ensure_pro_file.cmake
 
+# FIXME why is this being installed?
+rm %{buildroot}/%{_qt6_libdir}/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o
+
 %check
 # verify Qt6.pc
 export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
@@ -551,6 +555,7 @@ make check -k ||:
 %dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate
 %dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate
 %dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate
+%dir %{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate
 %dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate
 %dir %{_qt6_libdir}/cmake/Qt6Gui
 %dir %{_qt6_libdir}/cmake/Qt6GuiTools
@@ -610,6 +615,7 @@ make check -k ||:
 %{_qt6_headerdir}/QtCore/
 %{_qt6_headerdir}/QtDBus/
 %{_qt6_headerdir}/QtInputSupport
+%{_qt6_headerdir}/QtExampleIcons
 %{_qt6_headerdir}/QtGui/
 %{_qt6_headerdir}/QtNetwork/
 %{_qt6_headerdir}/QtOpenGL/
@@ -688,6 +694,7 @@ make check -k ||:
 %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6FbSupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6Gui/*.cmake
 %{_qt6_libdir}/cmake/Qt6GuiTools/*.cmake
@@ -722,6 +729,8 @@ make check -k ||:
 %{_qt6_headerdir}/QtDeviceDiscoverySupport
 %{_qt6_libdir}/libQt6DeviceDiscoverySupport.*a
 %{_qt6_libdir}/libQt6DeviceDiscoverySupport.prl
+%{_qt6_libdir}/libQt6ExampleIcons.a
+%{_qt6_libdir}/libQt6ExampleIcons.prl
 %{_qt6_headerdir}/QtFbSupport
 %{_qt6_libdir}/libQt6FbSupport.*a
 %{_qt6_libdir}/libQt6FbSupport.prl
@@ -809,9 +818,12 @@ make check -k ||:
 
 
 %changelog
-* Tue May 16 2023 David Abdurachmanov <davidlt@rivosinc.com> - 6.5.0-2.0.riscv64
+* Thu Jun 15 2023 David Abdurachmanov <davidlt@rivosinc.com> - 6.5.1-1.0.riscv64
 - Disable SSE2 on riscv64
 
+* Mon May 22 2023 Jan Grulich <jgrulich@redhat.com> - 6.5.1-1
+- 6.5.1
+
 * Fri Apr 7 2023 Marie Loise Nolden <loise@kde.org> - 6.5.0-2
 - fix xcb plugin with new dependency xcb-cursor instead of Xcursor
   introduction with qt 6.5, add firebird sql plugin cleanly, clean up spec file

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

@@ -0,0 +1,28 @@
+From 25e78cce15fdf737cc48ed5d7683ad1d01b55621 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Sun, 20 Sep 2020 09:57:22 +0200
+Subject: [PATCH] Tell the truth about private API
+
+Mark private API with symbols only for the current patch release
+
+This change is a port of the libqt5-qtbase patch which was
+added during the Qt 5.6 cycle.
+---
+ cmake/QtFlagHandlingHelpers.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
+index d8597326cc..f9da7b2171 100644
+--- a/cmake/QtFlagHandlingHelpers.cmake
++++ b/cmake/QtFlagHandlingHelpers.cmake
+@@ -23,7 +23,7 @@ function(qt_internal_add_linker_version_script target)
+     endif()
+
+     if(TEST_ld_version_script)
+-        set(contents "Qt_${PROJECT_VERSION_MAJOR}_PRIVATE_API {\n    qt_private_api_tag*;\n")
++        set(contents "Qt_${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}_PRIVATE_API {\n    qt_private_api_tag*;\n")
+         if(arg_PRIVATE_HEADERS)
+             foreach(ph ${arg_PRIVATE_HEADERS})
+                 string(APPEND contents "    @FILE:${ph}@\n")
+--
+2.40.0

sources

@@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-6.5.0.tar.xz) = 29f70b9a9650afdd8e34703a7a8191feab4c3a25d0bc3a41010ea842389335b24e2685721fdb4a03653475ebd9bf8a8e4f4a77bf5d64b1289590b5ca0e4623f3
+SHA512 (qtbase-everywhere-src-6.5.1.tar.xz) = 7f7b20bbc25cda65266d6067cdd68e3e077636988d67dbf5783f79a61186135fb3a36d57ac72cfe4501012035b630ab1f5849148e4817726d4f459fa1937e91a