diff --git a/meson-0.55.1.tar.gz b/meson-0.55.1.tar.gz deleted file mode 100644 index 73fd39b..0000000 --- a/meson-0.55.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b5741f884e04928bdfa1947467ff06afa6c98e623c25cef75adf71ca39ce080 -size 1740517 diff --git a/meson-0.55.1.tar.gz.asc b/meson-0.55.1.tar.gz.asc deleted file mode 100644 index 7606360..0000000 --- a/meson-0.55.1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl84KRIACgkQO/RpO/7r -lCjTtA//TYt4PrlN+c81Qpl3Bzk1MUTJD435i2aMTrOap30s7KZLnUJhnjhwMTkG -CZGIcXN9I20pUHXmWdnqPNMdnB411jnjtSx7VzP9/tjmdG69wHKb2C8BD7g8UTr2 -zIyGmSa/VQAEeCIXuKutNxVreRvFdFt8tP8WrQn37zNrXAogLb9TQ0sE/mvzRDzs -O8brztF6rpYZ2owP2W8IAH3xW1wAe4TfzwOVmpPAEeH5OMRpdn602xDXBbx6Zvbf -2jHFJqY8vGmLGpqUEih+vQEQ6oDHakxareUISMmhn2S7WnIEgPmLh6/+N4xNCFYy -vdyJMz1mzEG7aiT9+UxYHEb7iN+MQzqIOcYfwNB3s6KuC23xz+YzW59ev+3VYgjH -h0OVAIfr4l88iUYCuZdDMNjIghERz1yZttstkFvE2OyqPIRhysnv+9fYkkNZCaCQ -R2vCk4b470+XhpcarRFkFrrOaimLyfPpnTBe0bnzGPgui/W6tIzGN2iLoTYSWdM1 -T4iMSiN4RVO4BpfB6kAKbRgtKrUPsglERTW9i8GDdLlU9fIALkJtDvkwaBJs/ibW -JZKDLkNXJGRsrsbMaH3nvNnbmTItHeb9ocdxXBP1h9XNlw8Bn2KtmUN4nwtd+2P3 -Xt8o3KxekEkW6NbxPfOwIragFdv3UaM9qTUQmpUJqH9V109/lsk= -=Etlk ------END PGP SIGNATURE----- diff --git a/meson-0.55.3.tar.gz b/meson-0.55.3.tar.gz new file mode 100644 index 0000000..fb58294 --- /dev/null +++ b/meson-0.55.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5 +size 1740465 diff --git a/meson-0.55.3.tar.gz.asc b/meson-0.55.3.tar.gz.asc new file mode 100644 index 0000000..0cb23e2 --- /dev/null +++ b/meson-0.55.3.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl9bo80ACgkQO/RpO/7r +lCir+A/9ETdoEiQl0VglrSZHmZ5YEGXMWWowZSKvZ4ZJTRunjP/O0yKg5TKxJn+f +5+qVrQH/w7Igasbp84dkUUbMqwsQuzX7NJkCjO5NswRSAS7NNECFM+3otCTsXGrp +2C5V/bmyk8/E8hlVH3+2j0xo50NeCpQhzvTZLIvOoNOgd2uD85WeymnMCwlF0HpV +V2WFE5N4YQQFLMRsUS+3gOlC0A5kOlLzlv9hc8HxzBnvLc0uPSAEBakHixjQl/VS +PKsi3BZNjZABTGxp3UJ7Xo95SMOU48XHuWqw2Vec+Px3EAVLyIC+ByCAgJ3IEOwv +B2XiRbD7X6pPEESFT80KlOrIeNetdy8T2CAaVB1Q2sjY5bi6u+lDZYlapxedubon +5lQivrwwFYe9xe3Ehe+wNMhcjUhJ7u42fyBzNzfMMBn7IGZFcKZQ1APctUDdvs9N +Lwx/cfooJdRhUWE0dGf0U1sWX/RY4ZnjW21slyplHhJzB6PWffoB3H0KvJwdhqxJ +b5gjIJ45IY36VGzHcUhHPSQvtmclZ06CVMg6PX7g9dhvZX6rn0yjq+6ZmzIKdjzW +t+KLybo/ct3nsWWGUKF4TFg0nrRIkhEXkvJ0gXErN0WCxld6dD/Gt800XsOlQsJb +Z2b4mIpfmMUn1MwEXnxZFk1z/l6PdfJsYlRYhh/2CLEq95NzZUk= +=3CN/ +-----END PGP SIGNATURE----- diff --git a/meson.changes b/meson.changes index ed3da27..bd90aef 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Sep 11 17:26:46 UTC 2020 - Dominique Leuenberger + +- Update to version 0.55.3: + + Revert "msvc: enable /std:c11 flag". +- Changes from version 0.55.2: + + msvc: enable /std:c11 flag. + + environment: use ExternalProgram to find ninja. + + CMake module: fix cmake 3.10 compatibility in path generation. +- Drop pr7648-fix-lchmod-check-for-glibc-2.32.patch: fixed + upstream. + ------------------------------------------------------------------- Sat Aug 29 19:08:13 UTC 2020 - Callum Farmer diff --git a/meson.spec b/meson.spec index 699aa5e..605b5e3 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.55.1 +Version: 0.55.3 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -43,8 +43,6 @@ Patch0: meson-suse-ify-macros.patch Patch1: meson-test-installed-bin.patch # PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal@suse.com -- build and install using distutils instead of full setuptools Patch2: meson-distutils.patch -# PATCH-FIX-UPSTREAM pr7648-fix-lchmod-check-for-glibc-2.32.patch gh#mesonbuild/meson#7648 -Patch3: pr7648-fix-lchmod-check-for-glibc-2.32.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-base @@ -164,7 +162,6 @@ This package provides support for meson.build files in Vim. %if !%{with setuptools} %patch2 -p1 %endif -%patch3 -p1 # We do not have gmock available at this moment - can't run the test suite for it rm -r "test cases/frameworks/3 gmock" \ diff --git a/pr7648-fix-lchmod-check-for-glibc-2.32.patch b/pr7648-fix-lchmod-check-for-glibc-2.32.patch deleted file mode 100644 index 5c76940..0000000 --- a/pr7648-fix-lchmod-check-for-glibc-2.32.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 4182ba04775b460ab5a7404f7eaeebe7af0573c9 Mon Sep 17 00:00:00 2001 -From: Daniel Mensinger -Date: Wed, 26 Aug 2020 17:46:35 +0200 -Subject: [PATCH 1/2] tests: fix lchmod check for glibc >= 2.32 (fixes #6784) - ---- - test cases/common/39 has function/meson.build | 20 +++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/test cases/common/39 has function/meson.build b/test cases/common/39 has function/meson.build -index 16f43c4975..26f13d6faa 100644 ---- a/test cases/common/39 has function/meson.build -+++ b/test cases/common/39 has function/meson.build -@@ -54,15 +54,23 @@ foreach cc : compilers - args : unit_test_args), - 'couldn\'t detect "poll" when defined by a header') - lchmod_prefix = '#include \n#include ' -+ has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args) -+ - if host_system == 'linux' -- assert (not cc.has_function('lchmod', prefix : lchmod_prefix, -- args : unit_test_args), -- '"lchmod" check should have failed') -+ glibc_major = cc.get_define('__GLIBC__', prefix: '#include ', args: unit_test_args) -+ glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include ', args: unit_test_args) -+ glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor) -+ message('GLIBC vetsion:', glibc_vers) -+ -+ # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html) -+ if glibc_vers.version_compare('<2.32') -+ assert (not has_lchmod, '"lchmod" check should have failed') -+ else -+ assert (has_lchmod, '"lchmod" check should have succeeded') -+ endif - else - # macOS and *BSD have lchmod -- assert (cc.has_function('lchmod', prefix : lchmod_prefix, -- args : unit_test_args), -- '"lchmod" check should have succeeded') -+ assert (has_lchmod, '"lchmod" check should have succeeded') - endif - # Check that built-ins are found properly both with and without headers - assert(cc.has_function('alloca', args : unit_test_args), - -From 3062fc4251acb440870ba5199780d65a81a5b658 Mon Sep 17 00:00:00 2001 -From: Daniel Mensinger -Date: Wed, 26 Aug 2020 17:47:16 +0200 -Subject: [PATCH 2/2] tests: update .gitignore - ---- - .../157 wrap file should not failed/subprojects/.gitignore | 1 + - test cases/unit/79 user options for subproject/.gitignore | 1 + - 2 files changed, 2 insertions(+) - create mode 100644 test cases/unit/79 user options for subproject/.gitignore - -diff --git a/test cases/common/157 wrap file should not failed/subprojects/.gitignore b/test cases/common/157 wrap file should not failed/subprojects/.gitignore -index 5550e2e0da..aabded6b26 100644 ---- a/test cases/common/157 wrap file should not failed/subprojects/.gitignore -+++ b/test cases/common/157 wrap file should not failed/subprojects/.gitignore -@@ -1,2 +1,3 @@ - /foo-1.0 - /bar-1.0 -+/foo-1.0-patchdir -diff --git a/test cases/unit/79 user options for subproject/.gitignore b/test cases/unit/79 user options for subproject/.gitignore -new file mode 100644 -index 0000000000..0bec5eac13 ---- /dev/null -+++ b/test cases/unit/79 user options for subproject/.gitignore -@@ -0,0 +1 @@ -+/subprojects