From 8bfa4262813f88726ccb9f851c2e97fca1cf933d Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 12 Sep 2024 10:45:52 +0800 Subject: 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 Signed-off-by: Khem Raj --- ...-do-not-ask-for-python-installation-versi.patch | 45 ---------------------- meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb | 27 ------------- meta-oe/recipes-core/mm-common/mm-common_1.0.6.bb | 26 +++++++++++++ 3 files changed, 26 insertions(+), 72 deletions(-) delete mode 100644 meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch delete mode 100644 meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb create mode 100644 meta-oe/recipes-core/mm-common/mm-common_1.0.6.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 deleted file mode 100644 index 4866a5fbe0..0000000000 --- a/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch +++ /dev/null @@ -1,45 +0,0 @@ -From af4069263487399be82ee53d48b1edda7f8e594e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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: ['<...>/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 - -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 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 - 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 deleted file mode 100644 index 3e99b38eb7..0000000000 --- a/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Common GNOME build files for C++ bindings" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - - -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" - -BBCLASSEXTEND = "native nativesdk" - -# These files aren't very usefull on target image, package them all in nnPN-dev -FILES:${PN} = "" - -FILES:${PN}-dev += " \ - ${datadir}/${BPN}/build \ - ${datadir}/${BPN}/doctags \ - ${datadir}/${BPN}/doctool \ - ${bindir}/mm-common-get \ - ${bindir}/mm-common-prepare \ -" -# ${PN} package is empty, remove the default dependency on it -RDEPENDS:${PN}-dev = "" diff --git a/meta-oe/recipes-core/mm-common/mm-common_1.0.6.bb b/meta-oe/recipes-core/mm-common/mm-common_1.0.6.bb new file mode 100644 index 0000000000..a252a6b48e --- /dev/null +++ b/meta-oe/recipes-core/mm-common/mm-common_1.0.6.bb @@ -0,0 +1,26 @@ +SUMMARY = "Common GNOME build files for C++ bindings" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + + +inherit gnomebase + +# All the recipe does is stage python and shell script, some autotools files; nothing is compiled. +inherit allarch + +SRC_URI[archive.sha256sum] = "b55c46037dbcdabc5cee3b389ea11cc3910adb68ebe883e9477847aa660862e7" + +BBCLASSEXTEND = "native nativesdk" + +# These files aren't very usefull on target image, package them all in nnPN-dev +FILES:${PN} = "" + +FILES:${PN}-dev += " \ + ${datadir}/${BPN}/build \ + ${datadir}/${BPN}/doctags \ + ${datadir}/${BPN}/doctool \ + ${bindir}/mm-common-get \ + ${bindir}/mm-common-prepare \ +" +# ${PN} package is empty, remove the default dependency on it +RDEPENDS:${PN}-dev = "" -- cgit v1.2.3-54-g00ecf