From dfbfadd717688181a7624fd3c45a856528d7a34d3583cd702324ffcbb664c6c3 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Fri, 16 Jul 2021 07:45:37 +0000
Subject: [PATCH] Accepting request 906607 from GNOME:Next

GNOME 40.3

OBS-URL: https://build.opensuse.org/request/show/906607
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=206
---
 meson-0.57.2.tar.gz            |  3 ---
 meson-0.57.2.tar.gz.asc        | 16 ----------------
 meson-0.58.1.tar.gz            |  3 +++
 meson-0.58.1.tar.gz.asc        | 16 ++++++++++++++++
 meson-distutils.patch          | 29 ++++++++++++++++++++++-------
 meson-test-installed-bin.patch | 14 +++++++-------
 meson.changes                  | 17 ++++++++++++++++-
 meson.spec                     |  2 +-
 8 files changed, 65 insertions(+), 35 deletions(-)
 delete mode 100644 meson-0.57.2.tar.gz
 delete mode 100644 meson-0.57.2.tar.gz.asc
 create mode 100644 meson-0.58.1.tar.gz
 create mode 100644 meson-0.58.1.tar.gz.asc

diff --git a/meson-0.57.2.tar.gz b/meson-0.57.2.tar.gz
deleted file mode 100644
index c14e526..0000000
--- a/meson-0.57.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5
-size 1853721
diff --git a/meson-0.57.2.tar.gz.asc b/meson-0.57.2.tar.gz.asc
deleted file mode 100644
index 15ba978..0000000
--- a/meson-0.57.2.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmBxfOgACgkQwk5jG6ux
-/nAC8g/8Cb/4kaRHXCns7Fnfdfw0TBWJwzo+jBnx0kscN4I3QxzGBsAzH8SQWNg1
-cWDT5GRWY7bzXT855qTRv8EoLeJIfLGVh52lWCk/KaQL3Lw246iAsYuOrGp9EGUI
-q40GMCIfsscBKm4PrYEicfnEe3GexgHqLxLFbX2zKrH4D8oqq4caBB0hImdtylct
-7CyXDjnKIqqMgoLGh4AumZNvRD1Xy7lLrKAe6q6gZ91c99pCGojPptpA3xVKmULf
-kijJdg60Eydc1MsFHVEmvyp/FkhW0oW2+xykceF1LEEDDTqMqsLM+5e6iXq1kfER
-XNHtBUgWd4y7xk3nLOk+EEjvQgWQuRJst2R9/eoLfWPYAD+IXR4OEXwRIyUqRHAe
-y74q6jeJ97PC1aeZ4WUArijuNJFBfwp/57nrvg3Ovx2oChF7J6TIBqVdmfNDdeIE
-K77tKI/YfIql01DEu1bAEIO1P/BcXMe7X2siB+oUyJ6j3CPHae2hsvGec3wIi2+o
-jUlvqqr/refUvhlffvdaR/Swp47zlJ/GxvDXHFo6L26LCiK89TcQAU9p/ZXwL8IV
-zqvRUvENtCxOYKDPKKe265aHfgTQ4sJ9OLiWeZ1TsaYdVgEPdioCYqJxiORV4qHA
-kQV/mAXJGcVyRgrAAX6Hx6Jc44cWJ54wkcsGu1Z/I978ekDkUvc=
-=v/5G
------END PGP SIGNATURE-----
diff --git a/meson-0.58.1.tar.gz b/meson-0.58.1.tar.gz
new file mode 100644
index 0000000..7a32043
--- /dev/null
+++ b/meson-0.58.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3144a3da662fcf79f1e5602fa929f2821cba4eba28c2c923fe0a7d3e3db04d5d
+size 1896205
diff --git a/meson-0.58.1.tar.gz.asc b/meson-0.58.1.tar.gz.asc
new file mode 100644
index 0000000..940fc8c
--- /dev/null
+++ b/meson-0.58.1.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmC+XxEACgkQwk5jG6ux
+/nCqEhAAoNWOeMp0ynvD7JxUlBqBHCr0n3IcVzLOr60WPQdN3txWEWxsRE5/eHun
+R0gYUemQrTO7xE96GFPHkmJOus1+bOOa3TG7li6CANKxIVVNuG2d1GvDwPUWDuVk
+t3ggj5r1g9N+6jFe6VulSBldC7dtyAZjR205HATTXVn1krduPLlgAaF0lQrcXdWE
+opS+qoh1UaHiBKMmGDV/dM8Dv9BCg/lT6UnjVJbOBfG+daPSB/7jFnc/sJwCtITk
+GypS9SimVDpUzWT5lUcLEIV5Tq3rsNH5x1OPh/MjsPQ2irtmGHe4zS6VG8fcdbol
+LTJumPQ4AJC0cvw/f4apkLb9NdCMOqBmXmQTc0wpCsYAmJZ6qlwWnPVvDZ08LtAD
+pkDAqOLfuMD8VdtRH4esK+FF+nUowyveo29B2DdzqveAfLrq+btfP/Bpz09LbTJf
+SpB1qBH0nPwE+tbV3GNCKImAEOh8FEJRXDVz2Sbw0HhtHgOWSOHxzq9xKz+47F4n
+aVYiuiFC1P8bv6VWw2NPqF2t6CdsxwxF3mJzngrzwJFaMs5UQ9OWW9EpQ88pADQZ
+7jOIvqoXPcMIsMuAzCe04t9n0ACLtBtOKWx5NqM7LabmZ7NXXqV25aLcK4KHq8KO
+hh4KgwBEzBs4mAy32bcVIKuJPr/Mu2blRkQnm2/Z3+Bt5hlAvF8=
+=aqSz
+-----END PGP SIGNATURE-----
diff --git a/meson-distutils.patch b/meson-distutils.patch
index 67fd3bc..79af79b 100644
--- a/meson-distutils.patch
+++ b/meson-distutils.patch
@@ -1,13 +1,28 @@
-Index: meson-0.57.2/setup.py
+Index: meson-0.58.1/setup.py
 ===================================================================
