Re: [OE-core] [PATCH V2] appstream: upgrade from 1.0.6 to 1.1.2

[Changqing Li <changqing.li@windriver.com>]

Hi,  Mathieu

I see V1 is on master-next-tests.  Just a kind remind that there is a  
V2 for this patch.

Regards

Changqing

On 2/25/26 11:40, Changqing Li via lists.openembedded.org wrote:
> License-Update: Update COPYING with latest from FSF
>
> * Upstream changed the dependency, libyaml changed to libfyaml, refer [1]
> * Upstream enable bash-completion by default, but bash-completion is in
>    ASSUME_PROVIDE, on host without bash-completion, appstream-native will
>    configure failed, so disable bash-completion for appstream-native
>
> [1] https://github.com/ximion/appstream/commit/2899271049c0c9716eba0ccd62b10cdb9df5746d#diff-35104d8113cb43cdd6cfaa78c780eba89165e17c580d1e6678e5c3dfbd9b23c5
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
>   .../appstream/0002-Do-not-build-qt-tests.patch    | 15 +++++++++------
>   .../{appstream_1.0.6.bb => appstream_1.1.2.bb}    | 10 ++++++----
>   2 files changed, 15 insertions(+), 10 deletions(-)
>   rename meta/recipes-support/appstream/{appstream_1.0.6.bb => appstream_1.1.2.bb} (82%)
>
> diff --git a/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch b/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch
> index cf26013019..f6bbdd180a 100644
> --- a/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch
> +++ b/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch
> @@ -1,4 +1,4 @@
> -From eafac7178683c9fe5ab50192dec004f24638b2f4 Mon Sep 17 00:00:00 2001
> +From 5763a61ca9aff2e2383c1eeb1ef3f5e6cd07c539 Mon Sep 17 00:00:00 2001
>   From: Marc Ferland <marc.ferland@sonatest.com>
>   Date: Fri, 26 Jul 2024 15:41:00 -0400
>   Subject: [PATCH] Do not build qt/tests
> @@ -23,12 +23,15 @@ Signed-off-by: Marc Ferland <marc.ferland@sonatest.com>
>    1 file changed, 2 deletions(-)
>   
>   diff --git a/qt/meson.build b/qt/meson.build
> -index 7d9ed7d..e319425 100644
> +index 407a57a..840c838 100644
>   --- a/qt/meson.build
>   +++ b/qt/meson.build
> -@@ -150,5 +150,3 @@ install_data (
> -
> - # end of Qt version loop
> - endforeach
> +@@ -130,5 +130,3 @@ install_data (
> +     join_paths(meson.current_build_dir(), 'AppStreamQtConfigVersion.cmake'),
> +     install_dir: join_paths(get_option('libdir'), 'cmake', 'AppStreamQt')
> + )
>   -
>   -subdir('tests/')
> +--
> +2.34.1
> +
> diff --git a/meta/recipes-support/appstream/appstream_1.0.6.bb b/meta/recipes-support/appstream/appstream_1.1.2.bb
> similarity index 82%
> rename from meta/recipes-support/appstream/appstream_1.0.6.bb
> rename to meta/recipes-support/appstream/appstream_1.1.2.bb
> index 62761380f5..c6ec0fff0a 100644
> --- a/meta/recipes-support/appstream/appstream_1.0.6.bb
> +++ b/meta/recipes-support/appstream/appstream_1.1.2.bb
> @@ -1,7 +1,7 @@
>   SUMMARY = "AppStream is a collaborative effort for making machine-readable software metadata easily available."
>   HOMEPAGE = "https://github.com/ximion/appstream"
>   LICENSE = "LGPL-2.1-only"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=4bf661c1e3793e55c8d1051bc5e0ae21"
>   
>   DEPENDS = " \
>       appstream-native \
> @@ -10,7 +10,7 @@ DEPENDS = " \
>       docbook-xml-dtd4-native \
>       gperf-native \
>       glib-2.0 \
> -    libyaml \
> +    libfyaml \
>       libxml2 \
>       libxmlb \
>       libxslt-native \
> @@ -19,7 +19,7 @@ DEPENDS = " \
>       python3-pygments-native \
>   "
>   
> -inherit meson gobject-introspection gettext gi-docgen pkgconfig vala
> +inherit meson gobject-introspection gettext gi-docgen pkgconfig vala bash-completion
>   
>   GIR_MESON_OPTION = "gir"
>   GIDOCGEN_MESON_OPTION = "apidocs"
> @@ -30,15 +30,17 @@ SRC_URI = " \
>   	file://0002-Do-not-build-qt-tests.patch \
>   	file://0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch \
>   "
> -SRC_URI[sha256sum] = "db4439db6a33de3ca1041473501610844ddf1b72ae23016c05242c681c380b4d"
> +SRC_URI[sha256sum] = "46b4257100e25a6468ceed7b3ab82441f47b119da3398d30aea6d7b91174b586"
>   
>   S = "${UNPACKDIR}/AppStream-${PV}"
>   
>   PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> +PACKAGECONFIG:append:class-target = " bash-completion"
>   
>   PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
>   PACKAGECONFIG[stemming] = "-Dstemming=true,-Dstemming=false,libstemmer"
>   PACKAGECONFIG[qt6] = "-Dqt=true,-Dqt=false,qtbase"
> +PACKAGECONFIG[bash-completion] = "-Dbash-completion=true,-Dbash-completion=false"
>   
>   FILES:${PN} += "${datadir}"
>   
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#231925): https://lists.openembedded.org/g/openembedded-core/message/231925
> Mute This Topic: https://lists.openembedded.org/mt/117989519/3616873
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [changqing.li@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>