From 0d0b32bdd6a25b1d49eecbf7124f7c46e51f0eae Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Wed, 23 Sep 2026 05:56:17 +0000 Subject: [PATCH] meson: upgrade 1.12.0 -> 1.12.1 --- .../meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 8 ++++---- .../0002-Support-building-allarch-recipes-again.patch | 4 ++-- .../meson/{meson_1.12.0.bb => meson_1.12.1.bb} | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename meta/recipes-devtools/meson/{meson_1.12.0.bb => meson_1.12.1.bb} (98%) diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index ae8bd4c954..dfee24e003 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From ba79cee701b80984c660ffc1c89ce1226b75ed5b Mon Sep 17 00:00:00 2001 +From 2aa6ab3379281038eae915b0e6e1855ed0707b31 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal @@ -10,10 +10,10 @@ Signed-off-by: Ross Burton 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index b0072a4..762818c 100644 +index 65d0823..07433f0 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -294,8 +294,8 @@ class MachineInfo(HoldableObject): +@@ -293,8 +293,8 @@ class MachineInfo(HoldableObject): 'but is missing {}.'.format(minimum_literal - set(literal))) cpu_family = literal['cpu_family'] @@ -24,7 +24,7 @@ index b0072a4..762818c 100644 endian = literal['endian'] if endian not in ('little', 'big'): -@@ -642,9 +642,7 @@ def detect_cpu_family(compilers: CompilerDict) -> str: +@@ -656,9 +656,7 @@ def detect_cpu_family(compilers: CompilerDict) -> str: trial = 'mips' if trial not in known_cpu_families: diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index 30f79be369..6bb0c91fd5 100644 --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From 21abed6786056ae31e4028b98068ff78740872e6 Mon Sep 17 00:00:00 2001 +From 88cef14eb829f7ad5c869695d3ea079ffeccc839 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again @@ -12,7 +12,7 @@ Signed-off-by: Peter Kjellerstedt 1 file changed, 1 insertion(+) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 762818c..0efa628 100644 +index 07433f0..d818427 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -37,6 +37,7 @@ if T.TYPE_CHECKING: diff --git a/meta/recipes-devtools/meson/meson_1.12.0.bb b/meta/recipes-devtools/meson/meson_1.12.1.bb similarity index 98% rename from meta/recipes-devtools/meson/meson_1.12.0.bb rename to meta/recipes-devtools/meson/meson_1.12.1.bb index ac69b63bde..e8c1b3d7e0 100644 --- a/meta/recipes-devtools/meson/meson_1.12.0.bb +++ b/meta/recipes-devtools/meson/meson_1.12.1.bb @@ -14,7 +14,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ " -SRC_URI[sha256sum] = "88afe0c20e52030218924ac37d0c81c59b4b5f3ae3752c8c6d7470c7d365886c" +SRC_URI[sha256sum] = "ab0a6ca09f8ef70c564c8241fb5a23957886a0b53fb58412b5e07eaf07dba743" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)$" inherit python_setuptools_build_meta github-releases -- 2.47.1