From 3275b12e7bc83984cac3e765af4e7c85ab02de65 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 23 Nov 2022 16:15:59 +0100 Subject: [PATCH] Remove unneeded patch --- lupdate-clang-15.patch | 67 ------------------------------------------ qt6-qttools.spec | 1 - 2 files changed, 68 deletions(-) delete mode 100644 lupdate-clang-15.patch diff --git a/lupdate-clang-15.patch b/lupdate-clang-15.patch deleted file mode 100644 index 48e5d3f..0000000 --- a/lupdate-clang-15.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 01cae372619369d1a5a04f4d0f87817011029b78 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= -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. - -Change-Id: Ic259b3508088671b40f6f615524137ce8837c487 -Reviewed-by: Jörg Bornemann -(cherry picked from commit 6495329e6de803025e6e4e8291b648f94893551c) -Reviewed-by: Qt Cherry-pick Bot ---- - 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 d7446c364..9733f20d2 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 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 @@ class LupdatePPCallbacks : public clang::PPCallbacks - 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 file, -+#else -+ const clang::FileEntry *file, -+#endif - clang::StringRef /*searchPath*/, clang::StringRef /*relativePath*/, - const clang::Module */*imported*/, - clang::SrcMgr::CharacteristicKind /*fileType*/) override; diff --git a/qt6-qttools.spec b/qt6-qttools.spec index 84fe648..bfa47c9 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -32,7 +32,6 @@ Patch1: qttools-run-qttools-with-qt6-suffix.patch Patch2: qttools-add-libatomic.patch ## upstream patches -Patch50: lupdate-clang-15.patch Source20: assistant.desktop Source21: designer.desktop