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-03-17 17:02:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-base (Old) and /work/SRC/openSUSE:Factory/.qt6-base.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-base" Fri Mar 17 17:02:59 2023 rev:28 rq:1072394 version:6.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-base/qt6-base.changes 2023-02-09 16:22:40.910550646 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-base.new.31432/qt6-base.changes 2023-03-17 17:03:32.897455901 +0100 @@ -1,0 +2,10 @@ +Thu Mar 16 09:59:57 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 6.4.3: + * https://www.qt.io/blog/qt-6.4.3-released +- Drop patch, merged upstream: + * CVE-2023-24607-qtbase-6.4.diff +- Add patch to silence moc warnings: + * 0001-Avoid-resetting-CMAKE_AUTOMOC_MACRO_NAMES.patch + +------------------------------------------------------------------- Old: ---- CVE-2023-24607-qtbase-6.4.diff qtbase-everywhere-src-6.4.2.tar.xz New: ---- 0001-Avoid-resetting-CMAKE_AUTOMOC_MACRO_NAMES.patch qtbase-everywhere-src-6.4.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-base.spec ++++++ --- /var/tmp/diff_new_pack.vo8Ms2/_old 2023-03-17 17:03:34.657465122 +0100 +++ /var/tmp/diff_new_pack.vo8Ms2/_new 2023-03-17 17:03:34.661465143 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.4.2 +%define real_version 6.4.3 %define short_version 6.4 %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.2 +Version: 6.4.3 Release: 0 Summary: Qt 6 core components (Core, Gui, Widgets, Network...) # Legal: qtpaths is BSD-3-Clause @@ -39,7 +39,7 @@ 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: CVE-2023-24607-qtbase-6.4.diff +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 @@ -809,30 +809,18 @@ # This is only for Apple platforms and has a python2 dep rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit -%post -n libQt6Concurrent6 -p /sbin/ldconfig -%post -n libQt6Core6 -p /sbin/ldconfig -%post -n libQt6DBus6 -p /sbin/ldconfig -%post -n libQt6Gui6 -p /sbin/ldconfig -%post -n libQt6Network6 -p /sbin/ldconfig -%post -n libQt6OpenGL6 -p /sbin/ldconfig -%post -n libQt6OpenGLWidgets6 -p /sbin/ldconfig -%post -n libQt6PrintSupport6 -p /sbin/ldconfig -%post -n libQt6Sql6 -p /sbin/ldconfig -%post -n libQt6Test6 -p /sbin/ldconfig -%post -n libQt6Widgets6 -p /sbin/ldconfig -%post -n libQt6Xml6 -p /sbin/ldconfig -%postun -n libQt6Concurrent6 -p /sbin/ldconfig -%postun -n libQt6Core6 -p /sbin/ldconfig -%postun -n libQt6DBus6 -p /sbin/ldconfig -%postun -n libQt6Gui6 -p /sbin/ldconfig -%postun -n libQt6Network6 -p /sbin/ldconfig -%postun -n libQt6OpenGL6 -p /sbin/ldconfig -%postun -n libQt6OpenGLWidgets6 -p /sbin/ldconfig -%postun -n libQt6PrintSupport6 -p /sbin/ldconfig -%postun -n libQt6Sql6 -p /sbin/ldconfig -%postun -n libQt6Test6 -p /sbin/ldconfig -%postun -n libQt6Widgets6 -p /sbin/ldconfig -%postun -n libQt6Xml6 -p /sbin/ldconfig +%ldconfig_scriptlets -n libQt6Concurrent6 +%ldconfig_scriptlets -n libQt6Core6 +%ldconfig_scriptlets -n libQt6DBus6 +%ldconfig_scriptlets -n libQt6Gui6 +%ldconfig_scriptlets -n libQt6Network6 +%ldconfig_scriptlets -n libQt6OpenGL6 +%ldconfig_scriptlets -n libQt6OpenGLWidgets6 +%ldconfig_scriptlets -n libQt6PrintSupport6 +%ldconfig_scriptlets -n libQt6Sql6 +%ldconfig_scriptlets -n libQt6Test6 +%ldconfig_scriptlets -n libQt6Widgets6 +%ldconfig_scriptlets -n libQt6Xml6 %files devel %doc meta_package ++++++ 0001-Avoid-resetting-CMAKE_AUTOMOC_MACRO_NAMES.patch ++++++ >From 9bcb5cbfb07052ffd24c4a419bf20bd63a842591 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol <amir.ab...@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.ede...@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 ++++++ qtbase-everywhere-src-6.4.2.tar.xz -> qtbase-everywhere-src-6.4.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/qt6-base/qtbase-everywhere-src-6.4.2.tar.xz /work/SRC/openSUSE:Factory/.qt6-base.new.31432/qtbase-everywhere-src-6.4.3.tar.xz differ: char 26, line 1
