diff mbox series

[18/19] meson: update 0.63.3 -> 0.64.0

Message ID 20221110181249.1240200-18-alex@linutronix.de
State New
Headers show
Series [01/19] pango: replace a recipe fix with an upstream submitted patch | expand

Commit Message

Alexander Kanavin Nov. 10, 2022, 6:12 p.m. UTC 
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-is_debianlike-always-return-False.patch  | 15 ++++++++-------
 .../meson/{meson_0.63.3.bb => meson_0.64.0.bb}    |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.63.3.bb => meson_0.64.0.bb} (98%)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch b/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch
index 83c4782a61..a9a32e2b7a 100644
--- a/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch
+++ b/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch
@@ -1,4 +1,4 @@ 
-From 667b9ede638677fb37911306937ea62f05897581 Mon Sep 17 00:00:00 2001
+From 361f51c2c7685491186703e8f26be991ab698edc Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Mon, 18 Oct 2021 15:55:59 +0200
 Subject: [PATCH] is_debianlike(): always return False
@@ -7,15 +7,16 @@  Otherwise, host contamination happens.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
 ---
- mesonbuild/mesonlib/universal.py | 2 +-
+ mesonbuild/utils/universal.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/mesonbuild/mesonlib/universal.py b/mesonbuild/mesonlib/universal.py
-index d670d04..47d1b52 100644
---- a/mesonbuild/mesonlib/universal.py
-+++ b/mesonbuild/mesonlib/universal.py
-@@ -651,7 +651,7 @@ def is_cygwin() -> bool:
+diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py
+index 570edd6..4119aa5 100644
+--- a/mesonbuild/utils/universal.py
++++ b/mesonbuild/utils/universal.py
+@@ -634,7 +634,7 @@ def is_cygwin() -> bool:
  
  
  def is_debianlike() -> bool:
diff --git a/meta/recipes-devtools/meson/meson_0.63.3.bb b/meta/recipes-devtools/meson/meson_0.64.0.bb
similarity index 98%
rename from meta/recipes-devtools/meson/meson_0.63.3.bb
rename to meta/recipes-devtools/meson/meson_0.64.0.bb
index 9267077422..84c3c84515 100644
--- a/meta/recipes-devtools/meson/meson_0.63.3.bb
+++ b/meta/recipes-devtools/meson/meson_0.64.0.bb
@@ -18,7 +18,7 @@  SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \
            file://0001-is_debianlike-always-return-False.patch \
            file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \
            "
-SRC_URI[sha256sum] = "519c0932e1a8b208741f0fdce90aa5c0b528dd297cf337009bf63539846ac056"
+SRC_URI[sha256sum] = "c5e27e091c2a35b9049e152a6535045ebbd057253aeb67856de6ecbb7b917bab"
 
 inherit python_setuptools_build_meta github-releases