From 5553d51514d5f9b6c5f704d93e47f9a9070f57bf805ca793ee04bef640e30469 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 19 Jul 2023 11:40:04 +0000 Subject: [PATCH] Accepting request 1099192 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/1099192 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=255 --- meson-1.1.1.tar.gz | 3 --- meson-1.1.1.tar.gz.asc | 16 -------------- meson-1.2.0.tar.gz | 3 +++ meson-1.2.0.tar.gz.asc | 16 ++++++++++++++ meson-test-installed-bin.patch | 4 ++-- meson.changes | 40 ++++++++++++++++++++++++++++++++++ meson.spec | 7 +++--- 7 files changed, 65 insertions(+), 24 deletions(-) delete mode 100644 meson-1.1.1.tar.gz delete mode 100644 meson-1.1.1.tar.gz.asc create mode 100644 meson-1.2.0.tar.gz create mode 100644 meson-1.2.0.tar.gz.asc diff --git a/meson-1.1.1.tar.gz b/meson-1.1.1.tar.gz deleted file mode 100644 index 8a939f8..0000000 --- a/meson-1.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c -size 2125503 diff --git a/meson-1.1.1.tar.gz.asc b/meson-1.1.1.tar.gz.asc deleted file mode 100644 index 73ac576..0000000 --- a/meson-1.1.1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmRvsIoACgkQwk5jG6ux -/nCPDxAArNzU+eYR++A5uu3EWapVYbxfk2l5WgpzHyTPu/BxfqOWtraXqHWI/vAU -uRJjxQqx1IvUZYC1W2mfJCC8u80HHHqjTmPetHUz2izXx2zje7fHQY4tsLu25vpc -mBZO1rkCuiKKaLkTdbLJ5E0q8tgJGk81ziWKBrWcO9/hEnYYqkJsUUNr+91X+VIA -CTKYVpW47+wzm/JwQIHpq7dOIxykQCEeYgTD1BYuWcCb3dJgCjDVaTGROEkKB9ip -ydoayRlm+mVV5ETJWstZAonofNl1+hzwjCF94pnf6+hWkD80At5DJzr4pSVSwLET -PwgP7fXNIqwmcYQb0eDR+tebOaJoINmUna42Drqd3jJg0CnOZFagIOD2KbPqlQa6 -9dMjR23EAapEczJdS7ox/Zajdz6gGezM4jkzQyRLsw0GChV/UVeDaCIhptWWDOoH -b0FCgn3hZhevW6ZoqHY1VDwixoA9bx8v/Mi/lp7YeJ0SFSH2tzISCNclXqZiw6XB -e5tv87dUXMI9hAT6MqUkKgtnxTPOgu6iGLD8xLEgmKr4H0KL9YI1ZONQALzdiqTX -L9SgD9DKEK+sf8xqitpwPei5Vt5O0kmxLs7IoK7K9UW1MQ/y16tXgRUsI8vpEPpi -gJv4Jr8wcXIoo2cYwgDe0bVJA2gvHQMPGcJGTYrdRDkPOdH+Nuo= -=xUy3 ------END PGP SIGNATURE----- diff --git a/meson-1.2.0.tar.gz b/meson-1.2.0.tar.gz new file mode 100644 index 0000000..7869927 --- /dev/null +++ b/meson-1.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c0b634fe6b6a7072e398647f1bf392048577068a5c92ae44d04085dab0ded6f +size 2182568 diff --git a/meson-1.2.0.tar.gz.asc b/meson-1.2.0.tar.gz.asc new file mode 100644 index 0000000..99d259b --- /dev/null +++ b/meson-1.2.0.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmS0X6gACgkQwk5jG6ux +/nBeCg/9HRtJhFuR9V0mUeZ08NE3m58vtlHYnF7B2d77iHdCtNFYMV+4nwEstBMD +kNIqbXGFiitFgG0ssG5u7dQOunDlIrmpi02NZCR0ZWtiTYMVuc5vgzu+bjPhiVM+ +3D7N4oHWjYNzDBp16mIqpLrY7NT4zKFvOf/cKrmvtsxi3f1Xws36Y94SOj71E5wl +8zKeUJ4OO3FkPnmlYuWW6Hg2+X/ILL065sayUG9JB2zBOdiNDil9S01m9NmbB7xx +s0swk55FnYrXTgrcVnQ+tcw1y9/wZZxJXWYaIyX/gGKfnKcc3yflPIqwvc8u6dcU +6r+6THpvWJ1O3qRiz9EI+SIyYQL8VZvU1QNUpSkUJAfSjcHOUEloLCIZQlzm03gq +LtMRG1LcxPLYa97VVUp04sL/Fxapo1NMmRd5DIm13H+3I5H/Oytb/YpzcSqOeM+e +5G+Rz8C+v+IVnVECzLhi9Ep0XByMoN3nFGamqMtcGIjNvyhACUgU1KVAiUXzFacy +7YL9whQwKbfdKJ477kMwzZ+JrOT3VW8/TWbvGdPqpsopUM3N/i8fMdgStD3u+9Yr +e1ZnZimrG3mxlzkDwjVVIf2x0T6E9AGzr7bf7DLZVWlZnQvY1b0jBzLEeJj/eGiC +US5/K2tJBVGTO9Ozrjtug3SGsO7HNlFm+J9LIm6Bh2xIy/Blbm8= +=lwe/ +-----END PGP SIGNATURE----- diff --git a/meson-test-installed-bin.patch b/meson-test-installed-bin.patch index 6a4e247..d2182fb 100644 --- a/meson-test-installed-bin.patch +++ b/meson-test-installed-bin.patch @@ -1,7 +1,7 @@ Index: meson-1.0.1/run_tests.py =================================================================== ---- meson-1.0.1.orig/run_tests.py -+++ meson-1.0.1/run_tests.py +--- a/run_tests.py ++++ b/run_tests.py @@ -196,18 +196,10 @@ def get_meson_script() -> str: Also used by run_unittests.py to determine what meson to run when not running in-process (which is the default). diff --git a/meson.changes b/meson.changes index 754445a..db40ce4 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Mon Jul 17 00:10:47 UTC 2023 - Luciano Santos + +- Update to version 1.2.0: + + This release bring many new features. + + Added Metrowerks C/C++ toolchains. Note that the implementation + is somewhat experimental yet. + + Added str.splitlines method that can be used to split a string + into an array of lines. + + declare_dependency has a new extra_files keyword, to add extra + files to a target. + + Added a new '--genvslite' option for use with 'meson setup + ...'. + + gnome.generate_gir() now accepts the env kwarg which lets you + set environment variables. + + More data in introspection files. + + Machine objects get kernel and subsystem properties. + + default_options and override_options may now be dictionaries. + + New override of find_program('meson'). + + Python module can now compile bytecode. + + rust.bindgen allows passing extra arguments to rustc. This + may be necessary to pass extra cfgs or to change warning + levels. + + Support for defining crate names of Rust dependencies in Rust + targets. + + A machine file may be used to pass extra arguments to clang + in a bindgen call. + + Add a link_with keyword to rust.test(). This can already be + worked around by creating declare_dependency() objects to pass + to the dependencies keyword, but this cuts out the middle man. + + Rust now supports the b_ndebug option. Which controls the + debug_assertions cfg, which in turn controls debug_assert!() + macro. + + Wildcards in list of tests to run. The meson test command now + accepts wildcards in the list of test names. + + New for the generation of Visual Studio vcxproj projects. + + For more details about all those changes, please visit: + https://mesonbuild.com/Release-notes-for-1-2-0.html +- Refresh patches with Quilt. + ------------------------------------------------------------------- Fri Jul 14 10:01:09 UTC 2023 - Dominique Leuenberger diff --git a/meson.spec b/meson.spec index 2da344d..5a968a8 100644 --- a/meson.spec +++ b/meson.spec @@ -35,7 +35,7 @@ %bcond_with setuptools %bcond_without mono Name: meson%{name_ext} -Version: 1.1.1 +Version: 1.2.0 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -256,11 +256,12 @@ ln -s /usr/bin/g++-12 bin/c++ ln -s /usr/bin/g++-12 bin/g++ ln -s /usr/bin/gcc-12 bin/cc ln -s /usr/bin/gcc-12 bin/gcc -export PATH="$(pwd)/bin:${PATH}" +export PATH="${PWD}/bin:${PATH}" c++ --version # Fix shebang in test cases getting executed by ninja -%python_expand find test\ cases -type f -name "*.py" -exec sed -i "1s@#!.*python.*@#!$(realpath %{_bindir}/$python)@" {} + +%python_expand find test\ cases -type f -name "*.py" \ + -exec sed -i "1s@#!.*python.*@#!$(realpath %{_bindir}/$python)@" {} + %endif export LANG=C.UTF-8