Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt-creator for openSUSE:Factory checked in at 2023-08-28 17:13:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt-creator (Old) and /work/SRC/openSUSE:Factory/.qt-creator.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt-creator" Mon Aug 28 17:13:29 2023 rev:25 rq:1105930 version:11.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt-creator/qt-creator.changes 2023-08-17 19:44:40.894916868 +0200 +++ /work/SRC/openSUSE:Factory/.qt-creator.new.1766/qt-creator.changes 2023-08-28 17:13:35.677159047 +0200 @@ -1,0 +2,6 @@ +Fri Aug 25 15:27:38 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Add upstream change to fix detection of yaml-cpp 0.8: + * 0001-ClangTools-Add-support-for-yaml-cpp-0.8.patch + +------------------------------------------------------------------- New: ---- 0001-ClangTools-Add-support-for-yaml-cpp-0.8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-creator.spec ++++++ --- /var/tmp/diff_new_pack.Kcj2bM/_old 2023-08-28 17:13:37.757233742 +0200 +++ /var/tmp/diff_new_pack.Kcj2bM/_new 2023-08-28 17:13:37.761233885 +0200 @@ -63,6 +63,7 @@ Source: https://download.qt.io/official_releases/qtcreator/%{short_version}/%{real_version}%{tar_suffix}/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source1: qt-creator-rpmlintrc # Patches 0-10 are upstream changes +Patch0: 0001-ClangTools-Add-support-for-yaml-cpp-0.8.patch # Patches 11-20 are openSUSE changes Patch11: fix-application-output.patch Patch12: 0001-Disable-some-plugins.patch ++++++ 0001-ClangTools-Add-support-for-yaml-cpp-0.8.patch ++++++ >From 170f9acfb41704b68e2ba98690fd6d5e98addd85 Mon Sep 17 00:00:00 2001 From: Eike Ziller <eike.zil...@qt.io> Date: Thu, 24 Aug 2023 13:41:33 +0200 Subject: [PATCH] ClangTools: Add support for yaml-cpp 0.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They renamed their target from `yaml-cpp` to `yaml-cpp::yaml-cpp` Still support < 0.8 though. Fixes: QTCREATORBUG-29537 Change-Id: Iafa6e75998f0120610542b4c744b205aee3392a3 Reviewed-by: Qt CI Bot <qt_ci_...@qt-project.org> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezme...@gmail.com> Reviewed-by: David Schulz <david.sch...@qt.io> --- cmake/Findyaml-cpp.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cmake/Findyaml-cpp.cmake b/cmake/Findyaml-cpp.cmake index e7b3d361d3..0b0e81418a 100644 --- a/cmake/Findyaml-cpp.cmake +++ b/cmake/Findyaml-cpp.cmake @@ -15,7 +15,15 @@ if (yaml-cpp_FOUND) unset(yaml_cpp_include_dir CACHE) find_path(yaml_cpp_include_dir yaml-cpp/yaml.h) endif() - set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}") + if(TARGET yaml-cpp::yaml-cpp) + # yaml-cpp >= 0.8 + set_property(TARGET yaml-cpp::yaml-cpp PROPERTY IMPORTED_GLOBAL TRUE) + add_library(yaml-cpp ALIAS yaml-cpp::yaml-cpp) + set(yaml-cpp_TARGET yaml-cpp::yaml-cpp) + else() + set(yaml-cpp_TARGET yaml-cpp) + endif() + set_target_properties(${yaml-cpp_TARGET} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}") else() if(TARGET yaml-cpp) return() -- 2.41.0
