From 44ab067d92d89cc081ef1c1446bbc61826c8ee13806398db07b4413dc0cba87f Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 12 Mar 2024 11:23:03 +0000
Subject: [PATCH] Accepting request 1157064 from home:aaronpuchert:llvm-next

- Add get_llvm_tool_names-llvm18.patch to accept LLVM 18.1.

OBS-URL: https://build.opensuse.org/request/show/1157064
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=279
---
 get_llvm_tool_names-llvm18.patch | 14 ++++++++++++++
 meson.changes                    |  5 +++++
 meson.spec                       |  5 ++++-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 get_llvm_tool_names-llvm18.patch

diff --git a/get_llvm_tool_names-llvm18.patch b/get_llvm_tool_names-llvm18.patch
new file mode 100644
index 0000000..0d3fbf7
--- /dev/null
+++ b/get_llvm_tool_names-llvm18.patch
@@ -0,0 +1,14 @@
+Similar to commit 67afddbf431140c1ee064bf79a2fa5a95575488e with title
+"environment: Add LLVM 18 support to get_llvm_tool_names()", but with
+minor version following the upstream versioning change.
+
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -188,6 +188,7 @@ def get_llvm_tool_names(tool: str) -> T.List[str]:
+     # unless it becomes a stable release.
+     suffixes = [
+         '', # base (no suffix)
++        '-18.1',  '181',
+         '-17',  '17',
+         '-16',  '16',
+         '-15',  '15',
diff --git a/meson.changes b/meson.changes
index 2625fb7..b22e99d 100644
--- a/meson.changes
+++ b/meson.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 11 22:48:56 UTC 2024 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Add get_llvm_tool_names-llvm18.patch to accept LLVM 18.1.
+
 -------------------------------------------------------------------
 Wed Feb 14 07:42:56 UTC 2024 - ecsos <ecsos@opensuse.org>
 
diff --git a/meson.spec b/meson.spec
index aa37319..cfba907 100644
--- a/meson.spec
+++ b/meson.spec
@@ -50,6 +50,8 @@ Patch0:         meson-test-installed-bin.patch
 Patch1:         extend-test-timeout-on-qemu-builds.patch
 # PATCH-FIX-OPENSUSE meson-distutils.patch -- meson is ring0 and therefor setuptools is not available
 Patch2:         meson-distutils.patch
+# PATCH-FIX-UPSTREAM get_llvm_tool_names-llvm18.patch -- Accept LLVM 18.1.
+Patch3:         get_llvm_tool_names-llvm18.patch
 
 BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  fdupes
@@ -69,7 +71,7 @@ ExclusiveArch:  x86_64
 BuildRequires:  %{python_module devel}
 BuildRequires:  bison
 %if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
-BuildRequires:  clang17 >= 15
+BuildRequires:  clang17
 %else
 BuildRequires:  clang >= 15
 %endif
@@ -185,6 +187,7 @@ Vim/NeoVim.
 %if !%{with setuptools}
 %patch -P 2 -p1
 %endif
+%patch -P 3 -p1
 
 %if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
 # AddressSanitizer fails here because of ulimit.