- Update to version 0.45.0.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=118

meson-0.48.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39ead8bfd0dc9c7b0af15e23ea975c864600bf871fba279c9918625bb9a85506
-size 1310363

meson-0.48.2.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlvkvcUACgkQO/RpO/7r
-lCgoag//SSYQYHJIBa09Ty4LDdJvsdCOa2YGhu2mKQROjnngxvhR15Nb16DRQ3k0
-PgoCRHLEp6I/WQRtn8lXpFpge8BwbBmTw8+vgGGpmk4ayn+dFeahijAh1j9G8jS0
-BNoYC6/UGd0Y7xGa3kDxUdJVF0CaUEB+hMQvRqvz/eO6C7ujs0Me7JuVxYlg4FSi
-hF3BeWBBp8BtlfDpYO7vhllLceMKpzN6rjwtu1/B43diVFS5Nk6j4gVSFj5LHrUo
-US5av424YO5QIiJX88AFwXunlxQr7wPREEqehKJmuK/lxBMFaCooXHdVlJR9smJn
-LCH6iec6PiRxRTCrqsHaR8OmxkmtwWLLHniMoB386jX5rSYQpB8tAcTzhl9cxj8O
-hUT+oe549UVoF9Xqvbv3Rx7KGPe3uweFHAOrelCUxU52hfBm2jlPQqcUeKGVJeWe
-fZVfUDoon4jjsIepwnG2mS7ISVgx3UtvqCb2VH6azEpAR4LzjwynzsJ+je8O/nFP
-uTJ+pEfk40+9CmzIwbA+SsQ0ANMWH7tz5AkckwJ2tld9FleyO7U/4WJ9pE4UEpzq
-IRC2ZrGGCtO3i5tICM+DPxEaTskc3R7I0aVsfV7TEUkAAyGgdN9MWGmv4acmEWUc
-LKxlo0PGOkAo4r+2cYfEG2E0CQQcuDTvQkc9ppGrY5trYzMJwLU=
-=f+xM
------END PGP SIGNATURE-----

meson-0.49.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb0395c4ac208eab381cd1a20571584bdbba176eb562a7efa9cb17cace0e1551
+size 1338583

meson-0.49.0.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlwNdRwACgkQO/RpO/7r
+lCi6AhAAhHYSnNDjXrLecIuVdN8VvaliDzFDM8MKf6kEgat1bN8SpofGXujUmmzO
+YQa7E0tGyAMc1/MZgnEppXWXdfVhNjnEwIetmUNnxviPVxcliQ9Ygty2MvT5H1ng
+1oIWnZRAOecf1Yvm4uYCuq7JRMobT9qx54nevsmEKqUgqZQWg8w53HgjhDrXSqN2
+ymfLSIAyOvGjcISHz9aJTuxhvjIqeH2zwVsSAvD6xeTxWqnLOhZ7tWI3vqRT7Y7S
+0p0hshNZXN8R0+ixSvOjv9za/GjzB1/TFU7wrwxFkT9/jccUnEDcKcxN8L7yx/TN
+BlkJMS/4ruqarLyerIQWGaxmIaBsaJQSg4A1zupOxHQI1NkLn840HJBYOyo3jZUV
+z7/hdAexjiHPHTYpOibLvzDT9XJCdV3268s5DRx0kDULuSC7sqsnO0u5Fl2WZWp5
+0tHiR/Z3EvacRRUzDZ/FEmc7IQoZzHnJDvL2i3sDnwJBT3pYqDfoBx9lj3IBMpfb
+3MJw8CDe8SJmZ5kt9z/iC8DfZ0ZuIufNnCJJN39nnMb/FMUZsnaPB37VYV66NCr1
+KrAlXY57BhCPMsbx8lT2sWe3DBTnu/dQRaU5qk5oAkGNM83CaHeS4AOQH3EUb0N5
+a/S1aJHk3xq4Vedkkilcq7IMHeLDcui3LD5kCOs54ZQeNJO9ICI=
+=+Y3s
+-----END PGP SIGNATURE-----

meson-fix-gcc48.patch

