From 93ac91684394c9e6d8870d54fa4e0da4baecf8bbfcbd4825645cc8681bbec3e4 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 8 May 2017 08:38:14 +0000 Subject: [PATCH 1/2] Accepting request 493401 from GNOME:Next Update to 0.40.1 OBS-URL: https://build.opensuse.org/request/show/493401 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=38 --- meson-0.39.1.tar.gz | 3 --- meson-0.39.1.tar.gz.asc | 16 ---------------- meson-0.40.1.tar.gz | 3 +++ meson-0.40.1.tar.gz.asc | 16 ++++++++++++++++ meson.changes | 19 +++++++++++++++++++ meson.spec | 2 +- 6 files changed, 39 insertions(+), 20 deletions(-) delete mode 100644 meson-0.39.1.tar.gz delete mode 100644 meson-0.39.1.tar.gz.asc create mode 100644 meson-0.40.1.tar.gz create mode 100644 meson-0.40.1.tar.gz.asc diff --git a/meson-0.39.1.tar.gz b/meson-0.39.1.tar.gz deleted file mode 100644 index eeefc21..0000000 --- a/meson-0.39.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44885ccfef94d3d4afb1053fa6673ed130d3093fc9e9f6624d08161d8a385220 -size 558914 diff --git a/meson-0.39.1.tar.gz.asc b/meson-0.39.1.tar.gz.asc deleted file mode 100644 index 695024a..0000000 --- a/meson-0.39.1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAljJrtsACgkQO/RpO/7r -lCiLjg//Zbsymr19pq7BbSZzWrWPUzx5IivWUNvtg7Mi7ChUKcn3g9New2J00Uiv -DNT/SNq/75EwIXzqqSm6A9PqoKLRyaPiWImGvFHELllr2VB/nyIzbadBF64s5ncs -CYxLat5SB90yTshXf6F9T4I87mdOLJV75xHfjnhqu5+kmAx9qQd/efFEaOH9hrTS -PWfnciSRS+LgWJ9Ew+66TMVAg7VCRPW866GzTl7gfjdcgW+HebduJkXt8We5IhLf -JAXf1GvcVYJpEdoRqrcGe9gNXfvdHqb1hTjO5tJCVKMJ7SrdYm4U3SwU96KccWXB -DT8LTF3psl/DkjUMvuR6LqL13IDd9lowEGhyDR/z3T9KROSUj14FIiPdPiMzTXvy -jtwCBAtN58yO2knahqw6l3bvoWEOzR3eQ7zvCoj6OK73mYXuZq6+yGEybyYTWINp -RwBaf2JSrIW6++5pQRIAhZW2bf7cinhpQdBYkhlPCt0UEfwPhpqpinOMO8xnQBzI -W2ADyf8Jq88sUCCU/DIbUjWDIcPa9UdWC+YkjljlciwhRDRYUC3ykkQt4MOIahK/ -AOUtFY03W3spAU0EZ6aqCJxKE/egNezVQsqDNFVXZIka5cshAaq5lQzqLSjJsjMG -bTUmm+sPs9hqm2BasWyMinehd73EHgW1htZjMgTQHZD7YX45gxg= -=Z8Al ------END PGP SIGNATURE----- diff --git a/meson-0.40.1.tar.gz b/meson-0.40.1.tar.gz new file mode 100644 index 0000000..f42730d --- /dev/null +++ b/meson-0.40.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:890ce46e713ea0d061f8203c99fa7d38645354a62e4c207c38ade18db852cbf5 +size 584611 diff --git a/meson-0.40.1.tar.gz.asc b/meson-0.40.1.tar.gz.asc new file mode 100644 index 0000000..df1ad2c --- /dev/null +++ b/meson-0.40.1.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlkDiasACgkQO/RpO/7r +lCiP4w/8DUgDaNjIyPxxH44m1BGRMO7Qa23BVRNm6iHCHmaTnXrVUT2YPXibxG+X +QFkMe4f+tEKPJECJZvzUceGLysYfe4Ssu7RcQdOK385NgtCiwzVBDJL/e6CnTdew +5lIRAznyPo9jQ5c7QXfSkjvHc0Mxei+04HFtlN43l4/ysSLEGbRXOWssrQ83dgBz +Xm5c8lX1DZWhlfkD0Qi93sMaNGdTlyhRUvE9iT5vmFGEbaqo6/IJ5z6ffmGzKrY2 +CuSPZgsd8O8qZbKa/68Wk35zMD4pRTTuXIo/oJC8QmLAcIV1P/LyANlMbKgGhFC6 +NXPRF1S2rPdtZZ68GyyOWQ7z7lDcmdln2017I90P5A0pMNDZ1mraB2jkE9yMCt77 +ZiJ6496PKBDOtgfQI8aCePk/XC18Ez2U/M5HdSzmWljU720+J0HJnznuxiV8J3NS +edoIF1FRJC74YQiTmE9BPF13lcq9qAfh2bWNzhUoxIdLuOaN406l025obgjndRzz +p/iZ+jn5yBYaKl0VEd1ci1nJ5F46YCXpCZKQRbpP3EQ3usZddBf2jjMBJueWTESb +3NEjC5HchL4JmV5Ox4mr/8SmdazbcybvLU/CSuWLwj74cqObeDw4mNOWLdYZjy+x +wHrjJyAM9XZ0pkQjmYEY2ok4Q75flrDbekiisxh+CVqiOMwVzZQ= +=XGeZ +-----END PGP SIGNATURE----- diff --git a/meson.changes b/meson.changes index e6b7306..63ee47d 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon May 8 07:53:20 UTC 2017 - dimstar@opensuse.org + +- Update to version 0.40.1: + + Outputs of generators can be used in custom targets in the VS + backend. + + Visual Studio 2017 support. + + Automatic initialization of subprojects that are git + submodules. + + No download mode for wraps. + + Overriding options per target. + + Compiler object get define. + + Cygwin support. + + Multiple install directories. + + Can specify method of obtaining dependencies. + + Link whole contents of static libraries. + + Unity builds only for subprojects. + + Running mesonintrospect from scripts. + ------------------------------------------------------------------- Mon Mar 20 11:21:10 UTC 2017 - dimstar@opensuse.org diff --git a/meson.spec b/meson.spec index ebb19f1..af89255 100644 --- a/meson.spec +++ b/meson.spec @@ -18,7 +18,7 @@ %define _name mesonbuild Name: meson -Version: 0.39.1 +Version: 0.40.1 Release: 0 Summary: Python-based build system License: Apache-2.0 From a374215825b0229faec6dd65a2920bbcdecf910c5555667094a784ac557d3454 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 17 May 2017 21:27:28 +0000 Subject: [PATCH 2/2] Accepting request 495735 from GNOME:Next Fix test suite on ppc64le - so we can move it actually to TW OBS-URL: https://build.opensuse.org/request/show/495735 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=39 --- meson-handle-skipped-tests.patch | 24 ++++++++++++++++++++++++ meson.changes | 6 ++++++ meson.spec | 3 +++ 3 files changed, 33 insertions(+) create mode 100644 meson-handle-skipped-tests.patch diff --git a/meson-handle-skipped-tests.patch b/meson-handle-skipped-tests.patch new file mode 100644 index 0000000..3f8097a --- /dev/null +++ b/meson-handle-skipped-tests.patch @@ -0,0 +1,24 @@ +From d3e0a58260226286c067a7c39f39b704f124813a Mon Sep 17 00:00:00 2001 +From: Jussi Pakkanen +Date: Wed, 17 May 2017 23:11:52 +0300 +Subject: [PATCH] Skip unittests that request it rather than mark them as + failed. Closes #1804. + +--- + run_unittests.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/run_unittests.py b/run_unittests.py +index ec9d53b..2ef1be6 100755 +--- a/run_unittests.py ++++ b/run_unittests.py +@@ -381,6 +381,8 @@ def _run(self, command, workdir=None): + output = p.communicate()[0] + print(output) + if p.returncode != 0: ++ if 'MESON_SKIP_TEST' in output: ++ raise unittest.SkipTest('Project requested skipping.') + raise subprocess.CalledProcessError(p.returncode, command) + return output + + diff --git a/meson.changes b/meson.changes index 63ee47d..0200b1d 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 17 20:26:25 UTC 2017 - dimstar@opensuse.org + +- Add meson-handle-skipped-tests.patch: Actually do skip tests that + are marked as MESON_SKIP_TEST (gh#mesonbuild/meson#1804). + ------------------------------------------------------------------- Mon May 8 07:53:20 UTC 2017 - dimstar@opensuse.org diff --git a/meson.spec b/meson.spec index af89255..d2acf49 100644 --- a/meson.spec +++ b/meson.spec @@ -33,6 +33,8 @@ Patch0: meson-suse-ify-macros.patch Patch1: meson-fix-gcc48.patch # PATCH-FIX-UPSTREAM meson-disable-untested-code.patch gh#mesonbuild/meson#1480 dimstar@opensuse.org -- Do not assume that the untested meson test works with glib 2.52.0 Patch2: meson-disable-untested-code.patch +# PATCH-FIX-UPSTREAM meson-handle-skipped-tests.patch gh#mesonbuild/meson#1804 dimstar@opensuse.org -- Actually do skip tests that are marked as MESON_SKIP_TEST +Patch3: meson-handle-skipped-tests.patch BuildRequires: bison BuildRequires: boost-devel BuildRequires: flex @@ -80,6 +82,7 @@ Domain Specific Language. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Lack of gtest, gmock, gnustep. rm -rf "test cases/frameworks/2 gtest" \