---- meson-0.57.2.orig/setup.py
-+++ meson-0.57.2/setup.py
-@@ -21,7 +21,7 @@ if sys.version_info < (3, 6):
+--- meson-0.58.1.orig/setup.py
++++ meson-0.58.1/setup.py
+@@ -20,7 +20,7 @@ if sys.version_info < (3, 6):
+     raise SystemExit('ERROR: Tried to install Meson with an unsupported Python version: \n{}'
                       '\nMeson requires Python 3.6.0 or greater'.format(sys.version))
  
- from mesonbuild.coredata import version
 -from setuptools import setup
 +from distutils.core import setup
  
- # On windows, will create Scripts/meson.exe and Scripts/meson-script.py
- # Other platforms will create bin/meson
+ data_files = []
+ if sys.platform != 'win32':
+@@ -28,4 +28,12 @@ if sys.platform != 'win32':
+     data_files = [('share/man/man1', ['man/meson.1']),
+                   ('share/polkit-1/actions', ['data/com.mesonbuild.install.policy'])]
+ 
+-setup(data_files=data_files,)
++# Since distutils does not understand the find: directive in setup.cfg, and
++# therefore doesn't expand it, we need to do it directly
++import os
++packages=[
++    root.replace('/', '.')
++    for root, dirs, files in os.walk('mesonbuild')
++    if '__init__.py' in files]
++
++setup(packages=packages, data_files=data_files,)
+
diff --git a/meson-test-installed-bin.patch b/meson-test-installed-bin.patch
index 88e0b03..6574b60 100644
--- a/meson-test-installed-bin.patch
+++ b/meson-test-installed-bin.patch
@@ -1,8 +1,8 @@
-Index: meson-0.57.2/run_tests.py
+Index: meson-0.58.0/run_tests.py
 ===================================================================
---- meson-0.57.2.orig/run_tests.py
-+++ meson-0.57.2/run_tests.py
-@@ -154,18 +154,10 @@ def get_meson_script():
+--- meson-0.58.0.orig/run_tests.py
++++ meson-0.58.0/run_tests.py
+@@ -158,18 +158,10 @@ def get_meson_script():
      Also used by run_unittests.py to determine what meson to run when not
      running in-process (which is the default).
      '''
@@ -18,12 +18,12 @@ Index: meson-0.57.2/run_tests.py
 -    if meson_cmd:
 +    if meson_cmd and os.path.isfile(meson_cmd):
          return meson_cmd
--    raise RuntimeError('Could not find {!r} or a meson in PATH'.format(meson_script))
-+    raise RuntimeError('Could not find meson in PATH')
+-    raise RuntimeError(f'Could not find {meson_script!r} or a meson in PATH')
++    raise RuntimeError(f'Could not find meson in PATH')
  
  def get_backend_args_for_dir(backend, builddir):
      '''
-@@ -353,12 +345,12 @@ def main():
+@@ -359,12 +351,12 @@ def main():
              else:
                  env['PYTHONPATH'] = temp_dir
          if not options.cross:
diff --git a/meson.changes b/meson.changes
index cb97c32..90bbf93 100644
--- a/meson.changes
+++ b/meson.changes
@@ -1,7 +1,22 @@
+-------------------------------------------------------------------
+Wed Jul 14 08:04:57 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 0.58.1:
+  + New meson.global_build_root() and meson.global_source_root()
+    methods.
+  + meson.add_dist_script() allowd in subprojects.
+  + Do not add custom target dir to header path if
+    implicit_include_directories is false.
+  + Multiple append() and prepend() in environment() object.
+  + clang-format include and ignore lists.
+  + Introducing format strings to the Meson language.
+  + Skip subprojects installation.
+- Rebase meson-distutils.patch (work done by StevenK).
+
 -------------------------------------------------------------------
 Mon Jul 12 13:42:46 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 
-- Update to from version 0.57.2:
+- Update to version 0.57.2:
   + Support for reading files at configuration time with the fs
     module.
   + Experimental support for C++ modules in Visual Studio.
diff --git a/meson.spec b/meson.spec
index 1798a1d..1792bb9 100644
--- a/meson.spec
+++ b/meson.spec
@@ -28,7 +28,7 @@
 %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
 %bcond_with     setuptools
 Name:           meson%{name_ext}
-Version:        0.57.2
+Version:        0.58.1
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0