From 32351c5db77cbae332efb39dcac1afa34bc3461b Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 16 Feb 2022 08:04:51 +0800 Subject: mm-common: upgrade 1.0.3 -> 1.0.4 refresh 0001-meson.build-do-not-ask-for-python-installation-versi.patch Changelog: ========= * Add util/doc_postprocess.py and util/doc_install.py. Generating documentation in modules that use mm-common does not require Perl in Meson builds. Meson build and skeletonmm: * Specify 'check' option in run_command(). The default value will change in future Meson releases. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...on.build-do-not-ask-for-python-installation-versi.patch | 14 +++++++++----- meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb | 12 ------------ meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb | 12 ++++++++++++ 3 files changed, 21 insertions(+), 17 deletions(-) delete mode 100644 meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb create mode 100644 meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb diff --git a/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch b/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch index 6031eaa782..7d1dbc6ee4 100644 --- a/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch +++ b/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch @@ -14,19 +14,23 @@ just ask for python3 executable. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller + +rebase for 1.0.4 +Signed-off-by: Wang Mingyu + --- meson.build | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meson.build b/meson.build -index 3255328..7a6094c 100644 +index 8a18c36..34fd546 100644 --- a/meson.build +++ b/meson.build -@@ -6,12 +6,7 @@ project('mm-common', - license: 'GPLv2+' +@@ -7,12 +7,7 @@ project('mm-common', + # and meson.add_install_script(python3, ...) ) --python3 = import('python').find_installation('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) @@ -37,5 +41,5 @@ index 3255328..7a6094c 100644 # 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.21.0 +2.25.1 diff --git a/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb b/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb deleted file mode 100644 index ae2bf2d02d..0000000000 --- a/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Common GNOME build files for C++ bindings" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase - -SRC_URI[archive.sha256sum] = "e81596625899aacf1d0bf27ccc2fcc7f373405ec48735ca1c7273c0fbcdc1ef5" -SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb b/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb new file mode 100644 index 0000000000..cee56fd55a --- /dev/null +++ b/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb @@ -0,0 +1,12 @@ +SUMMARY = "Common GNOME build files for C++ bindings" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase + +SRC_URI[archive.sha256sum] = "e954c09b4309a7ef93e13b69260acdc5738c907477eb381b78bb1e414ee6dbd8" +SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf