From 0863ab893b877070cd0c6f0e9047990fca67826b25d9712cbdf631e7af368e10 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 3 Jul 2019 07:24:00 +0000 Subject: [PATCH] Accepting request 713027 from GNOME:Next Update to 0.51.0 OBS-URL: https://build.opensuse.org/request/show/713027 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=138 --- meson-0.50.1.tar.gz | 3 --- meson-0.50.1.tar.gz.asc | 16 ---------------- meson-0.51.0.tar.gz | 3 +++ meson-0.51.0.tar.gz.asc | 16 ++++++++++++++++ meson-suse-ify-macros.patch | 19 +++++++++++++------ meson.changes | 34 ++++++++++++++++++++++++++++++++++ meson.spec | 3 ++- 7 files changed, 68 insertions(+), 26 deletions(-) delete mode 100644 meson-0.50.1.tar.gz delete mode 100644 meson-0.50.1.tar.gz.asc create mode 100644 meson-0.51.0.tar.gz create mode 100644 meson-0.51.0.tar.gz.asc diff --git a/meson-0.50.1.tar.gz b/meson-0.50.1.tar.gz deleted file mode 100644 index 19f92e8..0000000 --- a/meson-0.50.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f68f56d60c80a77df8fc08fa1016bc5831605d4717b622c96212573271e14ecc -size 1402202 diff --git a/meson-0.50.1.tar.gz.asc b/meson-0.50.1.tar.gz.asc deleted file mode 100644 index 0658734..0000000 --- a/meson-0.50.1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAly22cIACgkQO/RpO/7r -lChaOQ//RIAFHr0mptbO2/6ILam3r8+DXosNvKLv17HHAOC00mOIqU69wUkN3pQF -uZDbEay+V1SD5SvMuq5SfTHG2rjFFbREC7wvAunMBJasjgVK8MH7GPpyeBpKNtvE -PNaj47XoTDfoGNiTWFENJCjD8ZUEPpTkgt0IQgqzaKBn0L3d+qv1H1C4yzyPfHTf -4wOnDEnIcOhr3DEwEdpGZtzLasley7rjj1+VEX7zAHfHVlabwpTEPQmcDa3KilYx -t1v3b/GGW2f4e5M9BIY0OvPAoS695HGtiH80/i2iwebdjEtGWXr4sAH2aVcCWxnp -/u8xZdsCiGJOlxG+Fq7WG9PQXM1EIeekK6BvyaS01Jt8mpJtGpOza4KQf4XvqeRY -GmhWFzjx6y1ABMGgXZPV0iWWzfhzl7rZ7tOgg46bItvNJgse6D2Z+qmJ+eQCaZR1 -CFCWeNxSZVaDWA9xROOk4FpTS+5Nhom8+taP5PcQhVBcgnaLcFf1O+ew32ewitgv -Wln8k+Y8S4OVJTeb7Q2rPtPF3ZjaUcYL2YUaVNjhnX9yyUm9QOfkvlSTEITUpWDw -iM+R8plV8j2VrKMIOHMMkgVms48WGoE8si1CpGlKyR9DX3+2bSd9uAjjmI7ZJGNk -QNqQbG7XUbh4QSSQhJLVha02HMhYWHMoj2eGsKCocOef79mcYKY= -=TP2z ------END PGP SIGNATURE----- diff --git a/meson-0.51.0.tar.gz b/meson-0.51.0.tar.gz new file mode 100644 index 0000000..7272168 --- /dev/null +++ b/meson-0.51.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f75fdf6d586d3595c03a07afcd0eaae11f68dd33fea5906a434d22a409ed63f +size 1449724 diff --git a/meson-0.51.0.tar.gz.asc b/meson-0.51.0.tar.gz.asc new file mode 100644 index 0000000..c63a3d0 --- /dev/null +++ b/meson-0.51.0.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl0GpbwACgkQO/RpO/7r +lCia4g//UXJgKZdfckL9Agi6iAXt59fruiRbGlBVkvgqo+MAwS9Zpurh+PYrUL2P +YGrRGMSnvVO4g2/+eO4lUL+PPkCYulAFp1KKwKnG1jldOoYNgHCFlsBZUi6Tjj2R +HRSdDgbhFhxhmDbM0KH7eB5Vx/waQNvHirYbh3YVjC3yeznVdNo8T8xsCYpHkkUL +pzEMtu0n+ICK343sto0wPgU1FQrBKm16gTVoSzUanKdul3oW209U3hPE8dQkRoZ0 +FtvGMlyCMvIRoMKOWh7vp7dHWPx+HW5AYCWcsFhQpzOEff4AzjmmWR/A6EWQaSXy +YwQGcBzpo/Z31KuUW3IrAgERXRivW3LWL30yDmshciSUfpOQFaN1NjRswcHSpgD0 +BaLSpSDktshVCYKR2SvB+ccSwWfoq+qlRkZTx7yfR781o71GQLZuroRvaZxd1SBw +3LUh2FxIV0up/pHplwYYpLtH8UDIKgRZ09z5AB0XNLKKeAKdNuALnASnMD87TlP/ +CendvfRyWG4+GN8t3gHj8FA/zTdAfAKXtbK9DiJrFjq5ECpXlBpHZHB5zEaKr762 +a12olVPDVXXfrMwMSww/5pxf+7y/SXhUKxzox9t17+ppQX3Hpb9PbX7D530L/SV+ +N7Z8qTmv9yfMTRe+lyK3gBxYiLGpcs1V7ET0FZzyk+FP4JvPWnU= +=6vh8 +-----END PGP SIGNATURE----- diff --git a/meson-suse-ify-macros.patch b/meson-suse-ify-macros.patch index a30f1c5..b94446d 100644 --- a/meson-suse-ify-macros.patch +++ b/meson-suse-ify-macros.patch @@ -1,14 +1,19 @@ -Index: meson-0.50.0/data/macros.meson +Index: meson-0.51.0/data/macros.meson =================================================================== ---- meson-0.50.0.orig/data/macros.meson -+++ meson-0.50.0/data/macros.meson -@@ -1,9 +1,15 @@ +--- meson-0.51.0.orig/data/macros.meson ++++ meson-0.51.0/data/macros.meson +@@ -1,6 +1,8 @@ %__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 \ @@ -19,7 +24,7 @@ Index: meson-0.50.0/data/macros.meson %{shrink:%{__meson} \ --buildtype=plain \ --prefix=%{_prefix} \ -@@ -25,10 +31,13 @@ +@@ -31,12 +37,15 @@ %{nil}} %meson_build \ @@ -32,4 +37,6 @@ Index: meson-0.50.0/data/macros.meson %meson_test \ + export LANG=C.UTF-8 \ - %ninja_test -C %{_vpath_builddir} + %{shrink: %{__meson} test \ + -C %{_vpath_builddir} \ + %{?_smp_mesonflags} \ diff --git a/meson.changes b/meson.changes index 2220e86..1b4dfc6 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Wed Jun 26 10:51:31 UTC 2019 - Dominique Leuenberger + +- Update to versoin 0.51.0: + + (C) Preprocessor flag handling. + + Sanity checking compilers with user flags. + + New sourceset module. + + n_debug=if-release and buildtype=plain means no asserts. + + target_type in build_targets accepts the value 'shared_module'. + + New modules kwarg for python.find_installation. + + Support for the Intel Compiler on Windows (ICL). + + Added basic support for the Xtensa CPU toolchain. + + Dependency objects now have a get_variable method. + + CMake prefix path overrides. + + Tests that should fail but did not are now errors. + + New target keyword argument: link_language. + + New module to parse kconfig output files. + + Add new meson subprojects foreach command. + + Added c17 and c18 as c_std values for recent GCC and Clang + Versions. + + gpgme dependency now supports gpgme-config. + + Can link against custom targets. + + Removed the deprecated --target-files API. + + Generators have a new depends keyword argument. + + Specifying options per mer machine. + + subproject.get_variable() now accepts a fallback argument. + + Add keyword static to find_library. + + Fortran include statements recursively parsed. + + CMake subprojects. + + Multipe cross files can be specified. +- Rebase meson-suse-ify-macros.patch. +- Add python3-setuptools unconditionally to BuildRequires for the + test suite. + ------------------------------------------------------------------- Thu May 2 11:06:47 UTC 2019 - Martin Liška diff --git a/meson.spec b/meson.spec index 3c71e5c..b658b3f 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.50.1 +Version: 0.51.0 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -89,6 +89,7 @@ BuildRequires: ninja BuildRequires: pkgconfig BuildRequires: python2-devel BuildRequires: python3-gobject +BuildRequires: python3-setuptools BuildRequires: zlib-devel-static BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Gui)