Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-base for openSUSE:Factory checked in at 2023-04-05 21:31:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-base (Old) and /work/SRC/openSUSE:Factory/.qt6-base.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-base" Wed Apr 5 21:31:42 2023 rev:29 rq:1077319 version:6.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-base/qt6-base.changes 2023-03-17 17:03:32.897455901 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-base.new.19717/qt6-base.changes 2023-04-05 21:36:29.434854590 +0200 @@ -1,0 +2,8 @@ +Mon Apr 3 10:01:48 UTC 2023 - Christophe Marin <christo...@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 + +------------------------------------------------------------------- Old: ---- 0001-Avoid-resetting-CMAKE_AUTOMOC_MACRO_NAMES.patch qtbase-everywhere-src-6.4.3.tar.xz New: ---- qtbase-everywhere-src-6.5.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-base.spec ++++++ --- /var/tmp/diff_new_pack.diXjWv/_old 2023-04-05 21:36:30.714861896 +0200 +++ /var/tmp/diff_new_pack.diXjWv/_new 2023-04-05 21:36:30.718861919 +0200 @@ -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 short_version 6.4 +%define real_version 6.5.0 +%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 @@ 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 @@ 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 @@ 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 @@ %{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_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 @@ %{_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 @@ %{_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 ++++++ 0001-Tell-the-truth-about-private-API.patch ++++++ --- /var/tmp/diff_new_pack.diXjWv/_old 2023-04-05 21:36:30.778862261 +0200 +++ /var/tmp/diff_new_pack.diXjWv/_new 2023-04-05 21:36:30.782862284 +0200 @@ -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 <christo...@krop.fr> Date: Sun, 20 Sep 2020 09:57:22 +0200 Subject: [PATCH] Tell the truth about private API @@ -7,43 +7,24 @@ 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 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) 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) - qt_parse_all_arguments(arg "qt_internal_add_linker" "" "" "PRIVATE_HEADERS" ${ARGN}) +@@ -23,7 +23,7 @@ function(qt_internal_add_linker_version_script target) + 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}) - string(APPEND contents " @FILE:${ph}@\n") - endforeach() -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 + if(arg_PRIVATE_HEADERS) + foreach(ph ${arg_PRIVATE_HEADERS}) + string(APPEND contents " @FILE:${ph}@\n") -- -2.32.0 +2.40.0 ++++++ qtbase-everywhere-src-6.4.3.tar.xz -> qtbase-everywhere-src-6.5.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/qt6-base/qtbase-everywhere-src-6.4.3.tar.xz /work/SRC/openSUSE:Factory/.qt6-base.new.19717/qtbase-everywhere-src-6.5.0.tar.xz differ: char 26, line 1
