From 83b80ce5be5e8c431b2cd108272f88b72fd1c2b4 Mon Sep 17 00:00:00 2001 From: sj Date: Thu, 9 Jul 2026 15:40:58 +0200 Subject: [PATCH] meson: update to 1.11.1. --- srcpkgs/meson/patches/rust-proc-macro.patch | 74 --------------------- srcpkgs/meson/template | 6 +- 2 files changed, 3 insertions(+), 77 deletions(-) delete mode 100644 srcpkgs/meson/patches/rust-proc-macro.patch diff --git a/srcpkgs/meson/patches/rust-proc-macro.patch b/srcpkgs/meson/patches/rust-proc-macro.patch deleted file mode 100644 index a5fa1b49d50b43..00000000000000 --- a/srcpkgs/meson/patches/rust-proc-macro.patch +++ /dev/null @@ -1,74 +0,0 @@ -commit 4f0b3c650baacf02c1ca82b7cce97665dd4fefea -Author: Daniel Martinez -Date: Thu May 9 08:31:57 2024 -0400 - - Revert "rust: recursively pull proc-macro dependencies as well" - - This reverts commit aee941559c4b88a062e88186819a820c69c200ae. - -diff --git a/mesonbuild/build.py b/mesonbuild/build.py -index da4c4373d..1d5bf7bd6 100644 ---- a/mesonbuild/build.py -+++ b/mesonbuild/build.py -@@ -1295,6 +1295,8 @@ class BuildTarget(Target): - for t in self.link_targets: - if t in result: - continue -+ if t.rust_crate_type == 'proc-macro': -+ continue - if include_internals or not t.is_internal(): - result.add(t) - if isinstance(t, StaticLibrary): -diff --git a/test cases/rust/18 proc-macro/lib.rs b/test cases/rust/18 proc-macro/lib.rs -deleted file mode 100644 -index 5242886cc..000000000 ---- a/test cases/rust/18 proc-macro/lib.rs -+++ /dev/null -@@ -1,8 +0,0 @@ --extern crate proc_macro_examples; --use proc_macro_examples::make_answer; -- --make_answer!(); -- --pub fn func() -> u32 { -- answer() --} -diff --git a/test cases/rust/18 proc-macro/meson.build b/test cases/rust/18 proc-macro/meson.build -index e8b28eda1..c5f0dfc82 100644 ---- a/test cases/rust/18 proc-macro/meson.build -+++ b/test cases/rust/18 proc-macro/meson.build -@@ -31,14 +31,3 @@ main = executable( - ) - - test('main_test2', main) -- --subdir('subdir') -- --staticlib = static_library('staticlib', 'lib.rs', -- link_with: pm_in_subdir, -- rust_dependency_map : {'proc_macro_examples3' : 'proc_macro_examples'} --) -- --executable('transitive-proc-macro', 'transitive-proc-macro.rs', -- link_with: staticlib, --) -diff --git a/test cases/rust/18 proc-macro/subdir/meson.build b/test cases/rust/18 proc-macro/subdir/meson.build -deleted file mode 100644 -index 04842c431..000000000 ---- a/test cases/rust/18 proc-macro/subdir/meson.build -+++ /dev/null -@@ -1 +0,0 @@ --pm_in_subdir = rust.proc_macro('proc_macro_examples3', '../proc.rs') -diff --git a/test cases/rust/18 proc-macro/transitive-proc-macro.rs b/test cases/rust/18 proc-macro/transitive-proc-macro.rs -deleted file mode 100644 -index 4c804b3b6..000000000 ---- a/test cases/rust/18 proc-macro/transitive-proc-macro.rs -+++ /dev/null -@@ -1,7 +0,0 @@ --extern crate staticlib; --use staticlib::func; -- -- --fn main() { -- assert_eq!(42, func()); --} diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index 3336b0b5eab0b6..a3299945198993 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,7 +1,7 @@ # Template file for 'meson' pkgname=meson -version=1.9.1 -revision=4 +version=1.11.1 +revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" depends="ninja python3-setuptools" @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="https://mesonbuild.com" changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md" distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz" -checksum=4e076606f2afff7881d195574bddcd8d89286f35a17b4977a216f535dc0c74ac +checksum=6788ae299979643f8d841bcaf64352558436cae45a0355148a3aeeccf7913866 # sanitizers aren't available on musl if [ "$XBPS_TARGET_LIBC" = glibc ]; then