From dd80a71d8186fd4d7df326db31003206c5cfad7c015fbdf5d9201e18b67e9e0e Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Thu, 21 Mar 2024 18:21:03 +0000 Subject: [PATCH] Accepting request 1160379 from home:krop:branches:devel:libraries:c_c++ - Add upstream change: * 0001-Port-to-LLVM-Clang-Git-release-18.x-as-of-2024-02-05.patch OBS-URL: https://build.opensuse.org/request/show/1160379 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/CastXML?expand=0&rev=31 --- ...ng-Git-release-18.x-as-of-2024-02-05.patch | 56 +++++++++++++++++++ CastXML.changes | 6 ++ CastXML.spec | 2 + 3 files changed, 64 insertions(+) create mode 100644 0001-Port-to-LLVM-Clang-Git-release-18.x-as-of-2024-02-05.patch diff --git a/0001-Port-to-LLVM-Clang-Git-release-18.x-as-of-2024-02-05.patch b/0001-Port-to-LLVM-Clang-Git-release-18.x-as-of-2024-02-05.patch new file mode 100644 index 0000000..7846941 --- /dev/null +++ b/0001-Port-to-LLVM-Clang-Git-release-18.x-as-of-2024-02-05.patch @@ -0,0 +1,56 @@ +From 5e0db6780b264baba5639ec11c5823787661c318 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Mon, 5 Feb 2024 11:31:17 -0500 +Subject: [PATCH] Port to LLVM/Clang Git release/18.x as of 2024-02-05 + (900e7cbfdee) + +`isPure` was renamed to `isPureVirtual`. +--- + src/Output.cxx | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/Output.cxx b/src/Output.cxx +index 6086c04..5d15caa 100644 +--- a/src/Output.cxx ++++ b/src/Output.cxx +@@ -93,6 +93,10 @@ using OptionalFileEntryRef = clang::FileEntry const*; + #include + #include + ++#if LLVM_VERSION_MAJOR < 18 ++# define isPureVirtual isPure ++#endif ++ + class ASTVisitorBase + { + protected: +@@ -2282,7 +2286,7 @@ void ASTVisitor::OutputCXXMethodDecl(clang::CXXMethodDecl const* d, + if (d->isVirtual()) { + flags |= FH_Virtual; + } +- if (d->isPure()) { ++ if (d->isPureVirtual()) { + flags |= FH_Pure; + } + if (d->isOverloadedOperator()) { +@@ -2312,7 +2316,7 @@ void ASTVisitor::OutputCXXConversionDecl(clang::CXXConversionDecl const* d, + if (d->isVirtual()) { + flags |= FH_Virtual; + } +- if (d->isPure()) { ++ if (d->isPureVirtual()) { + flags |= FH_Pure; + } + this->OutputFunctionHelper(d, dn, "Converter", flags); +@@ -2348,7 +2352,7 @@ void ASTVisitor::OutputCXXDestructorDecl(clang::CXXDestructorDecl const* d, + if (d->isVirtual()) { + flags |= FH_Virtual; + } +- if (d->isPure()) { ++ if (d->isPureVirtual()) { + flags |= FH_Pure; + } + this->OutputFunctionHelper(d, dn, "Destructor", flags, +-- +2.44.0 + diff --git a/CastXML.changes b/CastXML.changes index 79db1a4..e11752f 100644 --- a/CastXML.changes +++ b/CastXML.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 21 14:21:26 UTC 2024 - Christophe Marin + +- Add upstream change: + * 0001-Port-to-LLVM-Clang-Git-release-18.x-as-of-2024-02-05.patch + ------------------------------------------------------------------- Mon Jan 22 19:41:46 UTC 2024 - Atri Bhattacharya diff --git a/CastXML.spec b/CastXML.spec index 25feff6..2cfca46 100644 --- a/CastXML.spec +++ b/CastXML.spec @@ -24,6 +24,8 @@ License: Apache-2.0 URL: https://github.com/CastXML/CastXML Source0: https://github.com/CastXML/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM +Patch0: 0001-Port-to-LLVM-Clang-Git-release-18.x-as-of-2024-02-05.patch BuildRequires: clang-devel BuildRequires: cmake BuildRequires: fdupes