From 2dfa59a423c28f33376a6fbb6e37ed93506a85ab Mon Sep 17 00:00:00 2001
From: Ella-0 <23418164+Ella-0@users.noreply.github.com>
Date: Fri, 21 May 2021 10:23:50 +0100
Subject: [PATCH] meson: bump ver and fix darwin assumption

---
 pkgs/meson/build.sh         |  5 ++++-
 pkgs/meson/not-darwin.patch | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/meson/not-darwin.patch

diff --git a/pkgs/meson/build.sh b/pkgs/meson/build.sh
index 99b8732..b33a2e6 100644
--- a/pkgs/meson/build.sh
+++ b/pkgs/meson/build.sh
@@ -1,4 +1,4 @@
-pkgver=0.56.2
+pkgver=0.58.0
 pkgname=meson
 deps=python
 bad=""
@@ -7,6 +7,9 @@ ext="doc"
 fetch() {
 	curl -L "https://github.com/mesonbuild/meson/releases/download/$pkgver/meson-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
 	tar -xf $pkgname-$pkgver.tar.gz
+	cp ../not-darwin.patch .
+	cd $pkgname-$pkgver
+	patch -p1 < ../not-darwin.patch
 }
 
 build() {
diff --git a/pkgs/meson/not-darwin.patch b/pkgs/meson/not-darwin.patch
new file mode 100644
index 0000000..78b6e4a
--- /dev/null
+++ b/pkgs/meson/not-darwin.patch
@@ -0,0 +1,19 @@
+--- a/mesonbuild/scripts/depfixer.py
++++ b/mesonbuild/scripts/depfixer.py
+@@ -16,6 +16,7 @@
+ import sys, struct
+ import shutil, subprocess
+ import typing as T
++import platform
+ 
+ from ..mesonlib import OrderedSet
+ 
+@@ -478,7 +479,7 @@
+     # https://github.com/mesonbuild/meson/pull/6612#discussion_r378581401
+     if INSTALL_NAME_TOOL is False:
+         INSTALL_NAME_TOOL = bool(shutil.which('install_name_tool'))
+-    if INSTALL_NAME_TOOL:
++    if INSTALL_NAME_TOOL and platform.system() == "Darwin":
+         if isinstance(new_rpath, bytes):
+             new_rpath = new_rpath.decode('utf8')
+         fix_darwin(fname, new_rpath, final_path, install_name_mappings)