From 6a43e53066d009a1aa3db5d949a56713c9080a3b Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: May 25 2021 06:38:53 +0000
Subject: Backport upstream patch to fix environment variable regression


This is needed to fix build of nautilus, but it affects some other
projects as well.

---

diff --git a/8761.patch b/8761.patch
new file mode 100644
index 0000000..0b9d8e0
--- /dev/null
+++ b/8761.patch
@@ -0,0 +1,58 @@
+From 96e8e019303abe5626e737867e1249ab6eb53dff Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xavier.claessens@collabora.com>
+Date: Wed, 12 May 2021 16:16:41 -0400
+Subject: [PATCH] interpreter: flatten environment() initial values
+
+Turns out listify() flattens by default, but stringlistify() cannot
+flatten... How do I realize this only now?
+
+Fixes: #8727
+---
+ mesonbuild/interpreter/interpreterobjects.py | 4 +++-
+ test cases/common/41 test args/meson.build   | 2 +-
+ test cases/common/41 test args/tester.py     | 4 ++++
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py
+index 7d43752cfcf..10e681aeb46 100644
+--- a/mesonbuild/interpreter/interpreterobjects.py
++++ b/mesonbuild/interpreter/interpreterobjects.py
+@@ -165,7 +165,9 @@ def __init__(self, initial_values=None, subproject: str = ''):
+             for k, v in initial_values.items():
+                 self.set_method([k, v], {})
+         elif initial_values is not None:
+-            for e in mesonlib.stringlistify(initial_values):
++            for e in mesonlib.listify(initial_values):
++                if not isinstance(e, str):
++                    raise InterpreterException('Env var definition must be a list of strings.')
+                 if '=' not in e:
+                     raise InterpreterException('Env var definition must be of type key=val.')
+                 (k, val) = e.split('=', 1)
+diff --git a/test cases/common/41 test args/meson.build b/test cases/common/41 test args/meson.build
+index 81d34915abe..b21f1ad00b1 100644
+--- a/test cases/common/41 test args/meson.build	
++++ b/test cases/common/41 test args/meson.build	
+@@ -23,7 +23,7 @@ test('environment variables 2', e3, env : env2)
+ env_array = ['MESONTESTING=picklerror']
+ testfile = files('testfile.txt')
+ testerpy = find_program('tester.py')
+-test('file arg', testerpy, args : testfile, env : env_array)
++test('file arg', testerpy, args : testfile, env : [env_array, 'TEST_LIST_FLATTENING=1'])
+ 
+ copy = find_program('copyfile.py')
+ tester = executable('tester', 'tester.c')
+diff --git a/test cases/common/41 test args/tester.py b/test cases/common/41 test args/tester.py
+index 0b4010ab909..b5884cc61a2 100755
+--- a/test cases/common/41 test args/tester.py	
++++ b/test cases/common/41 test args/tester.py	
+@@ -1,6 +1,10 @@
+ #!/usr/bin/env python3
+ 
+ import sys
++import os
++
++assert os.environ['MESONTESTING'] == 'picklerror'
++assert os.environ['TEST_LIST_FLATTENING'] == '1'
+ 
+ with open(sys.argv[1]) as f:
+     if f.read() != 'contents\n':
diff --git a/meson.spec b/meson.spec
index 92361e7..28974a5 100644
--- a/meson.spec
+++ b/meson.spec
@@ -7,7 +7,7 @@
 
 Name:           meson
 Version:        0.58.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        High productivity build system
 
 License:        ASL 2.0
@@ -18,6 +18,9 @@ Source:         https://github.com/mesonbuild/meson/releases/download/%{version_
 # https://github.com/mesonbuild/meson/pull/8757
 Patch0:         8757.patch
 
+# https://github.com/mesonbuild/meson/pull/8761
+Patch1:         8761.patch
+
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
@@ -116,6 +119,9 @@ export MESON_PRINT_TEST_OUTPUT=1
 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy
 
 %changelog
+* Tue May 25 2021 Ondrej Holy <oholy@redhat.com> - 0.58.0-3
+- Backport upstream patch to fix environment variable regression
+
 * Thu May 20 2021 Kalev Lember <klember@redhat.com> - 0.58.0-2
 - Backport upstream patch to fix gtkdoc generation