From 39350c95dc90793f8f216b5e3652990975518967882de3b34f6e8cc7bcbe57de Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 24 Oct 2023 08:43:04 +0000 Subject: [PATCH] Accepting request 1119576 from GNOME:Next Update to 1.2.3 OBS-URL: https://build.opensuse.org/request/show/1119576 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=264 --- ...y-global-project-and-environment-C-a.patch | 141 ------------------ meson-1.2.2.tar.gz | 3 - meson-1.2.2.tar.gz.asc | 16 -- meson-1.2.3.tar.gz | 3 + meson-1.2.3.tar.gz.asc | 16 ++ meson.changes | 16 ++ meson.spec | 22 ++- 7 files changed, 53 insertions(+), 164 deletions(-) delete mode 100644 0007-Revert-rust-apply-global-project-and-environment-C-a.patch delete mode 100644 meson-1.2.2.tar.gz delete mode 100644 meson-1.2.2.tar.gz.asc create mode 100644 meson-1.2.3.tar.gz create mode 100644 meson-1.2.3.tar.gz.asc diff --git a/0007-Revert-rust-apply-global-project-and-environment-C-a.patch b/0007-Revert-rust-apply-global-project-and-environment-C-a.patch deleted file mode 100644 index f31d47f..0000000 --- a/0007-Revert-rust-apply-global-project-and-environment-C-a.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 9d1d4ae746ce39d1916dfe71fd6dcc5fce27e828 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Tue, 3 Oct 2023 16:52:56 +0100 -Subject: [PATCH 7/7] Revert "rust: apply global, project, and environment C - args to bindgen" - -This reverts commit 36210f64f22dc10d324db76bb1a7988c9cd5b14e. - -This ended up not doing what was intended - see https://github.com/mesonbuild/meson/issues/12065#issuecomment-1742263677. - -Bug: https://bugs.gentoo.org/914989 -Bug: https://bugs.gentoo.org/915014 -Signed-off-by: Sam James ---- - mesonbuild/modules/rust.py | 6 ------ - test cases/rust/12 bindgen/meson.build | 18 ------------------ - .../rust/12 bindgen/src/global-project.h | 10 ---------- - test cases/rust/12 bindgen/src/global.c | 5 ----- - test cases/rust/12 bindgen/src/global.rs | 14 -------------- - test cases/rust/12 bindgen/test.json | 5 +---- - 6 files changed, 1 insertion(+), 57 deletions(-) - delete mode 100644 test cases/rust/12 bindgen/src/global-project.h - delete mode 100644 test cases/rust/12 bindgen/src/global.c - delete mode 100644 test cases/rust/12 bindgen/src/global.rs - -diff --git a/mesonbuild/modules/rust.py b/mesonbuild/modules/rust.py -index e6e5c633f..3514412e6 100644 ---- a/mesonbuild/modules/rust.py -+++ b/mesonbuild/modules/rust.py -@@ -232,12 +232,6 @@ class RustModule(ExtensionModule): - elif isinstance(s, CustomTarget): - depends.append(s) - -- clang_args.extend(state.global_args.get('c', [])) -- clang_args.extend(state.project_args.get('c', [])) -- cargs = state.get_option('args', state.subproject, lang='c') -- assert isinstance(cargs, list), 'for mypy' -- clang_args.extend(cargs) -- - if self._bindgen_bin is None: - self._bindgen_bin = state.find_program('bindgen') - -diff --git a/test cases/rust/12 bindgen/meson.build b/test cases/rust/12 bindgen/meson.build -index e7cb5f3db..c05cc0631 100644 ---- a/test cases/rust/12 bindgen/meson.build -+++ b/test cases/rust/12 bindgen/meson.build -@@ -8,9 +8,6 @@ if not prog_bindgen.found() - error('MESON_SKIP_TEST bindgen not found') - endif - --add_project_arguments('-DPROJECT_ARG', language : 'c') --add_global_arguments('-DGLOBAL_ARG', language : 'c') -- - # This seems to happen on windows when libclang.dll is not in path or is not - # valid. We must try to process a header file for this to work. - # -@@ -84,18 +81,3 @@ test('generated header', rust_bin2) - - subdir('sub') - subdir('dependencies') -- --gp = rust.bindgen( -- input : 'src/global-project.h', -- output : 'global-project.rs', --) -- --gp_lib = static_library('gp_lib', 'src/global.c') -- --gp_exe = executable( -- 'gp_exe', -- structured_sources(['src/global.rs', gp]), -- link_with : gp_lib, --) -- --test('global and project arguments', gp_exe) -diff --git a/test cases/rust/12 bindgen/src/global-project.h b/test cases/rust/12 bindgen/src/global-project.h -deleted file mode 100644 -index 6084e8ed6..000000000 ---- a/test cases/rust/12 bindgen/src/global-project.h -+++ /dev/null -@@ -1,10 +0,0 @@ --#ifndef GLOBAL_ARG --char * success(void); --#endif --#ifndef PROJECT_ARG --char * success(void); --#endif --#ifndef CMD_ARG --char * success(void); --#endif --int success(void); -diff --git a/test cases/rust/12 bindgen/src/global.c b/test cases/rust/12 bindgen/src/global.c -deleted file mode 100644 -index 10f6676f7..000000000 ---- a/test cases/rust/12 bindgen/src/global.c -+++ /dev/null -@@ -1,5 +0,0 @@ --#include "src/global-project.h" -- --int success(void) { -- return 0; --} -diff --git a/test cases/rust/12 bindgen/src/global.rs b/test cases/rust/12 bindgen/src/global.rs -deleted file mode 100644 -index 4b70b1ecc..000000000 ---- a/test cases/rust/12 bindgen/src/global.rs -+++ /dev/null -@@ -1,14 +0,0 @@ --// SPDX-license-identifer: Apache-2.0 --// Copyright © 2023 Intel Corporation -- --#![allow(non_upper_case_globals)] --#![allow(non_camel_case_types)] --#![allow(non_snake_case)] -- --include!("global-project.rs"); -- --fn main() { -- unsafe { -- std::process::exit(success()); -- }; --} -diff --git a/test cases/rust/12 bindgen/test.json b/test cases/rust/12 bindgen/test.json -index b3a758562..f94ee85f9 100644 ---- a/test cases/rust/12 bindgen/test.json -+++ b/test cases/rust/12 bindgen/test.json -@@ -1,10 +1,7 @@ - { -- "env": { -- "CFLAGS": "-DCMD_ARG" -- }, - "stdout": [ - { -- "line": "test cases/rust/12 bindgen/meson.build:30: WARNING: Project targets '>= 0.63' but uses feature introduced in '1.0.0': \"rust.bindgen\" keyword argument \"include_directories\" of type array[str]." -+ "line": "test cases/rust/12 bindgen/meson.build:27: WARNING: Project targets '>= 0.63' but uses feature introduced in '1.0.0': \"rust.bindgen\" keyword argument \"include_directories\" of type array[str]." - } - ] - } --- -2.42.0 - diff --git a/meson-1.2.2.tar.gz b/meson-1.2.2.tar.gz deleted file mode 100644 index dbe8c31..0000000 --- a/meson-1.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a0f04de331fbc7af3b802a844fc8838f4ccd1ded1e792ba4f8f2faf8c5fe4d6 -size 2190455 diff --git a/meson-1.2.2.tar.gz.asc b/meson-1.2.2.tar.gz.asc deleted file mode 100644 index e93117a..0000000 --- a/meson-1.2.2.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmUWn/oACgkQwk5jG6ux -/nDSZA//Yu372PjppqIJ0JXyS6krSFD6huPLo40SE0dKKbrDs1EUdhZp8DI8Dpz8 -kGKZtNuYrFZk6Fnp0B8HBt8FeJptxLeNutsJ/y92cwiMYWbLliC6Go9/bCptbqPk -P23KfmpBDF4D3qu7iZvLZJKoDQVgl+U2o1W8jrqA8ymyCApP79DhxExGnQ492gV2 -XCZwnMm7LkOkf+PplkfnMDjKmRVGzIiq4t830CVLJ3JT8qDO4/Ka6Dhf0wj7lGDJ -pJzQ7NypiIO/GaxM9erq9zoU7kpplXP73yL4zCvd3WeNcBUFFovcXOp1Wj2Io+h+ -1QFfzEk9d2nKfi1ibv1ury9BJi+6NSKKtmEjL8NetyMCGjhM1+XPmQlqp/xebQ0q -3Ak57qcjXtUAXkZ7h0SSCUokKgBMauD7PHhYhl4EDpTJqcfQK4a69Fuznnz1DLpD -h+8ZuhA4cAyDhCTZpMsMskk9oUcB6llAPbOP9s5uTOEU8IvEw6RCEpJ6bXLptovP -SLXiFrOoRW0wtjMW6iuCLNUh2NotRn8JtMDrQLkARBbDfsBVv/RNrI8yZcKRj9+U -06bWF3UAO8xkRJVyDa7RYcU2rNuLgY7zOenJd9z8i5/Z/lRDBheOlvx8XPlbZPz/ -EoSaK1QTLPMvr7tDwZl2gWREszEfgMLNzruW+0LnCFDdwFSeWi4= -=Ewma ------END PGP SIGNATURE----- diff --git a/meson-1.2.3.tar.gz b/meson-1.2.3.tar.gz new file mode 100644 index 0000000..5e5dffb --- /dev/null +++ b/meson-1.2.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1 +size 2184484 diff --git a/meson-1.2.3.tar.gz.asc b/meson-1.2.3.tar.gz.asc new file mode 100644 index 0000000..d68aaa6 --- /dev/null +++ b/meson-1.2.3.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmUyyosACgkQwk5jG6ux +/nA5fxAAhtx3xFS0+WpAXE3GKzAuksrqg/JV3EJ6GHB2Y6sN3xRWvqm3cgq/l2cQ +ARtEBIieD3G0Dvb+avUr9C/8nMZjiM7Ou4XA385/BGC6HAKykqgEO+VPoVYfc4a8 +wuBKmj6xXLYFscR/tEXy8fk5KzIH/rm/BAuLFHdYgoosrop8aWgBstmPs5ry67I0 +CBFv0Fjbsb6mR9dR/lQU2jF+hKlhFZqYwFuU5IGFOnLhQzbMr6k57KM4lms4BZ0x +M1YqG0NbCSLEXTpxHounlpNV9Z7fiQOcsOt+O0SZJuDMgX3X91Sh6yec9Orp3RqN +KCjJ/Is9BO45XewFwrV9sjVHIx+9ybBdUxCFxRc5cF8byC5ew661qHVpGWgqo/Zy +xGLyiB0KbvfaPzYFjyeqoSCVRAH+wVSZEGlrJG/yyvTJsnIhupgFws1XqiBpfkwr +TYO2TxB6F8slTizPAy9NGmtxpaOmIRAODNzpK+TCeOfaeM7KlvLBkl1FR2BRm6v3 +LGMN2uQzGhL42i20HVsBXqq74HoaZKaq5w9MRJCEqj3fFF+ajMnjeLFXHA3oMKiA +bPz+PSA7ENXKGFZWsZaeERXdZJSGxpUAADmNOogICDPQHNASIWafxSGfNNQdzgvc +hYiWrJGBfhfRHO1HxxjWfySukBDNHm1qDma6Gt5hcZuYmMao2l4= +=i4PL +-----END PGP SIGNATURE----- diff --git a/meson.changes b/meson.changes index db0f4eb..dd1c50a 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Oct 23 09:17:22 UTC 2023 - Dominique Leuenberger + +- Update to version 1.2.3: + + Allow share/cmake/ as cmake_prefix_path. + + find_tool: don't assume the pkgconfig variable is a valid + command. + + python dependency: ensure that setuptools doesn't inject + itself into distutils. + + Allow c++23 in gcc-11. + + Revert "rust: apply global, project, and environment C args to + bindgen". +- Drop + 0007-Revert-rust-apply-global-project-and-environment-C-a.patch: + fixed upstream. + ------------------------------------------------------------------- Wed Oct 4 07:30:44 UTC 2023 - Dominique Leuenberger diff --git a/meson.spec b/meson.spec index 0dcd415..0eb22b3 100644 --- a/meson.spec +++ b/meson.spec @@ -16,6 +16,23 @@ # + # +# spec file +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + %if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000 %global pythons python311 %else @@ -35,7 +52,7 @@ %bcond_with setuptools %bcond_without mono Name: meson%{name_ext} -Version: 1.2.2 +Version: 1.2.3 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -50,8 +67,6 @@ Patch0: meson-test-installed-bin.patch Patch1: extend-test-timeout-on-qemu-builds.patch # PATCH-FIX-OPENSUSE meson-distutils.patch -- meson is ring0 and therefor setuptools is not available Patch2: meson-distutils.patch -# PATCH-FIX-UPSTREAM 0007-Revert-rust-apply-global-project-and-environment-C-a.patch gh#mesonbuild/meson#12326 -- Fix Mesa build -Patch3: 0007-Revert-rust-apply-global-project-and-environment-C-a.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: fdupes @@ -175,7 +190,6 @@ Vim/NeoVim. %if !%{with setuptools} %patch2 -p1 %endif -%patch3 -p1 %if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000 # AddressSanitizer fails here because of ulimit.