From 9073a0cb8b2f419785a60969e11e96733f29b200 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 16 Apr 2020 04:42:45 +0200
Subject: [PATCH] =?UTF-8?q?meson:=200.53.2=20=E2=86=92=200.54.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://mesonbuild.com/Release-notes-for-0-54-0.html
---
 .../meson/allow-dirs-outside-of-prefix.patch  | 30 ++++++++-----------
 .../tools/build-managers/meson/default.nix    |  4 +--
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
index 591927c1528..bd81efd5208 100644
--- a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
+++ b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
@@ -1,25 +1,19 @@
 --- a/mesonbuild/coredata.py
 +++ b/mesonbuild/coredata.py
-@@ -375,18 +375,13 @@
-         '''
-         if option.endswith('dir') and os.path.isabs(value) and \
+@@ -483,7 +483,6 @@ class CoreData:
+             return value
+         if option.endswith('dir') and value.is_absolute() and \
             option not in builtin_dir_noprefix_options:
 -            # Value must be a subdir of the prefix
              # commonpath will always return a path in the native format, so we
              # must use pathlib.PurePath to do the same conversion before
              # comparing.
--            if os.path.commonpath([value, prefix]) != str(PurePath(prefix)):
--                m = 'The value of the {!r} option is {!r} which must be a ' \
--                    'subdir of the prefix {!r}.\nNote that if you pass a ' \
--                    'relative path, it is assumed to be a subdir of prefix.'
--                raise MesonException(m.format(option, value, prefix))
--            # Convert path to be relative to prefix
--            skip = len(prefix) + 1
--            value = value[skip:]
-+            if os.path.commonpath([value, prefix]) == str(PurePath(prefix)):
-+                # Convert path to be relative to prefix
-+                skip = len(prefix) + 1
-+                value = value[skip:]
-         return value
- 
-     def init_builtins(self):
+@@ -495,7 +494,7 @@ class CoreData:
+             try:
+                 value = value.relative_to(prefix)
+             except ValueError:
+-                raise MesonException(msg.format(option, value, prefix))
++                pass
+             if '..' in str(value):
+                 raise MesonException(msg.format(option, value, prefix))
+         return value.as_posix()
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 3ac8e641eb6..15b0a5ffcd0 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -19,11 +19,11 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "meson";
-  version = "0.53.2";
+  version = "0.54.0";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8=";
+    sha256 = "3eVybXeBEqy9Sme7NjOrLuddM9HoeaYoOntKRMM2PCc=";
   };
 
   postFixup = ''