@@ -1,80 +1,19 @@
---- a/mesonbuild/compilers/cpp.py
+--- "a/test cases/common/152 simd/simdchecker.c"
-+++ b/mesonbuild/compilers/cpp.py
++++ "b/test cases/common/152 simd/simdchecker.c"
-@@ -137,8 +137,8 @@ class ClangCPPCompiler(ClangCompiler, CP
+@@ -10,11 +10,12 @@ int check_simd_implementation(float *fou
-     def get_options(self):
+         const float *expected,
-         opts = CPPCompiler.get_options(self)
+         simd_func fptr,
-         opts.update({'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
+         const int blocksize) {
--                                                         ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z', 'c++2a',
++    int i;
--                                                          'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'],
+     int rv = 0;
-+                                                         ['none', 'c++98', 'c++03', 'c++11', 'c++1y', 'c++14', 'c++17', 'c++1z', 'c++2a',
+     memcpy(four, four_initial, blocksize*sizeof(float));
-+                                                          'gnu++11', 'gnu++1y', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'],
+     printf("Using %s.\n", simd_type);
-                                                          'none')})
+     fptr(four);
-         return opts
+-    for(int i=0; i<blocksize; i++) {
- 
++    for(i=0; i<blocksize; i++) {
-@@ -168,8 +168,8 @@ class ArmclangCPPCompiler(ArmclangCompil
+         if(four[i] != expected[i]) {
-     def get_options(self):
+             printf("Increment function failed, got %f expected %f.\n", four[i], expected[i]);
-         opts = CPPCompiler.get_options(self)
+             rv = 1;
-         opts.update({'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
--                                                         ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17',
--                                                          'gnu++98', 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17'],
-+                                                         ['none', 'c++98', 'c++03', 'c++11', 'c++1y', 'c++14', 'c++17',
-+                                                          'gnu++98', 'gnu++03', 'gnu++11', 'gnu++1y', 'gnu++14', 'gnu++17'],
-                                                          'none')})
-         return opts
- 
-@@ -194,10 +194,12 @@ class GnuCPPCompiler(GnuCompiler, CPPCom
-                           '3': default_warn_args + ['-Wextra', '-Wpedantic']}
- 
-     def get_options(self):
-+        cpp_stds = ['c++98', 'c++03', 'c++11', 'c++1y', 'gnu++11', 'gnu++1y']
-+        if version_compare(self.version, '>=5.0.0'):
-+            cpp_stds += ['c++14', 'c++17', 'c++1z', 'c++2a', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a']
-         opts = CPPCompiler.get_options(self)
-         opts.update({'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
--                                                         ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z', 'c++2a',
--                                                          'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'],
-+                                                         ['none'] + cpp_stds,
-                                                          'none'),
-                      'cpp_debugstl': coredata.UserBooleanOption('cpp_debugstl',
-                                                                 'STL debug mode',
-@@ -271,7 +273,7 @@ class IntelCPPCompiler(IntelCompiler, CP
-         c_stds = ['c++98', 'c++03']
-         g_stds = ['gnu++98', 'gnu++03']
-         if version_compare(self.version, '>=15.0.0'):
--            c_stds += ['c++11', 'c++14']
-+            c_stds += ['c++11', 'c++1y', 'c++14']
-             g_stds += ['gnu++11']
-         if version_compare(self.version, '>=16.0.0'):
-             c_stds += ['c++17']
---- a/mesonbuild/minit.py
-+++ b/mesonbuild/minit.py
-@@ -143,7 +143,7 @@ int main(int argc, char **argv) {{
- hello_cpp_meson_template = '''project('{project_name}', 'cpp',
-   version : '{version}',
-   default_options : ['warning_level=3',
--                     'cpp_std=c++14'])
-+                     'cpp_std=c++1y'])
- 
- exe = executable('{exe_name}', '{source_name}',
-   install : true)
-@@ -214,7 +214,7 @@ int main(int argc, char **argv) {{
- 
- lib_cpp_meson_template = '''project('{project_name}', 'cpp',
-   version : '{version}',
--  default_options : ['warning_level=3', 'cpp_std=c++14'])
-+  default_options : ['warning_level=3', 'cpp_std=c++1y'])
- 
- # These arguments are only used to build the shared library
- # not the executables that use the library.
-@@ -404,7 +404,7 @@ def create_meson_build(options):
-     default_options = ['warning_level=3']
-     if options.language == 'cpp':
-         # This shows how to set this very common option.
--        default_options += ['cpp_std=c++14']
-+        default_options += ['cpp_std=c++1y']
-     # If we get a meson.build autoformatter one day, this code could
-     # be simplified quite a bit.
-     formatted_default_options = ', '.join("'{}'".format(x) for x in default_options)
 --- "a/test cases/unit/17 prebuilt shared/patron.c"
 +++ "b/test cases/unit/17 prebuilt shared/patron.c"
 @@ -5,4 +5,5 @@ int main(int argc, char **argv) {

meson-restore-python3.4.patch

@@ -1,7 +1,7 @@
 --- a/mesonbuild/backend/ninjabackend.py
 +++ b/mesonbuild/backend/ninjabackend.py
 @@ -32,7 +32,7 @@ from .. import compilers
- from ..compilers import CompilerArgs, CCompiler
+ from ..compilers import CompilerArgs, CCompiler, VisualStudioCCompiler
  from ..linkers import ArLinker
  from ..mesonlib import File, MesonException, OrderedSet
 -from ..mesonlib import get_compiler_for_source, has_path_sep
@@ -9,7 +9,7 @@
  from .backends import CleanTrees
  from ..build import InvalidArguments
  
-@@ -1011,8 +1011,8 @@ int dummy;
+@@ -1025,8 +1025,8 @@ int dummy;
                  # Check if the vala file is in a subdir of --basedir
                  abs_srcbasedir = os.path.join(self.environment.get_source_dir(), target.get_subdir())
                  abs_vala_file = os.path.join(self.environment.get_build_dir(), vala_file)
@@ -25,13 +25,13 @@
 @@ -18,7 +18,7 @@ import sys
  from pathlib import PurePath
  from collections import OrderedDict
- from .mesonlib import MesonException
+ from .mesonlib import (
--from .mesonlib import default_libdir, default_libexecdir, default_prefix
+-    MesonException, default_libdir, default_libexecdir, default_prefix
-+from .mesonlib import default_libdir, default_libexecdir, default_prefix, commonpath
++    MesonException, default_libdir, default_libexecdir, default_prefix, commonpath
+ )
  from .wrap import WrapMode
  import ast
- import argparse
+@@ -379,7 +379,7 @@ class CoreData:
-@@ -302,7 +302,7 @@ class CoreData:
              # commonpath will always return a path in the native format, so we
              # must use pathlib.PurePath to do the same conversion before
              # comparing.
@@ -42,7 +42,7 @@
                      'relative path, it is assumed to be a subdir of prefix.'
 --- a/mesonbuild/interpreterbase.py
 +++ b/mesonbuild/interpreterbase.py
-@@ -574,7 +574,9 @@ The result of this is undefined and will
+@@ -617,7 +617,9 @@ The result of this is undefined and will
  
          if cur.operation == 'add':
              if isinstance(l, dict) and isinstance(r, dict):
@@ -53,7 +53,7 @@
              try:
                  return l + r
              except Exception as e:
-@@ -661,7 +662,8 @@ The result of this is undefined and will
+@@ -718,7 +720,8 @@ The result of this is undefined and will
          elif isinstance(old_variable, dict):
              if not isinstance(addition, dict):
                  raise InvalidArguments('The += operator requires a dict on the right hand side if the variable on the left is a dict')
@@ -65,17 +65,15 @@
              raise InvalidArguments('The += operator currently only works with arrays, dicts, strings or ints ')
 --- a/mesonbuild/mesonlib.py
 +++ b/mesonbuild/mesonlib.py
-@@ -19,7 +19,8 @@ import sys
+@@ -20,6 +20,7 @@ import stat
- import stat
  import time
  import platform, subprocess, operator, os, shutil, re
--import collections
+ import collections
-+import collections
 +import collections.abc
- from mesonbuild import mlog
+ from enum import Enum
+ from functools import lru_cache
  
- have_fcntl = False
+@@ -1149,6 +1150,30 @@ def substring_is_in_list(substr, strlist
-@@ -1062,6 +1062,30 @@ def substring_is_in_list(substr, strlist
              return True
      return False
  
@@ -108,8 +106,8 @@
      insertion.
 --- a/mesonbuild/mesonmain.py
 +++ b/mesonbuild/mesonmain.py
-@@ -269,8 +269,8 @@ def set_meson_command(mainfile):
+@@ -149,8 +149,8 @@ def run_script_command(script_name, scri
-         mlog.log('meson_command is {!r}'.format(mesonlib.meson_command))
+         return 1
  
  def run(original_args, mainfile):
 -    if sys.version_info < (3, 5):
@@ -121,7 +119,7 @@
          return 1
 --- a/mesonbuild/minstall.py
 +++ b/mesonbuild/minstall.py
-@@ -353,8 +353,8 @@ class Installer:
+@@ -348,8 +348,8 @@ class Installer:
              if shutil.which('pkexec') is not None and 'PKEXEC_UID' not in os.environ:
                  print('Installation failed due to insufficient permissions.')
                  print('Attempting to use polkit to gain elevated privileges...')
@@ -134,7 +132,7 @@
  
 --- a/mesonbuild/modules/python.py
 +++ b/mesonbuild/modules/python.py
-@@ -512,7 +512,7 @@ class PythonModule(ExtensionModule):
+@@ -516,7 +516,7 @@ class PythonModule(ExtensionModule):
              # Sanity check, we expect to have something that at least quacks in tune
              try:
                  info = json.loads(run_command(python, INTROSPECT_COMMAND))
@@ -145,7 +143,7 @@
              if isinstance(info, dict) and 'version' in info and self._check_version(name_or_path, info['version']):
 --- a/mesonbuild/mtest.py
 +++ b/mesonbuild/mtest.py
-@@ -115,7 +115,12 @@ def returncode_to_status(retcode):
+@@ -114,7 +114,12 @@ def returncode_to_status(retcode):
      if retcode < 0:
          signum = -retcode
          try:
@@ -159,7 +157,7 @@
          except ValueError:
              signame = 'SIGinvalid'
          return '(killed by signal %d %s)' % (signum, signame)
-@@ -125,7 +130,12 @@ def returncode_to_status(retcode):
+@@ -124,7 +129,12 @@ def returncode_to_status(retcode):
  
      signum = retcode - 128
      try:
@@ -173,19 +171,6 @@
      except ValueError:
          signame = 'SIGinvalid'
      return '(exit status %d or signal %d %s)' % (retcode, signum, signame)
---- a/mesonbuild/scripts/dist.py
-+++ b/mesonbuild/scripts/dist.py
-@@ -87,8 +87,8 @@ def run_dist_scripts(dist_root, dist_scr
-                              silent=True)
-         if not ep.found():
-             sys.exit('Script %s could not be found in dist directory.' % d)
--        pc = subprocess.run(ep.command, env=env)
--        if pc.returncode != 0:
-+        pc = subprocess.call(ep.command, env=env)
-+        if pc != 0:
-             sys.exit('Dist script errored out.')
- 
- def create_dist_git(dist_name, src_root, bld_root, dist_sub, dist_scripts):
 --- a/mesonbuild/scripts/gtkdochelper.py
 +++ b/mesonbuild/scripts/gtkdochelper.py
 @@ -17,7 +17,7 @@ import subprocess
@@ -193,11 +178,11 @@
  import shutil
  import argparse
 -from ..mesonlib import MesonException, Popen_safe, is_windows
-+from ..mesonlib import MesonException, Popen_safe, is_windows, commonpath
++from ..mesonlib import MesonException, Popen_safe, commonpath, is_windows
  from . import destdir_join
  
  parser = argparse.ArgumentParser()
-@@ -107,7 +107,7 @@ def build_gtkdoc(source_root, build_root
+@@ -108,7 +108,7 @@ def build_gtkdoc(source_root, build_root
          # FIXME: Use mesonlib.File objects so we don't need to do this
          if not os.path.isabs(f):
              f = os.path.join(doc_src, f)
@@ -208,7 +193,7 @@
  
 --- a/run_meson_command_tests.py
 +++ b/run_meson_command_tests.py
-@@ -18,6 +18,7 @@ import os
+@@ -19,6 +19,7 @@ import os
  import tempfile
  import unittest
  import subprocess
@@ -216,52 +201,28 @@
  import zipapp
  from pathlib import Path
  
-@@ -73,13 +74,27 @@ class CommandTests(unittest.TestCase):
+@@ -68,9 +69,15 @@ class CommandTests(unittest.TestCase):
          # If this call hangs CI will just abort. It is very hard to distinguish
          # between CI issue and test bug in that case. Set timeout and fail loud
          # instead.
 -        p = subprocess.run(command, stdout=subprocess.PIPE,
--                           stderr=subprocess.STDOUT, env=os.environ.copy(),
+-                           env=os.environ.copy(), universal_newlines=True,
--                           universal_newlines=True, cwd=workdir, timeout=60 * 5)
+-                           cwd=workdir, timeout=60 * 5)
--        print(p.stdout)
--        if p.returncode != 0:
--            raise subprocess.CalledProcessError(p.returncode, command)
--        return p.stdout
 +        if sys.version_info >= (3, 5):
 +            p = subprocess.run(command, stdout=subprocess.PIPE,
-+                               stderr=subprocess.STDOUT, env=os.environ.copy(),
++                               env=os.environ.copy(), universal_newlines=True,
-+                               universal_newlines=True,
 +                               cwd=workdir, timeout=60 * 5)
-+            print(p.stdout)
-+            if p.returncode != 0:
-+                raise subprocess.CalledProcessError(p.returncode, command)
-+            return p.stdout
 +        else:
-+            try:
++            p = subprocess.Popen(command, stdout=subprocess.PIPE,
-+                po = subprocess.check_output(command, stderr=subprocess.STDOUT,
++                                 env=os.environ.copy(), universal_newlines=True,
-+                                             env=os.environ.copy(),
++                                 cwd=workdir)
-+                                             universal_newlines=True,
++            p.stdout = p.communicate(timeout=60 * 5)[0]
-+                                             cwd=workdir, timeout=60 * 5)
+         print(p.stdout)
-+            except subprocess.CalledProcessError as e:
+         if p.returncode != 0:
-+                print(e.output)
+             raise subprocess.CalledProcessError(p.returncode, command)
-+                raise subprocess.CalledProcessError(e.returncode, e.cmd)
-+            else:
-+                print(po)
-+                return po
- 
-     def assertMesonCommandIs(self, line, cmd):
-         self.assertTrue(line.startswith('meson_command '), msg=line)
 --- a/run_unittests.py
 +++ b/run_unittests.py
-@@ -21,6 +21,7 @@ import tempfile
+@@ -956,6 +956,24 @@ class DataTests(unittest.TestCase):
- import textwrap
- import os
- import shutil
-+import sys
- import unittest
- import platform
- from itertools import chain
-@@ -892,6 +893,24 @@ class DataTests(unittest.TestCase):
              defined = set([a.strip() for a in res.group().split('\\')][1:])
              self.assertEqual(defined, set(chain(interp.funcs.keys(), interp.builtin.keys())))
  
@@ -286,7 +247,7 @@
  
  class BasePlatformTests(unittest.TestCase):
      def setUp(self):
-@@ -972,9 +991,16 @@ class BasePlatformTests(unittest.TestCas
+@@ -1036,9 +1054,15 @@ class BasePlatformTests(unittest.TestCas
          # If this call hangs CI will just abort. It is very hard to distinguish
          # between CI issue and test bug in that case. Set timeout and fail loud
          # instead.
@@ -296,17 +257,16 @@
 +        if sys.version_info >= (3, 5):
 +            p = subprocess.run(command, stdout=subprocess.PIPE,
 +                               stderr=subprocess.STDOUT, env=os.environ.copy(),
-+                               universal_newlines=True, cwd=workdir,
++                               universal_newlines=True, cwd=workdir, timeout=60 * 5)
-+                               timeout=60 * 5)
 +        else:
 +            p = subprocess.Popen(command, stdout=subprocess.PIPE,
 +                                 stderr=subprocess.STDOUT, env=os.environ.copy(),
 +                                 universal_newlines=True, cwd=workdir)
-+            p.stdout = p.communicate(timeout=60 * 5)[0]
++            p.stdout  = p.communicate(timeout=60 * 5)[0]
          print(p.stdout)
          if p.returncode != 0:
              if 'MESON_SKIP_TEST' in p.stdout:
-@@ -2698,17 +2724,23 @@ recommended as it is not supported on so
+@@ -2849,17 +2873,23 @@ recommended as it is not supported on so
                  of = open(mfile, 'w')
                  of.write("project('foobar', 'c')\n")
                  of.close()
@@ -339,11 +299,30 @@
  
      def get_opts_as_dict(self):
          result = {}
+@@ -4671,13 +4701,14 @@ class NativeFileTests(BasePlatformTests)
+                 f.write('        print("{}", file=sys.{})\n'.format(value, kwargs.get('outfile', 'stdout')))
+                 f.write('        sys.exit(0)\n')
+             f.write(textwrap.dedent('''
+-                    ret = subprocess.run(
++                    ret = subprocess.Popen(
+                         ["{}"] + extra_args,
+                         stdout=subprocess.PIPE,
+                         stderr=subprocess.PIPE,
+-                        encoding='utf-8')
+-                    print(ret.stdout)
+-                    print(ret.stderr, file=sys.stderr)
++                        universal_newlines=True)
++                    stdout, stderr = ret.communicate()
++                    print(stdout)
++                    print(stderr, file=sys.stderr)
+                     sys.exit(ret.returncode)
+ 
+                 if __name__ == '__main__':
 --- a/setup.py
 +++ b/setup.py
-@@ -18,9 +18,9 @@ import sys
+@@ -16,9 +16,9 @@
  
- from mesonbuild.coredata import version
+ import sys
  
 -if sys.version_info < (3, 5, 0):
 +if sys.version_info < (3, 4, 0):
@@ -352,7 +331,7 @@
 +          'Meson requires Python 3.4.0 or greater')
      sys.exit(1)
  
- from setuptools import setup
+ from mesonbuild.coredata import version
 --- "a/test cases/common/188 find override/subdir/converter.py"
 +++ "b/test cases/common/188 find override/subdir/converter.py"
 @@ -10,6 +10,7 @@ ftempl = '''int %s() {
@@ -381,17 +360,25 @@
 +    f.write(ftempl % d)
 --- "a/test cases/unit/35 dist script/replacer.py"
 +++ "b/test cases/unit/35 dist script/replacer.py"
-@@ -7,6 +7,8 @@ source_root = pathlib.Path(os.environ['M
+@@ -11,6 +11,8 @@ source_root = pathlib.Path(os.environ['M
  
  modfile = source_root / 'prog.c'
  
 -contents = modfile.read_text()
 +with modfile.open('r') as f:
 +    contents = f.read()
- contents = contents.replace('"incorrect"', '"correct"')
+ contents = contents.replace(sys.argv[1], sys.argv[2])
 -modfile.write_text(contents)
 +with modfile.open('w') as f:
 +    f.write(contents)
+--- "a/test cases/unit/46 native dep pkgconfig var/cross_pkgconfig.py"
++++ "b/test cases/unit/46 native dep pkgconfig var/cross_pkgconfig.py"
+@@ -9,4 +9,4 @@ environ['PKG_CONFIG_LIBDIR'] = os.path.j
+     os.path.dirname(os.path.realpath(__file__)), 'cross_pkgconfig')
+ 
+ sys.exit(
+-    subprocess.run(['pkg-config'] + sys.argv[1:], env=environ).returncode)
++    subprocess.call(['pkg-config'] + sys.argv[1:], env=environ))
 --- "a/test cases/windows/13 test argument extra paths/test/test_run_exe.py"
 +++ "b/test cases/windows/13 test argument extra paths/test/test_run_exe.py"
 @@ -7,6 +7,6 @@ if __name__ == '__main__':

meson-suse-fix-llvm-3.8.patch

@@ -1,6 +1,6 @@
 --- a/mesonbuild/dependencies/dev.py
 +++ b/mesonbuild/dependencies/dev.py
-@@ -205,10 +205,10 @@ class LLVMDependency(ConfigToolDependenc
+@@ -343,10 +343,11 @@ class LLVMDependency(ConfigToolDependenc
          not for shared-linnking, we have to figure those out ourselves, because
          of course we do.
          """
@@ -8,6 +8,7 @@
 -            self.link_args = self.get_config_value(
 -                ['--libs', '--ldflags', '--system-libs'] + list(self.required_modules),
 -                'link_args')
++        #if self.static:
 +        self.link_args = self.get_config_value(
 +            ['--libs', '--ldflags', '--system-libs'] + list(self.required_modules),
 +            'link_args')
@@ -15,7 +16,7 @@
          else:
              # llvm-config will provide arguments for static linking, so we get
              # to figure out for ourselves what to link with. We'll do that by
-@@ -227,6 +227,7 @@ class LLVMDependency(ConfigToolDependenc
+@@ -365,6 +366,7 @@ class LLVMDependency(ConfigToolDependenc
              else:
                  raise DependencyException(
                      'Could not find a dynamically linkable library for LLVM.')
@@ -23,3 +24,17 @@
  
      def check_components(self, modules, required=True):
          """Check for llvm components (modules in meson terms).
+--- a/run_unittests.py
++++ b/run_unittests.py
+@@ -4771,6 +4771,11 @@ class NativeFileTests(BasePlatformTests)
+         # Do the skip at this level to avoid screwing up the cache
+         if not shutil.which('llvm-config'):
+             raise unittest.SkipTest('No llvm-installed, cannot test')
++
++        output = subprocess.getoutput('llvm-config --version')
++        if version_compare(output, '< 3.9'):
++            raise unittest.SkipTest('llvm-config >= 3.9 needed for the test')
++
+         self._simple_test('config_dep', 'llvm-config')
+ 
+     def test_python3_module(self):

meson-test-installed-bin.patch

@@ -1,6 +1,6 @@
 --- a/run_tests.py
 +++ b/run_tests.py
-@@ -54,18 +54,10 @@ def get_meson_script():
+@@ -104,18 +104,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).
      '''
@@ -21,12 +21,22 @@
  
  def get_backend_args_for_dir(backend, builddir):
      '''
-@@ -244,7 +236,7 @@ if __name__ == '__main__':
+@@ -296,12 +288,12 @@ def main():
-             env['COVERAGE_PROCESS_START'] = '.coveragerc'
+             else:
-             env['PYTHONPATH'] = os.pathsep.join([td] + env.get('PYTHONPATH', []))
+                 env['PYTHONPATH'] = temp_dir
          if not cross:
--            returncode += subprocess.call(mesonlib.python_command + ['run_meson_command_tests.py', '-v'], env=env)
+-            cmd = mesonlib.python_command + ['run_meson_command_tests.py', '-v']
-+            #returncode += subprocess.call(mesonlib.python_command + ['run_meson_command_tests.py', '-v'], env=env)
+-            if options.failfast:
-             returncode += subprocess.call(mesonlib.python_command + ['run_unittests.py', '-v'], env=env)
+-                cmd += ['--failfast']
-             returncode += subprocess.call(mesonlib.python_command + ['run_project_tests.py'] + sys.argv[1:], env=env)
+-            returncode += subprocess.call(cmd, env=env)
-         else:
+-            if options.failfast and returncode != 0:
+-                return returncode
++            #cmd = mesonlib.python_command + ['run_meson_command_tests.py', '-v']
++            #if options.failfast:
++            #    cmd += ['--failfast']
++            #returncode += subprocess.call(cmd, env=env)
++            #if options.failfast and returncode != 0:
++            #    return returncode
+             cmd = mesonlib.python_command + ['run_unittests.py', '-v']
+             if options.failfast:
+                 cmd += ['--failfast']

meson-testsuite.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Dec 11 06:02:55 UTC 2018 - sor.alexei@meowr.ru
+
+- Update to version 0.45.0:
+  * See https://mesonbuild.com/Release-notes-for-0-49-0.html
+- Rebase meson-test-installed-bin.patch.
+- Rebase meson-suse-fix-llvm-3.8.patch,
+  meson-restore-python3.4.patch.
+- Add more testsuite dependencies: clang, java-headless,
+  mono(csharp), wxWidgets-any-devel.
+
 -------------------------------------------------------------------
 Mon Nov 12 23:52:33 UTC 2018 - sor.alexei@meowr.ru
 

meson-testsuite.spec

@@ -24,7 +24,7 @@
 %endif
 %define _name   mesonbuild
 Name:           meson%{name_ext}
-Version:        0.48.2
+Version:        0.49.0
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -37,18 +37,25 @@ Source2:        meson.keyring
 Patch0:         meson-suse-ify-macros.patch
 # PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package.
 Patch1:         meson-test-installed-bin.patch
-# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests.
-Patch2:         meson-suse-fix-llvm-3.8.patch
 # PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009).
-Patch3:         meson-restore-python3.4.patch
+Patch2:         meson-restore-python3.4.patch
+# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests.
+Patch3:         meson-suse-fix-llvm-3.8.patch
 # PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x.
 Patch4:         meson-fix-gcc48.patch
-
 BuildRequires:  python3-base
 BuildRequires:  python3-setuptools
 BuildArch:      noarch
-%if %{testsuite}
+%if !%{testsuite}
+Requires:       ninja
+Requires:       python3-setuptools
+Requires:       python3-xml
+# meson-gui was last used in openSUSE Leap 42.1.
+Provides:       meson-gui = %{version}
+Obsoletes:      meson-gui < %{version}
+%else
 BuildRequires:  bison
+BuildRequires:  clang
 BuildRequires:  cups-devel
 BuildRequires:  flex
 BuildRequires:  gcc-c++
@@ -85,22 +92,20 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(zlib)
 %if 0%{?suse_version} >= 1500
+BuildRequires:  java-headless
 BuildRequires:  libboost_log-devel
 BuildRequires:  libboost_system-devel
 BuildRequires:  libboost_test-devel
 BuildRequires:  libboost_thread-devel
 BuildRequires:  rust
 BuildRequires:  rust-std
+BuildRequires:  wxWidgets-any-devel
+BuildRequires:  mono(csharp)
 %else
 BuildRequires:  boost-devel
+BuildRequires:  mono-core
+BuildRequires:  wxWidgets-devel
 %endif
-%else
-Requires:       ninja
-Requires:       python3-setuptools
-Requires:       python3-xml
-# meson-gui was last used in openSUSE Leap 42.1.
-Provides:       meson-gui = %{version}
-Obsoletes:      meson-gui < %{version}
 %endif
 
 %description
@@ -139,7 +144,7 @@ This package provides support for meson.build files in Vim.
 %patch4 -p1
 %endif
 
-# Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname)
+# Remove static boost tests from "test cases/frameworks/1 boost/".
 sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build
 
 # Disable test of llvm-static libs: openSUSE does not package/ship them
@@ -156,17 +161,16 @@ sed -i "/def test_generate_gir_with_address_sanitizer/s/$/\n        raise unitte
 sed -i '1{/\/usr\/bin\/env/d;}' ./mesonbuild/rewriter.py
 
 %build
-# If this is the test suite, we don't need anything else but the meson package
 %if !%{testsuite}
 python3 setup.py build
 %else
 # Ensure we have no mesonbuild / meson in CWD, thus guaranteeing we use meson in $PATH
-rm -rf meson.py mesonbuild
+rm -r meson.py mesonbuild
 %endif
 
 %install
 # If this is the test suite, we don't need anything else but the meson package
-%if ! %{testsuite}
+%if !%{testsuite}
 python3 setup.py install \
   --root=%{buildroot} --prefix=%{_prefix}
 
@@ -174,11 +178,11 @@ install -Dpm 0644 data/macros.meson \
   %{buildroot}%{_rpmconfigdir}/macros.d/macros.meson
 
 install -Dpm 0644 data/syntax-highlighting/vim/ftdetect/meson.vim \
-  -t %{buildroot}%{vim_data_dir}/site/ftdetect
+  -t %{buildroot}%{vim_data_dir}/site/ftdetect/
 install -Dpm 0644 data/syntax-highlighting/vim/indent/meson.vim \
-  -t %{buildroot}%{vim_data_dir}/site/indent
+  -t %{buildroot}%{vim_data_dir}/site/indent/
 install -Dpm 0644 data/syntax-highlighting/vim/syntax/meson.vim \
-  -t %{buildroot}%{vim_data_dir}/site/syntax
+  -t %{buildroot}%{vim_data_dir}/site/syntax/
 %endif
 
 %if %{testsuite}
@@ -206,11 +210,11 @@ python3 run_tests.py
 %if !%{testsuite}
 %files vim
 %doc data/syntax-highlighting/vim/README
-%dir %{vim_data_dir}
+%dir %{vim_data_dir}/
-%dir %{vim_data_dir}/site
+%dir %{vim_data_dir}/site/
-%dir %{vim_data_dir}/site/ftdetect
+%dir %{vim_data_dir}/site/ftdetect/
-%dir %{vim_data_dir}/site/indent
+%dir %{vim_data_dir}/site/indent/
-%dir %{vim_data_dir}/site/syntax
+%dir %{vim_data_dir}/site/syntax/
 %{vim_data_dir}/site/ftdetect/meson.vim
 %{vim_data_dir}/site/indent/meson.vim
 %{vim_data_dir}/site/syntax/meson.vim

meson.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Dec 11 06:02:55 UTC 2018 - sor.alexei@meowr.ru
+
+- Update to version 0.45.0:
+  * See https://mesonbuild.com/Release-notes-for-0-49-0.html
+- Rebase meson-test-installed-bin.patch.
+- Rebase meson-suse-fix-llvm-3.8.patch,
+  meson-restore-python3.4.patch.
+- Add more testsuite dependencies: clang, java-headless,
+  mono(csharp), wxWidgets-any-devel.
+
 -------------------------------------------------------------------
 Mon Nov 12 23:52:33 UTC 2018 - sor.alexei@meowr.ru
 

meson.spec

@@ -24,7 +24,7 @@
 %endif
 %define _name   mesonbuild
 Name:           meson%{name_ext}
-Version:        0.48.2
+Version:        0.49.0
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -37,18 +37,25 @@ Source2:        meson.keyring
 Patch0:         meson-suse-ify-macros.patch
 # PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package.
 Patch1:         meson-test-installed-bin.patch
-# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests.
-Patch2:         meson-suse-fix-llvm-3.8.patch
 # PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009).
-Patch3:         meson-restore-python3.4.patch
+Patch2:         meson-restore-python3.4.patch
+# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests.
+Patch3:         meson-suse-fix-llvm-3.8.patch
 # PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x.
 Patch4:         meson-fix-gcc48.patch
-
 BuildRequires:  python3-base
 BuildRequires:  python3-setuptools
 BuildArch:      noarch
-%if %{testsuite}
+%if !%{testsuite}
+Requires:       ninja
+Requires:       python3-setuptools
+Requires:       python3-xml
+# meson-gui was last used in openSUSE Leap 42.1.
+Provides:       meson-gui = %{version}
+Obsoletes:      meson-gui < %{version}
+%else
 BuildRequires:  bison
+BuildRequires:  clang
 BuildRequires:  cups-devel
 BuildRequires:  flex
 BuildRequires:  gcc-c++
@@ -85,22 +92,20 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(zlib)
 %if 0%{?suse_version} >= 1500
+BuildRequires:  java-headless
 BuildRequires:  libboost_log-devel
 BuildRequires:  libboost_system-devel
 BuildRequires:  libboost_test-devel
 BuildRequires:  libboost_thread-devel
 BuildRequires:  rust
 BuildRequires:  rust-std
+BuildRequires:  wxWidgets-any-devel
+BuildRequires:  mono(csharp)
 %else
 BuildRequires:  boost-devel
+BuildRequires:  mono-core
+BuildRequires:  wxWidgets-devel
 %endif
-%else
-Requires:       ninja
-Requires:       python3-setuptools
-Requires:       python3-xml
-# meson-gui was last used in openSUSE Leap 42.1.
-Provides:       meson-gui = %{version}
-Obsoletes:      meson-gui < %{version}
 %endif
 
 %description
@@ -139,7 +144,7 @@ This package provides support for meson.build files in Vim.
 %patch4 -p1
 %endif
 
-# Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname)
+# Remove static boost tests from "test cases/frameworks/1 boost/".
 sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build
 
 # Disable test of llvm-static libs: openSUSE does not package/ship them
@@ -156,17 +161,16 @@ sed -i "/def test_generate_gir_with_address_sanitizer/s/$/\n        raise unitte
 sed -i '1{/\/usr\/bin\/env/d;}' ./mesonbuild/rewriter.py
 
 %build
-# If this is the test suite, we don't need anything else but the meson package
 %if !%{testsuite}
 python3 setup.py build
 %else
 # Ensure we have no mesonbuild / meson in CWD, thus guaranteeing we use meson in $PATH
-rm -rf meson.py mesonbuild
+rm -r meson.py mesonbuild
 %endif
 
 %install
 # If this is the test suite, we don't need anything else but the meson package
-%if ! %{testsuite}
+%if !%{testsuite}
 python3 setup.py install \
   --root=%{buildroot} --prefix=%{_prefix}
 
@@ -174,11 +178,11 @@ install -Dpm 0644 data/macros.meson \
   %{buildroot}%{_rpmconfigdir}/macros.d/macros.meson
 
 install -Dpm 0644 data/syntax-highlighting/vim/ftdetect/meson.vim \
-  -t %{buildroot}%{vim_data_dir}/site/ftdetect
+  -t %{buildroot}%{vim_data_dir}/site/ftdetect/
 install -Dpm 0644 data/syntax-highlighting/vim/indent/meson.vim \
-  -t %{buildroot}%{vim_data_dir}/site/indent
+  -t %{buildroot}%{vim_data_dir}/site/indent/
 install -Dpm 0644 data/syntax-highlighting/vim/syntax/meson.vim \
-  -t %{buildroot}%{vim_data_dir}/site/syntax
+  -t %{buildroot}%{vim_data_dir}/site/syntax/
 %endif
 
 %if %{testsuite}
@@ -206,11 +210,11 @@ python3 run_tests.py
 %if !%{testsuite}
 %files vim
 %doc data/syntax-highlighting/vim/README
-%dir %{vim_data_dir}
+%dir %{vim_data_dir}/
-%dir %{vim_data_dir}/site
+%dir %{vim_data_dir}/site/
-%dir %{vim_data_dir}/site/ftdetect
+%dir %{vim_data_dir}/site/ftdetect/
-%dir %{vim_data_dir}/site/indent
+%dir %{vim_data_dir}/site/indent/
-%dir %{vim_data_dir}/site/syntax
+%dir %{vim_data_dir}/site/syntax/
 %{vim_data_dir}/site/ftdetect/meson.vim
 %{vim_data_dir}/site/indent/meson.vim
 %{vim_data_dir}/site/syntax/meson.vim