Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Apr 2023 21:51:51 GMT
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 2f310336b632 - main - devel/qt6-tools: fix build with clang 16
Message-ID:  <202304182151.33ILppL4060893@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2f310336b63295c34d536b823cc24bbbb3792ef0

commit 2f310336b63295c34d536b823cc24bbbb3792ef0
Author:     Eric Camachat <eric@camachat.org>
AuthorDate: 2023-04-18 15:35:13 +0000
Commit:     Adriaan de Groot <adridg@FreeBSD.org>
CommitDate: 2023-04-18 21:51:41 +0000

    devel/qt6-tools: fix build with clang 16
    
    PR:              270450
---
 ...patch-src_linguist_lupdate_lupdatepreprocessoraction.cpp | 13 +++++++++++++
 .../patch-src_linguist_lupdate_lupdatepreprocessoraction.h  | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/devel/qt6-tools/files/patch-src_linguist_lupdate_lupdatepreprocessoraction.cpp b/devel/qt6-tools/files/patch-src_linguist_lupdate_lupdatepreprocessoraction.cpp
new file mode 100644
index 000000000000..12a42edec3f4
--- /dev/null
+++ 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
new file mode 100644
index 000000000000..28caab3d3bda
--- /dev/null
+++ 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,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304182151.33ILppL4060893>