public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: Changqing Li <changqing.li@windriver.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/2] appstream: upgrade from 1.0.6 to 1.1.2
Date: Tue, 24 Feb 2026 09:41:48 +0800	[thread overview]
Message-ID: <20260224014148.3328393-2-changqing.li@windriver.com> (raw)
In-Reply-To: <20260224014148.3328393-1-changqing.li@windriver.com>

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}    |  8 +++++---
 2 files changed, 14 insertions(+), 9 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..3ac5a59eb7 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 \
@@ -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: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,bash-completion"
 
 FILES:${PN} += "${datadir}"
 
-- 
2.34.1



  reply	other threads:[~2026-02-24  1:42 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-24  1:41 [PATCH 1/2] libfyaml: init add Changqing Li
2026-02-24  1:41 ` Changqing Li [this message]
2026-02-24  9:58   ` [OE-core] [PATCH 2/2] appstream: upgrade from 1.0.6 to 1.1.2 Alexander Kanavin
2026-02-24 15:44     ` Peter Kjellerstedt
2026-02-25  3:28       ` Changqing Li
2026-02-25  3:40       ` [PATCH V2] " Changqing Li
2026-03-10 11:44         ` [OE-core] " Ross Burton
2026-03-11  2:27           ` Changqing Li
     [not found]           ` <189BA872138654D8.2412760@lists.openembedded.org>
2026-03-13  2:30             ` Changqing Li
     [not found]       ` <18976046C73DA293.1454197@lists.openembedded.org>
2026-02-25  4:39         ` Changqing Li

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260224014148.3328393-2-changqing.li@windriver.com \
    --to=changqing.li@windriver.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox