appstream: upgrade 1.1.2 -> 1.1.3

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 <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 5f4ec2962836a3a68495a9874b44f3f737ee5341..56a5479099f1d2ce1fc3c662c680e050f288c983 100644 (file)
--- 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 <f_l_k@t-online.de>
 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 f6bbdd180a05c1edfd529403d11f1ef382f47353..3e666181eb925c2acaa1c6d1c80724c95c6d812f 100644 (file)
--- 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 <marc.ferland@sonatest.com>
 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 d1994e3c4ce0493d564a041978ccde1ce1bc0569..8ba4de95c9cb841a8b239e6f7e81291b38a4d337 100644 (file)
--- 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 <marc.ferland@sonatest.com>
 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 c6ec0fff0a68390069cf0c7e90e7f4b10c72d241..06e4f7940a7c6630c2fa923a136b4540e8c66fc6 100644 (file)
--- 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"