From: Markus Kurz Date: Mon, 8 Sep 2025 22:01:57 +0000 (+0200) Subject: appstream: upgrade 1.0.5 -> 1.0.6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c9bee08eb4106874844347eed60b9803dcc86a8;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git appstream: upgrade 1.0.5 -> 1.0.6 Changelog ========= Features: * compose: Accept .ttc font files * compose: Give font icons a background shape * compose: Render more elaborate font sample cards Bugfixes: * compose: Insert screenshot tags for auto-generated font screenshots * compose: Trim substring when truncating font sample text * meson: don't override appstreamcli when cross-building * compose: Prefer rendering font icon with "Regular" style * compose: Sanitize font text samples before using them as icon * Follow directory symlinks when looking for Flatpak data * compose: Drop bad private-header include in public header * compose: Drop unneeded const declaration for GKeyFile * Fix typo that prevented video metadata from being composed properly Signed-off-by: Markus Kurz Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch index 03ac5eb05b..5f4ec29628 100644 --- a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch +++ b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch @@ -1,4 +1,4 @@ -From 7372848f22d7edc01e40b0533047b34f41f6cf71 Mon Sep 17 00:00:00 2001 +From e713f4d6ce2ee198eabcc31bc734e84cdb20ea32 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Mon, 12 Dec 2022 15:42:42 +0100 Subject: [PATCH] remove hardcoded path @@ -14,7 +14,7 @@ Upstream-Status: Inappropriate [oe-specific] 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 7e89ab0..c34ea74 100644 +index ee5b179..8a06e75 100644 --- a/meson.build +++ b/meson.build @@ -194,10 +194,10 @@ endif 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 71c9aadbc9..cf26013019 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 43afdff090c4cbb2d3b4025a38b25a718c8f16b5 Mon Sep 17 00:00:00 2001 +From eafac7178683c9fe5ab50192dec004f24638b2f4 Mon Sep 17 00:00:00 2001 From: Marc Ferland Date: Fri, 26 Jul 2024 15:41:00 -0400 Subject: [PATCH] Do not build qt/tests diff --git a/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch b/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch index e522a92e14..d1994e3c4c 100644 --- a/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch +++ b/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch @@ -1,4 +1,4 @@ -From c36b6226479a20ebd910f355deddb9d5c7571213 Mon Sep 17 00:00:00 2001 +From f19365d8b90cde7d2a385f8c85b74a2565ff25fa Mon Sep 17 00:00:00 2001 From: Marc Ferland Date: Mon, 29 Jul 2024 09:35:51 -0400 Subject: [PATCH] Fix PACKAGE_PREFIX_DIR in qt/cmake/AppStreamQtConfig.cmake.in @@ -39,7 +39,7 @@ Signed-off-by: Marc Ferland 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt/cmake/AppStreamQtConfig.cmake.in b/qt/cmake/AppStreamQtConfig.cmake.in -index 63df65f2..5ab2d0ec 100644 +index 63df65f..5ab2d0e 100644 --- a/qt/cmake/AppStreamQtConfig.cmake.in +++ b/qt/cmake/AppStreamQtConfig.cmake.in @@ -1,5 +1,5 @@ diff --git a/meta/recipes-support/appstream/appstream_1.0.5.bb b/meta/recipes-support/appstream/appstream_1.0.6.bb similarity index 94% rename from meta/recipes-support/appstream/appstream_1.0.5.bb rename to meta/recipes-support/appstream/appstream_1.0.6.bb index bb293f76e2..62761380f5 100644 --- a/meta/recipes-support/appstream/appstream_1.0.5.bb +++ b/meta/recipes-support/appstream/appstream_1.0.6.bb @@ -30,7 +30,7 @@ SRC_URI = " \ file://0002-Do-not-build-qt-tests.patch \ file://0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch \ " -SRC_URI[sha256sum] = "ce0ed29e89abd5f0cf790ea87d792f1967c3413060beb30e63a979578d975121" +SRC_URI[sha256sum] = "db4439db6a33de3ca1041473501610844ddf1b72ae23016c05242c681c380b4d" S = "${UNPACKDIR}/AppStream-${PV}"