CVS commit: pkgsrc/devel/meson

["Dan Cirnat" <cirnatdan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cirnatdan
Date:           Tue Jun  1 05:55:46 UTC 2021

Modified Files:
        pkgsrc/devel/meson: Makefile distinfo
Added Files:
        pkgsrc/devel/meson/patches:
            patch-mesonbuild_interpreter_interpreterobjects.py

Log Message:
meson: interpreter: flatten environment() initial values

Import upstream patch for flattening lists. Fixes build of nautilus
https://github.com/mesonbuild/meson/pull/8761/files


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_interpreter_interpreterobjects.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/meson/Makefile
diff -u pkgsrc/devel/meson/Makefile:1.25 pkgsrc/devel/meson/Makefile:1.26
--- pkgsrc/devel/meson/Makefile:1.25    Tue May  4 18:54:29 2021
+++ pkgsrc/devel/meson/Makefile Tue Jun  1 05:55:46 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2021/05/04 18:54:29 adam Exp $
+# $NetBSD: Makefile,v 1.26 2021/06/01 05:55:46 cirnatdan Exp $
 
 DISTNAME=      meson-0.58.0
+PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.22 pkgsrc/devel/meson/distinfo:1.23
--- pkgsrc/devel/meson/distinfo:1.22    Tue May  4 18:54:29 2021
+++ pkgsrc/devel/meson/distinfo Tue Jun  1 05:55:46 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2021/05/04 18:54:29 adam Exp $
+$NetBSD: distinfo,v 1.23 2021/06/01 05:55:46 cirnatdan Exp $
 
 SHA1 (meson-0.58.0.tar.gz) = 42e7e911460a925896619a13db67bab948b968fd
 RMD160 (meson-0.58.0.tar.gz) = 6457ae48866e33d0c710856fc7eb332ba538ee08
@@ -7,5 +7,6 @@ Size (meson-0.58.0.tar.gz) = 1887373 byt
 SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = cc9fe3204c7cf003d288ef5635fa7853a44a2e34
 SHA1 (patch-mesonbuild_dependencies_dev.py) = ce9b93369d771f7e24208923b58af769e51bcd98
 SHA1 (patch-mesonbuild_environment.py) = d0340ea4149c7ed89fd64d0f1631721f7b9f04aa
+SHA1 (patch-mesonbuild_interpreter_interpreterobjects.py) = c03b4f2f8011462c250a3dbb4c5e658684624431
 SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 7b524383bfa6511c43d2d27de91442d42623c3ad
 SHA1 (patch-mesonbuild_scripts_depfixer.py) = b8673de86f49f7a9876afcd05536766e0555d217

Added files:

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_interpreter_interpreterobjects.py
diff -u /dev/null pkgsrc/devel/meson/patches/patch-mesonbuild_interpreter_interpreterobjects.py:1.1
--- /dev/null   Tue Jun  1 05:55:46 2021
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_interpreter_interpreterobjects.py       Tue Jun  1 05:55:46 2021
@@ -0,0 +1,19 @@
+$NetBSD: patch-mesonbuild_interpreter_interpreterobjects.py,v 1.1 2021/06/01 05:55:46 cirnatdan Exp $
+
+Upstream patch, won't be necessary when the next version is released
+interpreter: flatten environment() initial values
+https://github.com/mesonbuild/meson/pull/8761
+
+--- mesonbuild/interpreter/interpreterobjects.py.orig  2021-04-27 06:49:45.000000000 +0000
++++ mesonbuild/interpreter/interpreterobjects.py
+@@ -165,7 +165,9 @@ class EnvironmentVariablesHolder(Mutable
+             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)