From 2fdb6762698785b83d011c978f153212b5f81836 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sun, 12 Jul 2026 05:52:47 +0000 Subject: [PATCH] meson: upgrade 1.11.1 -> 1.11.2 --- .../meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 4 ++-- .../meson/0002-Support-building-allarch-recipes-again.patch | 4 ++-- .../meson/{meson_1.11.1.bb => meson_1.11.2.bb} | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-devtools/meson/{meson_1.11.1.bb => meson_1.11.2.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..0ca0277ea0 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 5b3c19cc6cc84e0ba3afdade96b6609e09f8c33c 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,7 +10,7 @@ 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 8eeb30f..ee3c2ef 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -294,8 +294,8 @@ class MachineInfo(HoldableObject): 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..38ac24f6cd 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 d6ef8e916013c4a1790b159a806ebe51a7f08dd8 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 ee3c2ef..a335076 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.11.1.bb b/meta/recipes-devtools/meson/meson_1.11.2.bb similarity index 98% rename from meta/recipes-devtools/meson/meson_1.11.1.bb rename to meta/recipes-devtools/meson/meson_1.11.2.bb index 26d9af6c19..5ac4d789b8 100644 --- a/meta/recipes-devtools/meson/meson_1.11.1.bb +++ b/meta/recipes-devtools/meson/meson_1.11.2.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] = "6788ae299979643f8d841bcaf64352558436cae45a0355148a3aeeccf7913866" +SRC_URI[sha256sum] = "698feae069cef3ecd4d7aaf281d7df359bdfcf555a9a1564383d3b913fa8a736" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)$" inherit python_setuptools_build_meta github-releases -- 2.47.1