Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-tools for openSUSE:Factory
checked in at 2022-10-10 18:46:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-tools (Old)
and /work/SRC/openSUSE:Factory/.qt6-tools.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-tools"
Mon Oct 10 18:46:55 2022 rev:20 rq:1008920 version:6.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-tools/qt6-tools.changes 2022-10-01
17:43:48.777741764 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-tools.new.2275/qt6-tools.changes
2022-10-10 18:47:21.799231283 +0200
@@ -1,0 +2,6 @@
+Sat Oct 8 06:49:06 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Add patch to fix build with clang 15:
+ * 0001-lupdate-Fix-build-with-clang-15.patch
+
+-------------------------------------------------------------------
New:
----
0001-lupdate-Fix-build-with-clang-15.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-tools.spec ++++++
--- /var/tmp/diff_new_pack.qO9FXc/_old 2022-10-10 18:47:22.363232509 +0200
+++ /var/tmp/diff_new_pack.qO9FXc/_new 2022-10-10 18:47:22.367232518 +0200
@@ -46,6 +46,8 @@
# The 48x48 icon was removed from qttools
Source14: linguist6.png
Source99: qt6-tools-rpmlintrc
+# PATCH-FIX-UPSTREAM
+Patch0: 0001-lupdate-Fix-build-with-clang-15.patch
# clang-devel in Leap 15.3 points to clang7...
%if 0%{?suse_version} == 1500 && 0%{?sle_version} == 150300
BuildRequires: clang11-devel
++++++ 0001-lupdate-Fix-build-with-clang-15.patch ++++++
>From 6495329e6de803025e6e4e8291b648f94893551c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjo...@hazardy.de>
Date: Sat, 1 Oct 2022 07:19:52 +0200
Subject: [PATCH] lupdate: Fix build with clang 15+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The signature of InclusionDirective changed for clang 15.
Pick-to: 6.4
Change-Id: Ic259b3508088671b40f6f615524137ce8837c487
Reviewed-by: J??rg Bornemann <joerg.bornem...@qt.io>
---
src/linguist/lupdate/lupdatepreprocessoraction.cpp | 13 +++++++++++--
src/linguist/lupdate/lupdatepreprocessoraction.h | 7 ++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.cpp
b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
index abfab34e5..d963747d8 100644
--- a/src/linguist/lupdate/lupdatepreprocessoraction.cpp
+++ b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
@@ -156,14 +156,23 @@ void
LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange sourceRange,
// To list the included files
void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation /*hashLoc*/,
const clang::Token & /*includeTok*/, clang::StringRef /*fileName*/, bool
/*isAngled*/,
- clang::CharSourceRange /*filenameRange*/, const clang::FileEntry *file,
+ clang::CharSourceRange /*filenameRange*/,
+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
+ const clang::Optional<clang::FileEntryRef> file,
+#else
+ const clang::FileEntry *file,
+#endif
clang::StringRef /*searchPath*/, clang::StringRef /*relativePath*/,
const clang::Module */*imported*/, clang::SrcMgr::CharacteristicKind
/*fileType*/)
{
if (!file)
return;
- clang::StringRef fileNameRealPath = file->tryGetRealPathName();
+ clang::StringRef fileNameRealPath = file->
+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
+ getFileEntry().
+#endif
+ tryGetRealPathName();
if (!LupdatePrivate::isFileSignificant(fileNameRealPath.str()))
return;
diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.h
b/src/linguist/lupdate/lupdatepreprocessoraction.h
index b1ee468d4..3e44cee83 100644
--- a/src/linguist/lupdate/lupdatepreprocessoraction.h
+++ b/src/linguist/lupdate/lupdatepreprocessoraction.h
@@ -51,7 +51,12 @@ private:
void SourceRangeSkipped(clang::SourceRange sourceRange,
clang::SourceLocation endifLoc) override;
void InclusionDirective(clang::SourceLocation /*hashLoc*/, const
clang::Token &/*includeTok*/,
clang::StringRef /*fileName*/, bool /*isAngled*/,
- clang::CharSourceRange /*filenameRange*/, const
clang::FileEntry *file,
+ clang::CharSourceRange /*filenameRange*/,
+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
+ const clang::Optional<clang::FileEntryRef> file,
+#else
+ const clang::FileEntry *file,
+#endif
clang::StringRef /*searchPath*/, clang::StringRef
/*relativePath*/,
const clang::Module */*imported*/,
clang::SrcMgr::CharacteristicKind /*fileType*/)
override;
--
2.37.3
