rpm/qt6-tools
SHA256
1
0
Fork 0
forked from pool/qt6-tools
Code Pull Requests Activity

Fix build with clang 15

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-tools?expand=0&rev=28
This commit is contained in:
Christophe Giboudeaux 2022-10-08 06:54:47 +00:00 committed by Git OBS Bridge
parent 0c22deed5d
commit 01ca198b08
3 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
0001-lupdate-Fix-build-with-clang-15.patch Normal file
View File

@ -0,0 +1,69 @@
From 6495329e6de803025e6e4e8291b648f94893551c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern@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.bornemann@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

6
qt6-tools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Oct 8 06:49:06 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Add patch to fix build with clang 15:
* 0001-lupdate-Fix-build-with-clang-15.patch
-------------------------------------------------------------------
Thu Sep 29 10:36:06 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

2
qt6-tools.spec
View File

@ -46,6 +46,8 @@ Source13: org.qt.assistant6.desktop
# 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