From ae6440bf56598f9125ce3f32e629869be07dfbc592f6d9c584dbf4a5aeb20efd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 13 Mar 2024 08:06:20 +0000 Subject: [PATCH] Accepting request 1157431 from GNOME:Next Update to 1.4.0 OBS-URL: https://build.opensuse.org/request/show/1157431 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=280 --- get_llvm_tool_names-llvm18.patch | 10 +++++---- meson-1.3.2.tar.gz | 3 --- meson-1.3.2.tar.gz.asc | 16 --------------- meson-1.4.0.tar.gz | 3 +++ meson-1.4.0.tar.gz.asc | 16 +++++++++++++++ meson.changes | 35 ++++++++++++++++++++++++++++++++ meson.spec | 6 +++--- 7 files changed, 63 insertions(+), 26 deletions(-) delete mode 100644 meson-1.3.2.tar.gz delete mode 100644 meson-1.3.2.tar.gz.asc create mode 100644 meson-1.4.0.tar.gz create mode 100644 meson-1.4.0.tar.gz.asc diff --git a/get_llvm_tool_names-llvm18.patch b/get_llvm_tool_names-llvm18.patch index 0d3fbf7..4af20f5 100644 --- a/get_llvm_tool_names-llvm18.patch +++ b/get_llvm_tool_names-llvm18.patch @@ -2,13 +2,15 @@ Similar to commit 67afddbf431140c1ee064bf79a2fa5a95575488e with title "environment: Add LLVM 18 support to get_llvm_tool_names()", but with minor version following the upstream versioning change. ---- a/mesonbuild/environment.py -+++ b/mesonbuild/environment.py -@@ -188,6 +188,7 @@ def get_llvm_tool_names(tool: str) -> T.List[str]: +Index: meson-1.4.0rc2/mesonbuild/environment.py +=================================================================== +--- meson-1.4.0rc2.orig/mesonbuild/environment.py ++++ meson-1.4.0rc2/mesonbuild/environment.py +@@ -188,6 +188,7 @@ def get_llvm_tool_names(tool: str) -> T. # unless it becomes a stable release. suffixes = [ '', # base (no suffix) + '-18.1', '181', + '-18', '18', '-17', '17', '-16', '16', - '-15', '15', diff --git a/meson-1.3.2.tar.gz b/meson-1.3.2.tar.gz deleted file mode 100644 index 95f52f5..0000000 --- a/meson-1.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:492eb450c8b073024276f916f5adbb3c4bb7e90e9e6ec124efda064f3d9b5baa -size 2223798 diff --git a/meson-1.3.2.tar.gz.asc b/meson-1.3.2.tar.gz.asc deleted file mode 100644 index b924baa..0000000 --- a/meson-1.3.2.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmXLzCkACgkQwk5jG6ux -/nAf7g//VXkglBhC7+nZ04VwEh/T+xQQeRero0KUIfVctjDtWVYu+T+Otiy6rwJX -AyYw4Zg3plHUpVkqdJgYIxjhvf3ySixXtW01XxOo3cS56CRMBvr3JRhfYCMVPjsn -VMvbDRusiJQnzRtUq++uOkwG5EkMtuCzkPpgG2UuPuuzYBgnYcT/YFhP+YlkNayi -a4HSVEbI0aki9E30CUIMojs60aeirxgBb7jgK3oiqv8s7HqGizu/7AD56eHJgRyt -c8r3mcHr8cUJyTHgq4W0sPr4zogAKFz0UC1uXsxyxjDJDBdwq2hT2VdA6WAKVW7V -obSALffw4HNKylfRCx9zGpSQxfCZ8yoRQGDQjjk66st5iambsTbtbIvHfYD+JRlZ -aVbz7hBFgKhjXqvOVqwW5UR1BN3aaYnZldWd4L0Mw5wXeX2mcsRU++dj6UU05Gp7 -liU5IzLISJF0lUsDs4dyCdVDEt2mvZqH2WXkMbrEjOGd139RCOiqLKZC5I3ABjqN -ztIr/MmicKNod1Xv1jJoLoAkLrJaSN6yRhhFg4zX8vHIVIhdop42DwGIgLQyZY68 -yFXTiK8okukBmzdq62uOUblFBAEBLd3PIx7q84J0f+s0rEK0olnx0cxM3tx5ZMc8 -T3reD7Saj+EnkF70QGg17It/HraHufLBqKDuBgf3EjRfJ+82fdM= -=PNVr ------END PGP SIGNATURE----- diff --git a/meson-1.4.0.tar.gz b/meson-1.4.0.tar.gz new file mode 100644 index 0000000..5783f29 --- /dev/null +++ b/meson-1.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d +size 2224663 diff --git a/meson-1.4.0.tar.gz.asc b/meson-1.4.0.tar.gz.asc new file mode 100644 index 0000000..6555ae5 --- /dev/null +++ b/meson-1.4.0.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmXwn5YACgkQwk5jG6ux +/nAw+w//SNYVxgDQr3fQc/my+8Dy/YE/Wtm91lLrBUkuxCqKTp282ALn9s9YrkIa +Si1qYqtx9SnfSAvquvIh0r8vF/f73s7Hs7sH87kBOq/UpwEXKnqw3m9UQgcuFuww +gbGTM4HJyN9YGKcrFLEd3Rl2ssjPrV1zdsAiBmgniak71NaBbslRCuYIw775t7X5 +A134323fY+DWbU9KmhlaMQNknoMNDb6PYWl8xVjKC8lPESeFcOcKLhNntC6W3Ke0 +k2wNi9vrUhqVgJgiXqD9WZ5YZO0uc43esmoVDcnNqp2cgSp60NLfd0blUk2FSa6G +XCI/HDXANcSR9P1+WIZtLXKLCUnnNiFSsuHtUZcrDwyvzU6l3yrzFn/4uXN0bUOi +E/6EYlgV695XhUHm9VbH3KxQas+0frE7D47ZkMzyTtujx+apxaLyZX2IDxOetnte +QDmdfn7IaZV7+p5Kn5Nf6m2YYng7Sr1q6BeJTZsvxIeGNd7E9iCPCxNABGQ8EE3z +wzanXEQqAr21/DiD8brjsk4+/QF7PYxIowNFR4mtak1aC/gOe2jORTZ+4JOgip9a +SPJEUd2B4TnDLapZTH2N8C/mfmTtw3cEcl0UWT/exwi1bKjPe3DkzeLtYH8qL4Up +YIlUYm5fgT/tk4MxJlhSZwU8gbPf1hGqsF8IC0r1ZU1TI+P8hDo= +=m61P +-----END PGP SIGNATURE----- diff --git a/meson.changes b/meson.changes index b22e99d..94ee543 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Wed Mar 13 07:29:51 UTC 2024 - Dominique Leuenberger + +- Update to version 1.4.0: + + Added support for build_tgt, custom_tgt, and custom_idx to + certain FS module functions. + + Meson now reads the project version of cmake subprojects. + + ndebug setting now controls C++ stdlib assertions. + + stldebug gains Clang support. + + New unset() method on environment objects. + + File object now has full_path() method. + + New numpy custom dependency. + + depends kwarg now supported by compiler.preprocess(). + + Added preserve_paths keyword argument to qt module functions. + + Bindgen will now use Meson's heuristic for what is a C++ + header. + + Overriding bindgen language setting. + + Bindgen now uses the same C/C++ std as the project as a whole. + + Tests now abort on errors by default under more sanitizers. + + Use custom_target as test executable. + + Support for Texas Instruments C6000 C/C++ compiler. + +------------------------------------------------------------------- +Tue Mar 12 12:33:04 UTC 2024 - Dominique Leuenberger + +- Update to version 1.4.0rc2: + Changelog to follow with final release. +- Rebase get_llvm_tool_names-llvm18.patch. + +------------------------------------------------------------------- +Tue Mar 12 12:32:53 UTC 2024 - Dominique Leuenberger + +- Update to version 1.4.0rc1: + Changelog to follow with final release. + ------------------------------------------------------------------- Mon Mar 11 22:48:56 UTC 2024 - Aaron Puchert diff --git a/meson.spec b/meson.spec index cfba907..56477ca 100644 --- a/meson.spec +++ b/meson.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package meson # # Copyright (c) 2024 SUSE LLC # @@ -35,7 +35,7 @@ %bcond_with setuptools %bcond_without mono Name: meson%{name_ext} -Version: 1.3.2 +Version: 1.4.0 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -181,7 +181,7 @@ This package provides meson.build syntax highlighting support for Vim/NeoVim. %prep -%setup -q -n meson-%{version} +%autosetup -N -n meson-%{version} %patch -P 0 -p1 %patch -P 1 -p1 %if !%{with setuptools}