Update to 6.5.0

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-base?expand=0&rev=46

0001-Avoid-resetting-CMAKE_AUTOMOC_MACRO_NAMES.patch

@@ -1,36 +0,0 @@
-From 9bcb5cbfb07052ffd24c4a419bf20bd63a842591 Mon Sep 17 00:00:00 2001
-From: Amir Masoud Abdol <amir.abdol@qt.io>
-Date: Tue, 28 Feb 2023 10:32:13 +0100
-Subject: [PATCH] Avoid resetting CMAKE_AUTOMOC_MACRO_NAMES
-
-Instead of overwriting the CMAKE_AUTOMOC_MACRO_NAMES, we try to append
-our desired moc names to it, and don't get rid of what's there.
-
-Thanks for Friedrich W. H. Kossebau for filling a descriptive bug report
-and offering a solution as well.
-
-Fixes: QTBUG-110497
-Change-Id: I582af431151cacfe24085b890ae9dba0a0e53f3f
-Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
-(cherry picked from commit 38ee9ee8497291c899c2a72e0ed24bfffe9ced4e)
----
- src/corelib/Qt6CoreConfigExtras.cmake.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/corelib/Qt6CoreConfigExtras.cmake.in b/src/corelib/Qt6CoreConfigExtras.cmake.in
-index 8b4d3164cf..4a95625854 100644
---- a/src/corelib/Qt6CoreConfigExtras.cmake.in
-+++ b/src/corelib/Qt6CoreConfigExtras.cmake.in
-@@ -26,7 +26,8 @@ if (NOT QT_NO_CREATE_TARGETS)
-     set_property(TARGET ${__qt_core_target} PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)
- endif()
- 
--set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_GADGET_EXPORT" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT")
-+list(APPEND CMAKE_AUTOMOC_MACRO_NAMES Q_OBJECT Q_GADGET Q_GADGET_EXPORT Q_NAMESPACE Q_NAMESPACE_EXPORT)
-+list(REMOVE_DUPLICATES CMAKE_AUTOMOC_MACRO_NAMES)
- 
- # install layout information, following what qmake -query provides
- get_filename_component(QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX ${CMAKE_CURRENT_LIST_DIR}/../@QT_INVERSE_CONFIG_INSTALL_DIR@ ABSOLUTE)
--- 
-2.39.2
-

0001-Tell-the-truth-about-private-API.patch

@@ -1,4 +1,4 @@
-From e3bf7041e63a8757886436bdbd06ffbc9d6b72ce Mon Sep 17 00:00:00 2001
+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
@@ -7,42 +7,23 @@ 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.
-
-Change-Id: Iada0be6e7d4eaa3a6683b82183643c88dbfa6580
 ---
  cmake/QtFlagHandlingHelpers.cmake | 2 +-
- mkspecs/features/qt_module.prf    | 4 ++--
+ 1 file changed, 1 insertion(+), 1 deletion(-)
- 2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
-index dc81a79333..d2a5634f25 100644
+index d8597326cc..f9da7b2171 100644
 --- a/cmake/QtFlagHandlingHelpers.cmake
 +++ b/cmake/QtFlagHandlingHelpers.cmake
-@@ -2,7 +2,7 @@ function(qt_internal_add_linker_version_script target)
+@@ -23,7 +23,7 @@ function(qt_internal_add_linker_version_script target)
-     qt_parse_all_arguments(arg "qt_internal_add_linker" "" "" "PRIVATE_HEADERS" ${ARGN})
+     endif()
  
