From: Alexander Kanavin <[email protected]> Disable manpages (and remove related dependencies), as upstream has converted them to docbook 5, which oe-core does not provide.
Signed-off-by: Alexander Kanavin <[email protected]> --- .../appstream/0001-remove-hardcoded-path.patch | 4 ++-- .../appstream/0002-Do-not-build-qt-tests.patch | 5 +---- ...GE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch | 2 +- .../{appstream_1.1.2.bb => appstream_1.1.3.bb} | 12 +++--------- 4 files changed, 7 insertions(+), 16 deletions(-) rename meta/recipes-support/appstream/{appstream_1.1.2.bb => appstream_1.1.3.bb} (85%) 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 5f4ec29628..56a5479099 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 e713f4d6ce2ee198eabcc31bc734e84cdb20ea32 Mon Sep 17 00:00:00 2001 +From bf79c20cfee4a074ca752a1466dc96d0b9eb6175 Mon Sep 17 00:00:00 2001 From: Markus Volk <[email protected]> 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 ee5b179..8a06e75 100644 +index 9af5f58..ad1483d 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 f6bbdd180a..3e666181eb 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 5763a61ca9aff2e2383c1eeb1ef3f5e6cd07c539 Mon Sep 17 00:00:00 2001 +From 1a1619dce3c3fa54fa5f47f7ed89447e0805de43 Mon Sep 17 00:00:00 2001 From: Marc Ferland <[email protected]> Date: Fri, 26 Jul 2024 15:41:00 -0400 Subject: [PATCH] Do not build qt/tests @@ -32,6 +32,3 @@ index 407a57a..840c838 100644 ) - -subdir('tests/') --- -2.34.1 - 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 d1994e3c4c..8ba4de95c9 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 f19365d8b90cde7d2a385f8c85b74a2565ff25fa Mon Sep 17 00:00:00 2001 +From 4fdd29346b51eea577ee46c7166348dad19bbcb0 Mon Sep 17 00:00:00 2001 From: Marc Ferland <[email protected]> Date: Mon, 29 Jul 2024 09:35:51 -0400 Subject: [PATCH] Fix PACKAGE_PREFIX_DIR in qt/cmake/AppStreamQtConfig.cmake.in diff --git a/meta/recipes-support/appstream/appstream_1.1.2.bb b/meta/recipes-support/appstream/appstream_1.1.3.bb similarity index 85% rename from meta/recipes-support/appstream/appstream_1.1.2.bb rename to meta/recipes-support/appstream/appstream_1.1.3.bb index c6ec0fff0a..06e4f7940a 100644 --- a/meta/recipes-support/appstream/appstream_1.1.2.bb +++ b/meta/recipes-support/appstream/appstream_1.1.3.bb @@ -5,18 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4bf661c1e3793e55c8d1051bc5e0ae21" DEPENDS = " \ appstream-native \ - curl-native \ curl \ - docbook-xml-dtd4-native \ gperf-native \ - glib-2.0 \ + itstool-native \ libfyaml \ libxml2 \ libxmlb \ - libxslt-native \ - itstool-native \ - docbook-xsl-stylesheets-native \ - python3-pygments-native \ " inherit meson gobject-introspection gettext gi-docgen pkgconfig vala bash-completion @@ -30,7 +24,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] = "46b4257100e25a6468ceed7b3ab82441f47b119da3398d30aea6d7b91174b586" +SRC_URI[sha256sum] = "2624f967068427edc94f3979edae3571bb077063f5bc231f737776da527bf467" S = "${UNPACKDIR}/AppStream-${PV}" @@ -44,7 +38,7 @@ PACKAGECONFIG[bash-completion] = "-Dbash-completion=true,-Dbash-completion=false FILES:${PN} += "${datadir}" -EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}" +EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)} -Dman=false" BBCLASSEXTEND = "native" -- 2.47.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#240290): https://lists.openembedded.org/g/openembedded-core/message/240290 Mute This Topic: https://lists.openembedded.org/mt/120143423/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
