From ac2c0a64309143ff1a9efae3651d57e3cc7b1ef617f2a314accd4ab41ba5a827 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sun, 16 Dec 2018 22:15:56 +0000 Subject: [PATCH] - 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 | 3 - meson-0.48.2.tar.gz.asc | 16 ---- meson-0.49.0.tar.gz | 3 + meson-0.49.0.tar.gz.asc | 16 ++++ meson-fix-gcc48.patch | 93 ++++---------------- meson-restore-python3.4.patch | 155 +++++++++++++++------------------ meson-suse-fix-llvm-3.8.patch | 19 +++- meson-test-installed-bin.patch | 28 ++++-- meson-testsuite.changes | 11 +++ meson-testsuite.spec | 54 ++++++------ meson.changes | 11 +++ meson.spec | 54 ++++++------ 12 files changed, 222 insertions(+), 241 deletions(-) delete mode 100644 meson-0.48.2.tar.gz delete mode 100644 meson-0.48.2.tar.gz.asc create mode 100644 meson-0.49.0.tar.gz create mode 100644 meson-0.49.0.tar.gz.asc diff --git a/meson-0.48.2.tar.gz b/meson-0.48.2.tar.gz deleted file mode 100644 index ae1946e..0000000 --- a/meson-0.48.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39ead8bfd0dc9c7b0af15e23ea975c864600bf871fba279c9918625bb9a85506 -size 1310363 diff --git a/meson-0.48.2.tar.gz.asc b/meson-0.48.2.tar.gz.asc deleted file mode 100644 index a7c4aa7..0000000 --- a/meson-0.48.2.tar.gz.asc +++ /dev/null @@ -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----- diff --git a/meson-0.49.0.tar.gz b/meson-0.49.0.tar.gz new file mode 100644 index 0000000..cb3c6be --- /dev/null +++ b/meson-0.49.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb0395c4ac208eab381cd1a20571584bdbba176eb562a7efa9cb17cace0e1551 +size 1338583 diff --git a/meson-0.49.0.tar.gz.asc b/meson-0.49.0.tar.gz.asc new file mode 100644 index 0000000..81f1d0b --- /dev/null +++ b/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----- diff --git a/meson-fix-gcc48.patch b/meson-fix-gcc48.patch index e590c35..b7bb7c5 100644 --- a/meson-fix-gcc48.patch +++ b/meson-fix-gcc48.patch @@ -1,80 +1,19 @@ ---- a/mesonbuild/compilers/cpp.py -+++ b/mesonbuild/compilers/cpp.py -@@ -137,8 +137,8 @@ class ClangCPPCompiler(ClangCompiler, CP - def get_options(self): - 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++11', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'], -+ ['none', 'c++98', 'c++03', 'c++11', 'c++1y', 'c++14', 'c++17', 'c++1z', 'c++2a', -+ 'gnu++11', 'gnu++1y', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'], - 'none')}) - return opts - -@@ -168,8 +168,8 @@ class ArmclangCPPCompiler(ArmclangCompil - def get_options(self): - 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', -- '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/common/152 simd/simdchecker.c" ++++ "b/test cases/common/152 simd/simdchecker.c" +@@ -10,11 +10,12 @@ int check_simd_implementation(float *fou + const float *expected, + simd_func fptr, + const int blocksize) { ++ int i; + int rv = 0; + memcpy(four, four_initial, blocksize*sizeof(float)); + printf("Using %s.\n", simd_type); + fptr(four); +- for(int i=0; i= (3, 5): + p = subprocess.run(command, stdout=subprocess.PIPE, -+ stderr=subprocess.STDOUT, env=os.environ.copy(), -+ universal_newlines=True, ++ env=os.environ.copy(), 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: -+ po = subprocess.check_output(command, stderr=subprocess.STDOUT, -+ env=os.environ.copy(), -+ universal_newlines=True, -+ cwd=workdir, timeout=60 * 5) -+ except subprocess.CalledProcessError as e: -+ print(e.output) -+ 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) ++ p = subprocess.Popen(command, stdout=subprocess.PIPE, ++ env=os.environ.copy(), universal_newlines=True, ++ cwd=workdir) ++ p.stdout = p.communicate(timeout=60 * 5)[0] + print(p.stdout) + if p.returncode != 0: + raise subprocess.CalledProcessError(p.returncode, command) --- a/run_unittests.py +++ b/run_unittests.py -@@ -21,6 +21,7 @@ import tempfile - import textwrap - import os - import shutil -+import sys - import unittest - import platform - from itertools import chain -@@ -892,6 +893,24 @@ class DataTests(unittest.TestCase): +@@ -956,6 +956,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, -+ timeout=60 * 5) ++ universal_newlines=True, cwd=workdir, 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__': diff --git a/meson-suse-fix-llvm-3.8.patch b/meson-suse-fix-llvm-3.8.patch index 37120ce..72712fc 100644 --- a/meson-suse-fix-llvm-3.8.patch +++ b/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): diff --git a/meson-test-installed-bin.patch b/meson-test-installed-bin.patch index 71ffb1b..ddca6c9 100644 --- a/meson-test-installed-bin.patch +++ b/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__': - env['COVERAGE_PROCESS_START'] = '.coveragerc' - env['PYTHONPATH'] = os.pathsep.join([td] + env.get('PYTHONPATH', [])) +@@ -296,12 +288,12 @@ def main(): + else: + env['PYTHONPATH'] = temp_dir if not cross: -- returncode += subprocess.call(mesonlib.python_command + ['run_meson_command_tests.py', '-v'], env=env) -+ #returncode += subprocess.call(mesonlib.python_command + ['run_meson_command_tests.py', '-v'], env=env) - returncode += subprocess.call(mesonlib.python_command + ['run_unittests.py', '-v'], env=env) - returncode += subprocess.call(mesonlib.python_command + ['run_project_tests.py'] + sys.argv[1:], env=env) - else: +- 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_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'] diff --git a/meson-testsuite.changes b/meson-testsuite.changes index 498b441..f5a1a21 100644 --- a/meson-testsuite.changes +++ b/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 diff --git a/meson-testsuite.spec b/meson-testsuite.spec index fd971f1..a8dc721 100644 --- a/meson-testsuite.spec +++ b/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}/site -%dir %{vim_data_dir}/site/ftdetect -%dir %{vim_data_dir}/site/indent -%dir %{vim_data_dir}/site/syntax +%dir %{vim_data_dir}/ +%dir %{vim_data_dir}/site/ +%dir %{vim_data_dir}/site/ftdetect/ +%dir %{vim_data_dir}/site/indent/ +%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 diff --git a/meson.changes b/meson.changes index 498b441..f5a1a21 100644 --- a/meson.changes +++ b/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 diff --git a/meson.spec b/meson.spec index f560d5d..d6fc8b3 100644 --- a/meson.spec +++ b/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}/site -%dir %{vim_data_dir}/site/ftdetect -%dir %{vim_data_dir}/site/indent -%dir %{vim_data_dir}/site/syntax +%dir %{vim_data_dir}/ +%dir %{vim_data_dir}/site/ +%dir %{vim_data_dir}/site/ftdetect/ +%dir %{vim_data_dir}/site/indent/ +%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