Attachment 13455 Details for Bug 46478 – патч

[patch] патч

0001-lupdate-fixed-compilation-error-with-clang-16.patch (text/plain), 3.72 KB, created by Alexey Sheplyakov on 2023-06-12 12:49:09 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Sheplyakov

Created: 2023-06-12 12:49:09 MSK

Size: 3.72 KB

patch

obsolete

>From aee6e12cff2efa0202169b362e9aaf0cd9d25e2c Mon Sep 17 00:00:00 2001
>From: Alexey Sheplyakov <asheplyakov@basealt.ru>
>Date: Mon, 12 Jun 2023 09:04:28 +0000
>Subject: [PATCH] lupdate: fixed compilation error with clang 16
>
>Apparently the declaration of clang::PPCallbacks::InclusionDirective
>method has changed again in clang 16.
>
>In file included from /usr/src/RPM/BUILD/qttools-everywhere-src-6.4.2/src/linguist/lupdate/lupdatepreprocessoraction.cpp:4:
>/usr/src/RPM/BUILD/qttools-everywhere-src-6.4.2/src/linguist/lupdate/lupdatepreprocessoraction.h:52:10: error: 'void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation, const clang::Token&, llvm::StringRef, bool, clang::CharSourceRange, llvm::Optional<clang::FileEntryRef>, llvm::StringRef, llvm::StringRef, const clang::Module*, clang::SrcMgr::CharacteristicKind)' marked 'override', but does not override
>   52 |     void InclusionDirective(clang::SourceLocation /*hashLoc*/, const clang::Token &/*includeTok*/,
>      |          ^~~~~~~~~~~~~~~~~~
>---
> alt-clang16.patch | 30 ++++++++++++++++++++++++++++++
> qttools.spec      |  2 ++
> 2 files changed, 32 insertions(+)
> create mode 100644 alt-clang16.patch
>
>diff --git a/alt-clang16.patch b/alt-clang16.patch
>new file mode 100644
>index 0000000..2954271
>--- /dev/null
>+++ b/alt-clang16.patch
>@@ -0,0 +1,30 @@
>+diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.cpp b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
>+index 9733f20..f3e24af 100644
>+--- a/src/linguist/lupdate/lupdatepreprocessoraction.cpp
>++++ b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
>+@@ -157,7 +157,9 @@ void LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange sourceRange,
>+ 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/src/linguist/lupdate/lupdatepreprocessoraction.h b/src/linguist/lupdate/lupdatepreprocessoraction.h
>+index 3e44cee..be67798 100644
>+--- a/src/linguist/lupdate/lupdatepreprocessoraction.h
>++++ b/src/linguist/lupdate/lupdatepreprocessoraction.h
>+@@ -52,7 +52,9 @@ private:
>+     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,
>diff --git a/qttools.spec b/qttools.spec
>index 86145bb..9e16873 100644
>--- a/qttools.spec
>+++ b/qttools.spec
>@@ -24,6 +24,7 @@ Requires: %name-common = %EVR
> 
> Source: %qt_module-everywhere-src-%version.tar
> Patch1: alt-run-qttools-with-qt6-suffix.patch
>+Patch2: alt-clang16.patch
> 
> Source20: assistant.desktop
> Source21: designer.desktop
>@@ -149,6 +150,7 @@ Requires: libqt6-core = %_qt6_version
> %prep
> %setup -n %qt_module-everywhere-src-%version
> #%patch1 -p1
>+%patch2 -p1
> 
> %build
> %define qdoc_found %{expand:%%(if [ -e %_qt6_bindir/qdoc ]; then echo 1; else echo 0; fi)}
>-- 
>2.33.3
>

Actions: View | Diff

Attachments on bug 46478: 13455