mm-common: upgrade 1.0.4 -> 1.0.6

ChangeLog:
https://gitlab.gnome.org/GNOME/mm-common/-/blob/1.0.6/NEWS

Drop 0001-meson.build-do-not-ask-for-python-installation-versi.patch as
the issue has been fixed upstream.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao 2024-09-12 10:45:52 +08:00 committed by Khem Raj
parent 7f577da746
commit 8bfa426281
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 1 additions and 47 deletions

View File

@ -1,45 +0,0 @@
From af4069263487399be82ee53d48b1edda7f8e594e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 4 Nov 2019 19:19:47 +0100
Subject: [PATCH] meson.build: do not ask for python installation / version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Even by adding python3-setuptools-native the following error is not fixed so
just ask for python3 executable.
| meson.build:9:0: ERROR: <ExternalProgram 'python3' -> ['<...>/recipe-sysroot-native/usr/bin/python3-native/python3']> is not a valid python or it is missing setuptools
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
rebase for 1.0.4
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
meson.build | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 8a18c36..34fd546 100644
--- a/meson.build
+++ b/meson.build
@@ -7,12 +7,7 @@ project('mm-common',
# and meson.add_install_script(python3, ...)
)
-python3 = import('python').find_installation()
-python_version = python3.language_version()
-python_version_req = '>= 3.5'
-if not python_version.version_compare(python_version_req)
- error('Requires Python @0@, found @1@.'.format(python_version_req, python_version))
-endif
+python3 = import('python3').find_python()
# Use these instead of meson.source_root() and meson.build_root().
# source_root() and build_root() are not useful, if this is a subproject.
--
2.25.1

View File

@ -8,8 +8,7 @@ inherit gnomebase
# All the recipe does is stage python and shell script, some autotools files; nothing is compiled.
inherit allarch
SRC_URI[archive.sha256sum] = "e954c09b4309a7ef93e13b69260acdc5738c907477eb381b78bb1e414ee6dbd8"
SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch"
SRC_URI[archive.sha256sum] = "b55c46037dbcdabc5cee3b389ea11cc3910adb68ebe883e9477847aa660862e7"
BBCLASSEXTEND = "native nativesdk"