diff --git a/meson-0.47.1.tar.gz b/meson-0.47.1.tar.gz deleted file mode 100644 index c0eccbf..0000000 --- a/meson-0.47.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d673de79f7bab064190a5ea06140eaa8415efb386d0121ba549f6d66c555ada6 -size 1250085 diff --git a/meson-0.47.1.tar.gz.asc b/meson-0.47.1.tar.gz.asc deleted file mode 100644 index 7185fe0..0000000 --- a/meson-0.47.1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAltFJOwACgkQO/RpO/7r -lCh8uw/9G4iCqBmGv6RNGqQVmUKd5Ef5NmsZPGFUXL1wb01AcvryLxe0DmHdsBKr -xQHyeb80SKUdCg3KZiCZkUSssJO80IItsaxn5b/b1/XSVUwFyLB5S7wcImOVy1sr -MGsnW4tUhCCg6GRjWYKRCV7SvPoP5Y00rFBpEjw/lPgPjPZahs0vo8+uG8vTc3SO -UdtTXL9sWzHbcgqX5W/REY0ML7sao2BOh71iCovZW3mz7K7XAAM7cANoi+faCgit -MdKslapxMTeKb72rNwUy4r+YDPy1an0EAvpNG8/NjS9S5GjChZ/pIY6K0OPQHXnc -q6oSXDwxnNu7gjS+1eRI5QNl9JWCyH/ByRDKaiy6iwB3A3KChQtmYrSaz+Slf/FK -IR8hM90PBiSjpfZBJvni4QQPzETKWPSWutCVxTFNeplc7Youu3joeYn4Z3eGJ8W4 -IVQ3V/wgEG6yy6iWsYIFThydSb34gu+uHCxuQZrfNinF/ONv6W+U2xou/0l6AJSI -LyagXrY+0IzUhibfAJ6L2ZLx0Q+OiX/qH2TNoh7S690mfPMbacxcpLG98Jz37UWd -9AZfKNItwvnm8fEmpH1Hq0kOyH3LQwmBbAjz0hTVqr4jEKDn/Vb376isrugx81lY -+7IOzQVhKurKvtKQWPLzRCgR6FC1n6AJkF6XyY2XE3TswlqJAWE= -=Brwv ------END PGP SIGNATURE----- diff --git a/meson-0.47.2.tar.gz b/meson-0.47.2.tar.gz new file mode 100644 index 0000000..46bb84f --- /dev/null +++ b/meson-0.47.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb +size 1267981 diff --git a/meson-0.47.2.tar.gz.asc b/meson-0.47.2.tar.gz.asc new file mode 100644 index 0000000..7922557 --- /dev/null +++ b/meson-0.47.2.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAluBEusACgkQO/RpO/7r +lCjyFhAAri6uNRpBQ963TaJo8NX7KfpS8SFU3Bt+HS1NKF69j3IKP/+097GOQffI +RoGs07zSJ3IKhico9tB64ToFlk7fJbvUITiSP0NDSkGVnVaK6Fcn8/FDM937I+8N +R2P5uLS4xMw0/VqiFAosysYFuWeIkUNdltW/PM3J4aXKNwi2MnGukUnFNMKHH/3O +sIaHAKVuYSIM+CJSXZKumjT/arw3qAvSNz/Kmo8MsGG4+pYyQDLZ16evDTfxELKW +4MvUSpaspQi7X/J78HIyakUfc2DiVYV9pGEsMvJ4+1hg6IwiXjRmzTpYY3q3LDU4 +mJPC5JovdbvS3lByE364ovOBYLLn8D0pP8jALWARzYq2E2Ue/+ATyiELw8ZQ21yw +GMo5Bh0efZ7TkL8kC++zpbJayN13IdiRT6CfpUh5Dew2QK+a3fwnBr/1zWGrHB4M +7uuZtSzq5H8g8LD/CqwUf1ohdAY4k4MVPuEdVvoWzzAiqYIhTXIFHuaYJW5cVVtn +vsGknWUuvsc5e+Cp/qwac+LjKJA308/k+aaAhxAP7oFDgWT6+VrTitIn7TWzFS+p +mtVwsQpKFT0PMuAFYnWLJCGpeAmReD5B1K0e4ULYSSl4MI9AysV8oIPQtmqeyi9z +1AeN64X0e55qBVptIa4IuT434bZe+RkTtnsvwwzLd86dMbbWACo= +=suvK +-----END PGP SIGNATURE----- diff --git a/meson-fix-gcc48.patch b/meson-fix-gcc48.patch index 5715f45..6137d0b 100644 --- a/meson-fix-gcc48.patch +++ b/meson-fix-gcc48.patch @@ -15,9 +15,9 @@ 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' +- ['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' ++ ['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 @@ -75,17 +75,6 @@ # 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/200 check header/meson.build" -+++ "b/test cases/common/200 check header/meson.build" -@@ -33,7 +33,7 @@ foreach comp : [meson.get_compiler('c'), - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80005 - # https://github.com/mesonbuild/meson/issues/1458 - if host_system == 'linux' -- assert(comp.check_header('linux/if.h', prefix : fallback), -+ assert(comp.check_header('linux/if.h', prefix : '#include ' + fallback), - 'Could not find ') - if comp.has_header('intrin.h', prefix : fallback) - assert(not comp.check_header('intrin.h'), --- "a/test cases/unit/16 prebuilt shared/patron.c" +++ "b/test cases/unit/16 prebuilt shared/patron.c" @@ -5,4 +5,5 @@ int main(int argc, char **argv) { diff --git a/meson-restore-python3.4.patch b/meson-restore-python3.4.patch index c1809f9..ef2e8aa 100644 --- a/meson-restore-python3.4.patch +++ b/meson-restore-python3.4.patch @@ -31,7 +31,7 @@ from .mesonlib import default_libdir, default_libexecdir, default_prefix import ast import argparse -@@ -299,7 +299,7 @@ class CoreData: +@@ -300,7 +300,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. @@ -88,7 +88,7 @@ return 1 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py -@@ -305,8 +305,8 @@ class Installer: +@@ -353,8 +353,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...') @@ -136,10 +136,10 @@ import unittest import subprocess +import sys + import zipapp from pathlib import Path - from mesonbuild.mesonlib import windows_proof_rmtree, python_command, is_windows -@@ -71,13 +72,27 @@ class CommandTests(unittest.TestCase): +@@ -73,13 +74,27 @@ 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. @@ -184,9 +184,9 @@ import unittest from unittest import mock from configparser import ConfigParser -@@ -601,6 +602,24 @@ class InternalTests(unittest.TestCase): - 'mesonbuild.compilers.c.for_windows', true): - self._test_all_naming(cc, env, patterns, 'windows-msvc') +@@ -689,6 +690,24 @@ class InternalTests(unittest.TestCase): + PkgConfigDependency.pkgbin_cache = {} + PkgConfigDependency.class_pkgbin = None + def test_commonpath(self): + from os.path import sep @@ -209,7 +209,7 @@ class BasePlatformTests(unittest.TestCase): def setUp(self): -@@ -681,9 +700,16 @@ class BasePlatformTests(unittest.TestCas +@@ -769,9 +788,16 @@ 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. @@ -229,7 +229,7 @@ print(p.stdout) if p.returncode != 0: if 'MESON_SKIP_TEST' in p.stdout: -@@ -2409,17 +2435,30 @@ recommended as it is not supported on so +@@ -2497,17 +2523,30 @@ recommended as it is not supported on so of = open(mfile, 'w') of.write("project('foobar', 'c')\n") of.close() diff --git a/meson-testsuite.changes b/meson-testsuite.changes index 9703382..03f3f56 100644 --- a/meson-testsuite.changes +++ b/meson-testsuite.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Aug 25 17:52:38 UTC 2018 - sor.alexei@meowr.ru + +- Update to version 0.47.2: + * https://github.com/mesonbuild/meson/milestone/29?closed=1 +- Rebase meson-restore-python3.4.patch, meson-fix-gcc48.patch. + ------------------------------------------------------------------- Fri Aug 3 21:00:12 UTC 2018 - sor.alexei@meowr.ru diff --git a/meson-testsuite.spec b/meson-testsuite.spec index d39980a..68264b8 100644 --- a/meson-testsuite.spec +++ b/meson-testsuite.spec @@ -24,7 +24,7 @@ %endif %define _name mesonbuild Name: meson%{name_ext} -Version: 0.47.1 +Version: 0.47.2 Release: 0 Summary: Python-based build system License: Apache-2.0 diff --git a/meson.changes b/meson.changes index 9703382..03f3f56 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Aug 25 17:52:38 UTC 2018 - sor.alexei@meowr.ru + +- Update to version 0.47.2: + * https://github.com/mesonbuild/meson/milestone/29?closed=1 +- Rebase meson-restore-python3.4.patch, meson-fix-gcc48.patch. + ------------------------------------------------------------------- Fri Aug 3 21:00:12 UTC 2018 - sor.alexei@meowr.ru diff --git a/meson.spec b/meson.spec index dbe98a0..8dc9f75 100644 --- a/meson.spec +++ b/meson.spec @@ -24,7 +24,7 @@ %endif %define _name mesonbuild Name: meson%{name_ext} -Version: 0.47.1 +Version: 0.47.2 Release: 0 Summary: Python-based build system License: Apache-2.0