devel/qt6-tools: fix build with clang 16

PR: 270450
freebsd · Apr 18, 2023 · 2f31033 · 2f31033
1 parent b10f16b
commit 2f31033
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/devel/qt6-tools/files/patch-src_linguist_lupdate_lupdatepreprocessoraction.cpp b/devel/qt6-tools/files/patch-src_linguist_lupdate_lupdatepreprocessoraction.cpp
@@ -0,0 +1,13 @@
+--- src/linguist/lupdate/lupdatepreprocessoraction.cpp.orig	2022-12-12 17:11:50 UTC
++++ src/linguist/lupdate/lupdatepreprocessoraction.cpp
+@@ -157,7 +157,9 @@ void LupdatePPCallbacks::SourceRangeSkipped(clang::Sou
+ void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation /*hashLoc*/,
+     const clang::Token & /*includeTok*/, clang::StringRef /*fileName*/, bool /*isAngled*/,
+     clang::CharSourceRange /*filenameRange*/,
+-#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
++#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(16,0,0))
++    clang::OptionalFileEntryRef file,
++#elif (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
+     const clang::Optional<clang::FileEntryRef> file,
+ #else
+     const clang::FileEntry *file,
diff --git a/devel/qt6-tools/files/patch-src_linguist_lupdate_lupdatepreprocessoraction.h b/devel/qt6-tools/files/patch-src_linguist_lupdate_lupdatepreprocessoraction.h
@@ -0,0 +1,13 @@
+--- src/linguist/lupdate/lupdatepreprocessoraction.h.orig	2022-12-12 17:11:50 UTC
++++ src/linguist/lupdate/lupdatepreprocessoraction.h
+@@ -52,7 +52,9 @@ class LupdatePPCallbacks : public clang::PPCallbacks (
+     void InclusionDirective(clang::SourceLocation /*hashLoc*/, const clang::Token &/*includeTok*/,
+                             clang::StringRef /*fileName*/, bool /*isAngled*/,
+                             clang::CharSourceRange /*filenameRange*/,
+-#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
++#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(16,0,0))
++                            clang::OptionalFileEntryRef file,
++#elif (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
+                             const clang::Optional<clang::FileEntryRef> file,
+ #else
+                             const clang::FileEntry *file,