From a6d426ee78e776ff412035f45e342cf2d6c2ac0b5ca9f265779c07a48d41c06e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 15 Jul 2020 12:23:12 +0000 Subject: [PATCH] Accepting request 821061 from home:gmbr3:testing - Update to version 0.55.0 + rpath removal now more careful + Added ability to specify targets in `meson compile` + Added test protocol for gtest + meson.add_*_script methods accept new types + Native and cross files now support string and list concatenation + Ability to configure CMake subprojects with meson.subproject_options + find_program: Fixes when the program has been overridden by executable + Response files enabled on Linux + `unstable-kconfig` module renamed to `unstable-keyval` + Config tool based dependencies no longer search PATH for cross compiling + String concatenation in meson_options.txt + Clang coverage support + Implicit dependency fallback + Added ability to specify backend arguments in `meson compile` - Removed meson-fix-gnome-test.patch: contained in upstream - Changed meson-suse-ify-macros.patch: to be compatible with new version OBS-URL: https://build.opensuse.org/request/show/821061 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=179 --- meson-0.54.3.tar.gz | 3 --- meson-0.54.3.tar.gz.asc | 16 -------------- meson-0.55.0.tar.gz | 3 +++ meson-0.55.0.tar.gz.asc | 16 ++++++++++++++ meson-fix-gnome-test.patch | 32 ---------------------------- meson-suse-ify-macros.patch | 42 +++++++++++++++++++------------------ meson.changes | 22 +++++++++++++++++++ meson.spec | 5 +---- 8 files changed, 64 insertions(+), 75 deletions(-) delete mode 100644 meson-0.54.3.tar.gz delete mode 100644 meson-0.54.3.tar.gz.asc create mode 100644 meson-0.55.0.tar.gz create mode 100644 meson-0.55.0.tar.gz.asc delete mode 100644 meson-fix-gnome-test.patch diff --git a/meson-0.54.3.tar.gz b/meson-0.54.3.tar.gz deleted file mode 100644 index 5088318..0000000 --- a/meson-0.54.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662 -size 1690919 diff --git a/meson-0.54.3.tar.gz.asc b/meson-0.54.3.tar.gz.asc deleted file mode 100644 index cb04f30..0000000 --- a/meson-0.54.3.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl7nrU8ACgkQO/RpO/7r -lCgctQ//aaBmSPDXNxXuIbJBrfVT+yOqibmzqq1GC5ut2p2zi2JQqG8C+x0yqI/s -GMWubAnfXcmnSDITVH+6zN2fs2J4ejftZzxUF+oruvwztr6QtNmbkXZ43H5tsAJu -Q2eSou4sEmlEIW193uflkohgRUVXcbPS9TRwq33h09sEVIGE2zboYvdN9E9C4AVV -mlOsXmAtdZT3y3QLgnzvOXd+9gRz/QPjFECpkJJeKx/pPFEwWpkbi5b2XTH1CVmo -0QuZzL1YbUB7RhlkZAkpXoYyoaFg3wHTc5CfOgCsoTxfxpjzilhIsdXGzEgbeGfm -Wja5Cp0aoYahPKEVY9FeQtImsxz4aFuX7c+T70yLmDw0TFR6ezCpg5H84GLR34HP -gtpcPNuH6o19JsBar/7bXgbYcREt1fRHSVnsIjE17l/Ogf2keknW+zdiO85H45DC -MdlRi2CNRPcEwfiGV+0tfRC1vqowyg1i6zLyQm0Sill2Xu5tWzutsbxOXBPQnFzn -N8fSQHb510+9JIibBO5APB+1Zmg8SqRv21350aKi+1vNncOQTnkoz4uRx4j5Z7bH -D/L8PwwClM59e32/CWPpr0zGNgdFDeXoQQ/X0GUoZKlQ9uSPYtzQl6kO9CuiOkWA -OtB9tLosyf0BZHlNwf304+3EnDCJY3e1kbZDWyc+ja7ZwIquhiw= -=qN7q ------END PGP SIGNATURE----- diff --git a/meson-0.55.0.tar.gz b/meson-0.55.0.tar.gz new file mode 100644 index 0000000..a8ec0dc --- /dev/null +++ b/meson-0.55.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35 +size 1742882 diff --git a/meson-0.55.0.tar.gz.asc b/meson-0.55.0.tar.gz.asc new file mode 100644 index 0000000..5eadca0 --- /dev/null +++ b/meson-0.55.0.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl8LJuoACgkQO/RpO/7r +lChofw//QDF0raThfyJjZZeMZ9jNKr7xosgS/idAGSBjRmWCOFkKkPhbPqTCzChQ +fgItk44CN9lma4AjftQIlZcdCo2CgZDgH+SFbWRtuxAbN0MX4auiIHlfPL4uNPMn +9dm9nLxkF0B0ZBvo8c7OW5fDNuLTEL+4DMmbY7ypb+pYqc6C/JdcrGF8yTeZ9EYR +Vff07pdJcuipI0SlfnTu5v/SV0p2AX9/edAzmOUVpKY13x/qnz3ds2emDjILAE54 +H50aof9TYhzKSdqyftkz9OUa+JqRyRRnkp7KDOj0rXBogfq4Vi+5CGAXkYXWppku +JTQk8SEZmVP6plzGCJlVeTfITtiuK4tRAAQgn4xfU8HjpceQR9Ypab1U1tcpV8/K +TcuvvHx7pWoSjrTmxoIhdTKtIIajI1s8zyZG8fxS9qwCvnC/SGNdAUcCPkjRpbTj +zmy9XanCNxAZpjpa8KV4t88Lp1U3b301YT0SEkFGD3r5NyTzfr+A+laIUVmHJmwq +4BN99BVJi+cIsc8WAdDOikJVlW82Qq29KLiczsHfGObe2OrUvEraPCF82zRldfsm +oAQ8Bu6EHo4b1DXtXjXmzEAS25qqY7cNLoLmFzH7CWA903Lfbk8VIFzyGkJvu79l +GRLdAZ6pOsIM1/fCqwG93ZuXFqTUtzv3uoBZ3kbjWmTtWHSAtYo= +=ITLc +-----END PGP SIGNATURE----- diff --git a/meson-fix-gnome-test.patch b/meson-fix-gnome-test.patch deleted file mode 100644 index 0ca3dcd..0000000 --- a/meson-fix-gnome-test.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5157ef0f2c8ca4074d91e345b53abe60f014b543 Mon Sep 17 00:00:00 2001 -From: Mike Gorse -Date: Fri, 26 Jun 2020 11:45:30 -0500 -Subject: [PATCH] test: fix enum generation for GNOME - -Fixes: #7252 ---- - test cases/frameworks/7 gnome/mkenums/meson.build | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/test cases/frameworks/7 gnome/mkenums/meson.build b/test cases/frameworks/7 gnome/mkenums/meson.build -index af4a9017e..3d7adf052 100644 ---- a/test cases/frameworks/7 gnome/mkenums/meson.build -+++ b/test cases/frameworks/7 gnome/mkenums/meson.build -@@ -126,6 +126,14 @@ enums5 = gnome.mkenums_simple('enums5', sources : 'meson-sample.h', - install_header : true, - decorator : 'MESON_EXPORT', - header_prefix : '#include "meson-decls.h"') -+ -+conf = configuration_data() -+conf.set('ENUM_FILE', 'enums5.h') -+main = configure_file( -+ input : 'main.c', -+ output : 'main5.c', -+ configuration : conf) -+ - enumexe5 = executable('enumprog5', main, enums5, dependencies : gobj) - - # Generate template then use as input to mkenums --- -2.27.0 - diff --git a/meson-suse-ify-macros.patch b/meson-suse-ify-macros.patch index b94446d..8fe3a57 100644 --- a/meson-suse-ify-macros.patch +++ b/meson-suse-ify-macros.patch @@ -1,19 +1,14 @@ -Index: meson-0.51.0/data/macros.meson +Index: meson-0.55.0/data/macros.meson =================================================================== ---- meson-0.51.0.orig/data/macros.meson -+++ meson-0.51.0/data/macros.meson -@@ -1,6 +1,8 @@ +--- meson-0.55.0.orig/data/macros.meson ++++ meson-0.55.0/data/macros.meson +@@ -1,9 +1,15 @@ %__meson %{_bindir}/meson %__meson_wrap_mode nodownload %__meson_auto_features enabled +%_vpath_srcdir . +%_vpath_builddir build - - %_smp_mesonflags %([ -z "$MESON_BUILD_NCPUS" ] \\\ - && MESON_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\ -@@ -9,7 +11,11 @@ - if [ "$MESON_BUILD_NCPUS" -gt 1 ]; then echo "--num-processes $MESON_BUILD_NCPUS"; fi) - + %meson \ - %set_build_flags \ + export LANG=C.UTF-8 \ @@ -24,19 +19,26 @@ Index: meson-0.51.0/data/macros.meson %{shrink:%{__meson} \ --buildtype=plain \ --prefix=%{_prefix} \ -@@ -31,12 +37,15 @@ - %{nil}} - +@@ -25,6 +31,7 @@ + %{nil}} + %meson_build \ -+ export LANG=C.UTF-8 \ - %ninja_build -C %{_vpath_builddir} - ++ export LANG=C.UTF-8 \ + %{shrink:%{__meson} compile \ + -C %{_vpath_builddir} \ + -j %{_smp_build_ncpus} \ +@@ -32,12 +39,14 @@ + %{nil}} + %meson_install \ + export LANG=C.UTF-8 \ - %ninja_install -C %{_vpath_builddir} - + %{shrink:DESTDIR=%{buildroot} %{__meson} install \ + -C %{_vpath_builddir} \ + --no-rebuild \ + %{nil}} + %meson_test \ + export LANG=C.UTF-8 \ - %{shrink: %{__meson} test \ + %{shrink:%{__meson} test \ -C %{_vpath_builddir} \ - %{?_smp_mesonflags} \ + --num-processes %{_smp_build_ncpus} \ diff --git a/meson.changes b/meson.changes index 561d1c3..0afbb09 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Jul 15 09:00:59 UTC 2020 - Callum Farmer + +- Update to version 0.55.0 + + rpath removal now more careful + + Added ability to specify targets in `meson compile` + + Added test protocol for gtest + + meson.add_*_script methods accept new types + + Native and cross files now support string and list concatenation + + Ability to configure CMake subprojects with meson.subproject_options + + find_program: Fixes when the program has been overridden by executable + + Response files enabled on Linux + + `unstable-kconfig` module renamed to `unstable-keyval` + + Config tool based dependencies no longer search PATH for cross compiling + + String concatenation in meson_options.txt + + Clang coverage support + + Implicit dependency fallback + + Added ability to specify backend arguments in `meson compile` +- Removed meson-fix-gnome-test.patch: contained in upstream +- Changed meson-suse-ify-macros.patch: to be compatible with new version + + ------------------------------------------------------------------- Fri Jun 26 16:51:35 UTC 2020 - Michael Gorse diff --git a/meson.spec b/meson.spec index 1d6dd56..316fa2d 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.54.3 +Version: 0.55.0 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -49,8 +49,6 @@ Patch3: meson-suse-fix-llvm-3.8.patch Patch4: meson-fix-gcc48.patch # PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal@suse.com -- build and install using distutils instead of full setuptools Patch5: meson-distutils.patch -# PATCH-FIX-UPSTREAM meson-fix-gnome-test.patch bsc#1173025 mgorse@suse.com -- fix GNOME test that sometimes fails. -Patch6: meson-fix-gnome-test.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-base @@ -175,7 +173,6 @@ This package provides support for meson.build files in Vim. %if !%{with setuptools} %patch5 -p1 %endif -%patch6 -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" \