From 47f16e4b747d6889d04565ae084bb8b1064da569 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 20 Sep 2024 22:13:39 +0200
Subject: [PATCH] meson: 1.5.1 -> 1.5.2

---
 pkgs/by-name/me/meson/006-disable-bitcode.patch | 12 +++++++++---
 pkgs/by-name/me/meson/package.nix               |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/me/meson/006-disable-bitcode.patch b/pkgs/by-name/me/meson/006-disable-bitcode.patch
index a72997c10439..d4aa6a271aa6 100644
--- a/pkgs/by-name/me/meson/006-disable-bitcode.patch
+++ b/pkgs/by-name/me/meson/006-disable-bitcode.patch
@@ -1,6 +1,8 @@
+diff --git a/mesonbuild/compilers/mixins/clang.py b/mesonbuild/compilers/mixins/clang.py
+index d99dc3abf..6b8f75165 100644
 --- a/mesonbuild/compilers/mixins/clang.py
 +++ b/mesonbuild/compilers/mixins/clang.py
-@@ -56,10 +56,6 @@ class ClangCompiler(GnuLikeCompiler):
+@@ -54,11 +54,7 @@ class ClangCompiler(GnuLikeCompiler):
              {OptionKey('b_colorout'), OptionKey('b_lto_threads'), OptionKey('b_lto_mode'), OptionKey('b_thinlto_cache'),
               OptionKey('b_thinlto_cache_dir')})
  
@@ -8,12 +10,16 @@
 -        # linkers don't have base_options.
 -        if isinstance(self.linker, AppleDynamicLinker):
 -            self.base_options.add(OptionKey('b_bitcode'))
+-        elif isinstance(self.linker, MSVCDynamicLinker):
++        if isinstance(self.linker, MSVCDynamicLinker):
+             self.base_options.add(OptionKey('b_vscrt'))
          # All Clang backends can also do LLVM IR
          self.can_compile_suffixes.add('ll')
- 
+diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
+index 4eec82edd..6db5c6af0 100644
 --- a/mesonbuild/linkers/linkers.py
 +++ b/mesonbuild/linkers/linkers.py
-@@ -785,7 +785,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
+@@ -796,7 +796,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
          return self._apply_prefix('-headerpad_max_install_names')
  
      def bitcode_args(self) -> T.List[str]:
diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index d817c63708be..4dc2b840b681 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -21,13 +21,13 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "mesonbuild";
     repo = "meson";
     rev = "refs/tags/${version}";
-    hash = "sha256-BqsEO1a93a8d7/UH232buSPBt+WSNJbw1DGYA2nm9rs=";
+    hash = "sha256-cesMepnD3fHX2CwnSQ3c5TE9kPSa0FkCVVVZDgXwo8M=";
   };
 
   patches = [