From 3acdab0bf653dec23bc978b927eac92346326f70594d3b036b2dbe9e765c6827 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 23 Jun 2017 12:40:55 +0000 Subject: [PATCH] Accepting request 505856 from home:susnux:branches:devel:tools:building Update to current version OBS-URL: https://build.opensuse.org/request/show/505856 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=45 --- meson-0.40.1.tar.gz | 3 --- meson-0.40.1.tar.gz.asc | 16 ---------------- meson-0.41.0.tar.gz | 3 +++ meson-0.41.0.tar.gz.asc | 16 ++++++++++++++++ meson-fix-gcc48.patch | 7 ++++--- meson-handle-skipped-tests.patch | 24 ------------------------ meson-suse-ify-macros.patch | 18 +++++++++--------- meson.changes | 17 +++++++++++++++++ meson.spec | 10 +++++----- 9 files changed, 54 insertions(+), 60 deletions(-) delete mode 100644 meson-0.40.1.tar.gz delete mode 100644 meson-0.40.1.tar.gz.asc create mode 100644 meson-0.41.0.tar.gz create mode 100644 meson-0.41.0.tar.gz.asc delete mode 100644 meson-handle-skipped-tests.patch diff --git a/meson-0.40.1.tar.gz b/meson-0.40.1.tar.gz deleted file mode 100644 index f42730d..0000000 --- a/meson-0.40.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index df1ad2c..0000000 --- a/meson-0.40.1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------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-0.41.0.tar.gz b/meson-0.41.0.tar.gz new file mode 100644 index 0000000..551c45b --- /dev/null +++ b/meson-0.41.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99a27fca44c07cebd8b954bd219fd9c5ef89f3aeb84eed462f6b6f46db2a3359 +size 1012290 diff --git a/meson-0.41.0.tar.gz.asc b/meson-0.41.0.tar.gz.asc new file mode 100644 index 0000000..8935cb1 --- /dev/null +++ b/meson-0.41.0.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlk+9WMACgkQO/RpO/7r +lCggaQ//b5Ehh6KdaOLrOCGNPAwKtqBSM19gsB4NzUpWCNt5gVrQWvMdP6R4/giq +ekcfyZSJAPbz/v6uysY6IVX9dWuyp1+k3i4ao2fM50mhtygdlj0eAsol1aUhbNkj +SyN7SBpJOsR5OFO8ZH3Ssecw1pQ66BZeOnDTc/SbJuvmPiRgnIYURYmWGjg3C1Wt +LzyL+T0qpdIbXtpNXV2aZS17lHnOiF4qw3fNZN17MuqKJXaNEpWb/KdIQL/7TGwn +3xfgjYatiw7cSG0X8gBlspVY6acfb1+oCWID1Qn5Ebryct3lilPa0fwTeNNgqtkl +z0axwrqnkUz8ZZc9HeFKkQZnw1z3aZasowR6Nw5+ADxl6CfYL5TVINl34qtmsBHU +wTfCS/Kv5ovbTCPhypOK4og1DODHP+Urg1e0zzUtXoFZUY/R2IyUBEkZ0OgYDKnd +HWlJa55/Tcr1pusCaMrt+9v1JN3p+8q0UqtZ4W+wAykOtoQrfbdED9zeJBbvPyBx +42L9cGx47BVoJ0CLvoJKrI8Y381lSl12BB7tV/Je47lWXMQh7LI95u5RQv4AbTFG +L0eajCYKGp6XYrbSaUKSbpzbwNlr8oxZ61cSdS9HOw6FCcBFxSLvrVZORRnJrEwL +JsN10TKyYqEGxibJ6EMZpMVDoCUXi8T5ZX0seRDxhlFL4Zipoig= +=41X0 +-----END PGP SIGNATURE----- diff --git a/meson-fix-gcc48.patch b/meson-fix-gcc48.patch index 09f387d..606be29 100644 --- a/meson-fix-gcc48.patch +++ b/meson-fix-gcc48.patch @@ -1,6 +1,7 @@ ---- a/mesonbuild/compilers.py -+++ b/mesonbuild/compilers.py -@@ -2403,9 +2403,13 @@ class GnuCPPCompiler(GnuCompiler, CPPCom +diff -Nur meson-0.41.0/mesonbuild/compilers.py new/mesonbuild/compilers.py +--- meson-0.41.0/mesonbuild/compilers.py 2017-06-12 20:30:20.000000000 +0200 ++++ new/mesonbuild/compilers.py 2017-06-19 13:43:25.771564616 +0200 +@@ -2621,9 +2621,13 @@ '3': default_warn_args + ['-Wextra', '-Wpedantic']} def get_options(self): diff --git a/meson-handle-skipped-tests.patch b/meson-handle-skipped-tests.patch deleted file mode 100644 index 3f8097a..0000000 --- a/meson-handle-skipped-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -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-suse-ify-macros.patch b/meson-suse-ify-macros.patch index 2cbeaeb..554fe18 100644 --- a/meson-suse-ify-macros.patch +++ b/meson-suse-ify-macros.patch @@ -1,9 +1,9 @@ -Index: meson-0.38.1/data/macros.meson -=================================================================== ---- meson-0.38.1.orig/data/macros.meson -+++ meson-0.38.1/data/macros.meson -@@ -1,11 +1,13 @@ +diff -Nur meson-0.41.0/data/macros.meson new/data/macros.meson +--- meson-0.41.0/data/macros.meson 2017-05-03 17:27:46.000000000 +0200 ++++ new/data/macros.meson 2017-06-19 13:40:15.922016400 +0200 +@@ -1,12 +1,14 @@ %__meson %{_bindir}/meson + %__meson_wrap_mode nodownload +%_vpath_srcdir . +%_vpath_builddir build @@ -13,11 +13,11 @@ Index: meson-0.38.1/data/macros.meson - export FFLAGS="${FFLAGS:-%__global_fflags}" \ - export FCFLAGS="${FCFLAGS:-%__global_fcflags}" \ - export LDFLAGS="${LDFLAGS:-%__global_ldflags}" \ -+ export LANG=C.UTF-8 \ -+ export CFLAGS="${CFLAGS:-%optflags}" \ ++ export LANG=C.UTF-8 \ ++ export CFLAGS="${CFLAGS:-%optflags}" \ + export CXXFLAGS="${CXXFLAGS:-%optflags}" \ -+ export FFLAGS="${FFLAGS:-%optflags}" \ -+ export FCFLAGS="${FCFLAGS:-%optflags}" \ ++ export FFLAGS="${FFLAGS:-%optflags}" \ ++ export FCFLAGS="${FCFLAGS:-%optflags}" \ %{__meson} \\\ --buildtype=plain \\\ --prefix=%{_prefix} \\\ diff --git a/meson.changes b/meson.changes index 721ed9b..dafc493 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Jun 19 12:35:49 UTC 2017 - rpm@fthiessen.de + +- Update to version 0.41.0: + * Native support for linking against LLVM using + the dependency function. + * Pkgconfig support for custom variables. + * A target for creating tarballs using 'ninja dist'. + * Support for passing arguments to Rust compiler. + * All known issues regarding reproducible builds are fixed. + * Extended template substitution in configure_file + for @BASENAME@ and @PLAINNAME@ . + * Support for capturing stdout of a command in configure_file. +- Removed SDL2 test to reduce dependencies (smaller build footprint) +- Dropped upstreamed patch meson-handle-skipped-tests.patch +- Rebased meson-suse-ify-macros.patch and meson-fix-gcc48.patch + ------------------------------------------------------------------- Tue Jun 6 13:08:19 UTC 2017 - dimstar@opensuse.org diff --git a/meson.spec b/meson.spec index 7f81f14..1a53f97 100644 --- a/meson.spec +++ b/meson.spec @@ -18,7 +18,7 @@ %define _name mesonbuild Name: meson -Version: 0.40.1 +Version: 0.41.0 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -33,8 +33,6 @@ 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 @@ -46,6 +44,8 @@ BuildRequires: gettext BuildRequires: git BuildRequires: gtk-doc BuildRequires: itstool +BuildRequires: llvm-devel +BuildRequires: ncurses-devel BuildRequires: ninja BuildRequires: pkgconfig BuildRequires: python3 >= 3.4 @@ -75,7 +75,6 @@ Domain Specific Language. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 # Lack of gtest, gmock, gnustep, for the vala test, we'd need gtk3 which causes a build cycle # but considering the GNOME stack is the main driver for meson and the GNOME team is maintaining @@ -83,6 +82,7 @@ Domain Specific Language. rm -rf "test cases/frameworks/2 gtest" \ "test cases/frameworks/3 gmock/" \ "test cases/frameworks/4 qt" \ + "test cases/frameworks/16 sdl2" \ "test cases/objc/2 nsstring" \ "test cases/vala/14 target glib version and gresources" @@ -103,7 +103,7 @@ python3 run_tests.py %files %defattr(-,root,root) -%doc authors.txt contributing.txt COPYING +%doc contributing.txt COPYING %{_bindir}/%{name} %{_bindir}/%{name}conf %{_bindir}/%{name}introspect