diff --git a/meta-oe/recipes-devtools/castxml/castxml/0001-Port-to-LLVM-Clang-23.patch b/meta-oe/recipes-devtools/castxml/castxml/0001-Port-to-LLVM-Clang-23.patch
deleted file mode 100644
index 9caabdcf2a..0000000000
--- a/meta-oe/recipes-devtools/castxml/castxml/0001-Port-to-LLVM-Clang-23.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 315fbacc4e4b9c7ea21d25ad489a90b73a526326 Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king@kitware.com>
-Date: Wed, 10 Jun 2026 10:55:10 -0400
-Subject: [PATCH] Port to LLVM/Clang Git main as of 2026-10-10 (6f47b6de08)
-
-Upstream-Status: Backport [https://github.com/CastXML/CastXML/commit/315fbacc4e4b]
-
-Signed-off-by: Sunil Dora <sunilkumar.dora@windriver.com>
----
- src/Output.cxx | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/Output.cxx b/src/Output.cxx
-index bb986d4b..9f722efd 100644
---- a/src/Output.cxx
-+++ b/src/Output.cxx
-@@ -119,6 +119,10 @@ clang::NestedNameSpecifier const& deref(NestedNameSpecifier const& nns)
- #  define isPureVirtual isPure
- #endif
- 
-+#if LLVM_VERSION_MAJOR < 23
-+#  define getRawCommentNoCache getRawCommentForDeclNoCache
-+#endif
-+
- class ASTVisitorBase
- {
- protected:
-@@ -1973,7 +1977,7 @@ void ASTVisitor::PrintCommentAttribute(clang::Decl const* d,
-   if (!this->Opts.CastXml) {
-     return;
-   }
--  if (clang::RawComment const* rc = this->CTX.getRawCommentForDeclNoCache(d)) {
-+  if (clang::RawComment const* rc = this->CTX.getRawCommentNoCache(d)) {
-     unsigned int index = ++this->CommentCount;
-     CommentEntry e = { index, rc, dn };
-     this->CommentQueue.push(e);
diff --git a/meta-oe/recipes-devtools/castxml/castxml_0.7.0.bb b/meta-oe/recipes-devtools/castxml/castxml_0.8.0.bb
similarity index 69%
rename from meta-oe/recipes-devtools/castxml/castxml_0.7.0.bb
rename to meta-oe/recipes-devtools/castxml/castxml_0.8.0.bb
index d052f56320..8fec771e7d 100644
--- a/meta-oe/recipes-devtools/castxml/castxml_0.7.0.bb
+++ b/meta-oe/recipes-devtools/castxml/castxml_0.8.0.bb
@@ -2,10 +2,8 @@ SUMMARY = "C-family abstract syntax tree XML output tool."
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "2d52b47cfd88b703d3247f77bb7c3ad7372bc9cb"
-SRC_URI = "git://github.com/CastXML/CastXML;protocol=https;branch=master;tag=v${PV} \
-           file://0001-Port-to-LLVM-Clang-23.patch \
-           "
+SRCREV = "6ebb3df6e88ae562ca54aa09c8eb5ef679b5f2cb"
+SRC_URI = "git://github.com/CastXML/CastXML;protocol=https;branch=master;tag=v${PV}"
 
 DEPENDS = "clang"