-     if (TEST_ld_version_script)
+     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}.${PROJECT_VERSION_PATCH}_PRIVATE_API {\n    qt_private_api_tag*;\n")
-         foreach(ph ${arg_PRIVATE_HEADERS})
+         if(arg_PRIVATE_HEADERS)
-             string(APPEND contents "    @FILE:${ph}@\n")
+             foreach(ph ${arg_PRIVATE_HEADERS})
-         endforeach()
+                 string(APPEND contents "    @FILE:${ph}@\n")
-diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 62d225b14d..de0dba34a8 100644
---- a/mkspecs/features/qt_module.prf
-+++ b/mkspecs/features/qt_module.prf
-@@ -218,9 +218,9 @@ android: CONFIG += qt_android_deps no_linker_version_script
-     QMAKE_LFLAGS += $${QMAKE_LFLAGS_VERSION_SCRIPT}$$verscript
- 
-     internal_module {
--        verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };"
-+        verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API { *; };"
-     } else {
--        verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \
-+        verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API {" \
-                             "    qt_private_api_tag*;"
- 
-         private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES
 -- 
-2.32.0
+2.40.0
 

qt6-base.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Apr  3 10:01:48 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.5.0
+  * https://www.qt.io/blog/qt-6.5-lts-released
+- Drop patch, merged upstream:
+  * 0001-Avoid-resetting-CMAKE_AUTOMOC_MACRO_NAMES.patch
+
 -------------------------------------------------------------------
 Thu Mar 16 09:59:57 UTC 2023 - Christophe Marin <christophe@krop.fr>
 

qt6-base.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qt6-base
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
 #
 
 
-%define real_version 6.4.3
+%define real_version 6.5.0
-%define short_version 6.4
+%define short_version 6.5
 %define tar_name qtbase-everywhere-src
 %define tar_suffix %{nil}
 #
@@ -30,7 +30,7 @@
 %global with_gles 1
 %endif
 Name:           qt6-base%{?pkg_suffix}
-Version:        6.4.3
+Version:        6.5.0
 Release:        0
 Summary:        Qt 6 core components (Core, Gui, Widgets, Network...)
 # Legal: qtpaths is BSD-3-Clause
@@ -39,7 +39,6 @@ URL:            https://www.qt.io
 Source:         https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
 Source99:       qt6-base-rpmlintrc
 # Patches 0-100 are upstream patches #
-Patch0:         0001-Avoid-resetting-CMAKE_AUTOMOC_MACRO_NAMES.patch
 # Patches 100-200 are openSUSE and/or non-upstream(able) patches #
 Patch100:       0001-Tell-the-truth-about-private-API.patch
 %if 0%{?suse_version} == 1500
@@ -401,7 +400,6 @@ ABI or API guarantees.
 Summary:        Qt 6 OpenGLWidgets library
 Requires:       libQt6Widgets6 = %{version}
 
-# FIXME
 %description -n libQt6OpenGLWidgets6
 The Qt OpenGL Widgets module provides an OpenGLWidgets class that can be used
 like any other Qt widget, except that it opens an OpenGL display
@@ -721,7 +719,7 @@ cp src/3rdparty/freetype/LICENSE.txt src/gui/painting/FREETYPE_LICENSE.txt
 sed -i 's#../../3rdparty/freetype/LICENSE.txt#FREETYPE_LICENSE.txt#' src/gui/painting/qt_attribution.json
 
 # We don't want to use these 3rdparty libraries
-rm -r src/3rdparty/{double-conversion,libjpeg,libpng,freetype,harfbuzz-ng,sqlite,xcb,zlib}
+rm -r src/3rdparty/{blake2,double-conversion,freetype,harfbuzz-ng,libjpeg,libpng,pcre2,sqlite,xcb,zlib}
 
 # Empty file used for the meta packages
 cat >> meta_package << EOF
@@ -787,13 +785,6 @@ mkdir -p %{buildroot}%{_qt6_translationsdir}
 
 %{qt6_link_executables}
 
-# This is not an executable, no need to have a symlink
-rm %{buildroot}%{_bindir}/qt-cmake-private-install.cmake6
-
-# rpmlint
-# E: env-script-interpreter
-sed -i 's#env perl#perl#' %{buildroot}%{_qt6_libexecdir}/syncqt.pl
-
 # CMake modules for plugins are not useful
 rm %{buildroot}%{_qt6_cmakedir}/*/*Plugin{Config,ConfigVersion,Targets*}.cmake
 
@@ -805,6 +796,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_openglwidgets_private.pri
 rm %{buildroot}%{_qt6_libexecdir}/android_*.sh
 rm %{buildroot}%{_qt6_libexecdir}/ensure_pro_file.cmake
 rm %{buildroot}%{_qt6_libexecdir}/qt-testrunner.py
+rm %{buildroot}%{_qt6_libexecdir}/sanitizer-testrunner.py
 
 # This is only for Apple platforms and has a python2 dep
 rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
@@ -843,22 +835,17 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_bindir}/qdbuscpp2xml6
 %{_bindir}/qdbusxml2cpp6
 %{_bindir}/qmake6
-%{_bindir}/qtpaths6
 %{_bindir}/qt-cmake6
-%{_bindir}/qt-cmake-private6
-%{_bindir}/qt-cmake-standalone-test6
 %{_bindir}/qt-configure-module6
+%{_bindir}/qtpaths6
 %{_qt6_bindir}/androiddeployqt
 %{_qt6_bindir}/androidtestrunner
 %{_qt6_bindir}/qdbuscpp2xml
 %{_qt6_bindir}/qdbusxml2cpp
 %{_qt6_bindir}/qmake
-%{_qt6_bindir}/qtpaths
 %{_qt6_bindir}/qt-cmake
-%{_qt6_bindir}/qt-cmake-private
-%{_qt6_bindir}/qt-cmake-private-install.cmake
-%{_qt6_bindir}/qt-cmake-standalone-test
 %{_qt6_bindir}/qt-configure-module
+%{_qt6_bindir}/qtpaths
 %{_qt6_cmakedir}/Qt6/
 %{_qt6_cmakedir}/Qt6BuildInternals/Qt6BuildInternalsConfig.cmake
 %{_qt6_cmakedir}/Qt6BuildInternals/Qt6BuildInternalsConfigVersion.cmake
@@ -870,11 +857,15 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_libexecdir}/cmake_automoc_parser
 %{_qt6_libexecdir}/moc
 %{_qt6_libexecdir}/qlalr
+%{_qt6_libexecdir}/qt-cmake-private
+%{_qt6_libexecdir}/qt-cmake-private-install.cmake
+%{_qt6_libexecdir}/qt-cmake-standalone-test
 %{_qt6_libexecdir}/qt-internal-configure-tests
 %{_qt6_libexecdir}/qvkgen
 %{_qt6_libexecdir}/rcc
-%{_qt6_libexecdir}/syncqt.pl
+%{_qt6_libexecdir}/syncqt
 %{_qt6_libexecdir}/tracegen
+%{_qt6_libexecdir}/tracepointgen
 %{_qt6_libexecdir}/uic
 %{_qt6_mkspecsdir}/*
 %{_qt6_pkgconfigdir}/Qt6Platform.pc

qtbase-everywhere-src-6.4.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60
-size 48078536

qtbase-everywhere-src-6.5.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef
+size 48020636