Skip to contentSkip to conversation

RFC: import libxmlb and appstream from meta-oe

PATCH Markus Volk 1 participant 1 message Sep 8, 2023 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

v3 removes the :append from SRC_URI because we dont need to differ between native/target anymore

Quoted 211 lines · Markus Volk

The upcoming libadwaita update will have a required dependency on appstream, so these will be required in oe-core.

In order to be able to use snowball for appstream by default, also libstemmer would need to be moved.

Signed-off-by Markus Volk <[email protected] <mailto:[email protected]>>
---
 meta/conf/distro/include/maintainers.inc      |  2 +
 .../0001-remove-hardcoded-path.patch          | 31 +++++++++++++
 .../appstream/appstream_0.16.3.bb             | 44 
+++++++++++++++++++
 .../recipes-support/libxmlb/libxmlb/run-ptest |  3 ++
 .../recipes-support/libxmlb/libxmlb_0.3.14.bb | 24 ++++++++++
 5 files changed, 104 insertions(+)
 create mode 100644 
meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
 create mode 100644 meta/recipes-support/appstream/appstream_0.16.3.bb
 create mode 100644 meta/recipes-support/libxmlb/libxmlb/run-ptest
 create mode 100644 meta/recipes-support/libxmlb/libxmlb_0.3.14.bb
meta/conf/distro/include/maintainers.inc +0 -0
index 3619588ae6..18977fd671 100644
@@ -40,6 +40,7 @@ RECIPE_MAINTAINER:pn-alsa-ucm-conf = "Michael 

Opdenacker <michael.opdenacker@boo
RECIPE_MAINTAINER:pn-alsa-utils = "Michael Opdenacker
<[email protected] <mailto:[email protected]>>"
RECIPE_MAINTAINER:pn-apr = "Hongxu Jia <[email protected]
<mailto:[email protected]>>"
RECIPE_MAINTAINER:pn-apr-util = "Hongxu Jia
<[email protected] <mailto:[email protected]>>" +RECIPE_MAINTAINER:pn-appstream = "Markus Volk <[email protected] <mailto:[email protected]>>"
RECIPE_MAINTAINER:pn-apt = "Unassigned <[email protected]
<mailto:[email protected]>>"
RECIPE_MAINTAINER:pn-argp-standalone = "Khem Raj <[email protected]
<mailto:[email protected]>>"
RECIPE_MAINTAINER:pn-asciidoc = "Yi Zhao <[email protected]
<mailto:[email protected]>>"

meta/conf/distro/include/maintainers.inc +0 -0
@@ -447,6 +448,7 @@ RECIPE_MAINTAINER:pn-libxml-sax-base-perl = "Tim 

Orling <[email protected]
RECIPE_MAINTAINER:pn-libxml-sax-perl = "Tim Orling
<[email protected] <mailto:[email protected]>>"
RECIPE_MAINTAINER:pn-libxml-simple-perl = "Tim Orling
<[email protected] <mailto:[email protected]>>"
RECIPE_MAINTAINER:pn-libxml2 = "Hongxu Jia <[email protected]
<mailto:[email protected]>>" +RECIPE_MAINTAINER:pn-libxmlb = "Markus Volk <[email protected] <mailto:[email protected]>>"
RECIPE_MAINTAINER:pn-libxmu = "Unassigned
<[email protected] <mailto:[email protected]>>"
RECIPE_MAINTAINER:pn-libxpm = "Unassigned
<[email protected] <mailto:[email protected]>>"
RECIPE_MAINTAINER:pn-libxrandr = "Unassigned
<[email protected] <mailto:[email protected]>>"

(quoted diff) +0 -0
new file mode 100644
index 0000000000..9cbfaca82f

b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch

(quoted diff) +1 -0
@@ -0,0 +1,31 @@
+From 6ab00a4279823829a9b82dc9e4d055da4de88c6e Mon Sep 17 00:00:00 

2001

(quoted diff) +5 -0
+From: Markus Volk <[email protected] <mailto:[email protected]>>
+Date: Mon, 12 Dec 2022 15:42:42 +0100
+Subject: [PATCH] remove hardcoded path
+
+Signed-off-by: Markus Volk <[email protected] 

<mailto:[email protected]>>

(quoted diff) +3 -0
+
+Dont include hardcoded path. This fixes:
+| cc1: error: include location "/usr/include" is unsafe for 

cross-compilation [-Werror=poison-system-directories]

(quoted diff) +22 -0
+
+Upstream-Status: Inappropriate [oe-specific]
+---
+ meson.build       | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index fd0e3373..2f273ada 100644
+--- a/meson.build
++++ b/meson.build
+@@ -124,7 +124,7 @@ if get_option ('gir')
+     dependency('gobject-introspection-1.0', version: '>=1.56')
+ endif
+
+-stemmer_inc_dirs = include_directories(['/usr/include'])
++stemmer_inc_dirs = include_directories([''])
+ if get_option('stemming')
+     stemmer_lib = cc.find_library('stemmer', required: true)
+     if not cc.has_header('libstemmer.h')
+--
+2.34.1
+
meta/recipes-support/appstream/appstream_0.16.3.bb new file +1 -0
new file mode 100644
index 0000000000..7fbe51fc87
@@ -0,0 +1,44 @@
+SUMMARY = "AppStream is a collaborative effort for making 

machine-readable software metadata easily available."

meta/recipes-support/appstream/appstream_0.16.3.bb new file +3 -0
+HOMEPAGE = "<https://github.com/ximion/appstream>"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = 

"file://COPYING;md5=435ed639f84d4585d93824e7da3d85da" <file://copying;md5=435ed639f84d4585d93824e7da3d85da/>

meta/recipes-support/appstream/appstream_0.16.3.bb new file +24 -0
+
+DEPENDS = " \
+    appstream-native \
+    curl-native \
+    curl \
+    docbook-xml-dtd4-native \
+    gperf-native \
+    glib-2.0 \
+    libyaml \
+    libxml2 \
+    libxmlb \
+    libxslt-native \
+    itstool-native \
+    docbook-xsl-stylesheets-native \
+    python3-pygments-native \
+"
+
+inherit meson gobject-introspection gettext gtk-doc pkgconfig vala
+
+GIR_MESON_OPTION = "gir"
+GTKDOC_MESON_OPTION = "apidocs"
+
+SRC_URI = " \
+	https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz 

<https://www.freedesktop.org/software/appstream/releases/AppStream-$%7BPV%7D.tar.xz> \

meta/recipes-support/appstream/appstream_0.16.3.bb new file +1 -0
+	file://0001-remove-hardcoded-path.patch 

<file://0001-remove-hardcoded-path.patch/> \
+"
+SRC_URI[sha256sum] = "081c917646e94d7221c9e4aae54dacda95a27c607fa93cd8e6344a2b318b98b1"

meta/recipes-support/appstream/appstream_0.16.3.bb new file +4 -0
+
+S = "${WORKDIR}/AppStream-${PV}"
+
+PACKAGECONFIG ?= "${@bb.utils.filter 

<mailto:${@bb.utils.filter>('DISTRO_FEATURES', 'systemd', d)}"

meta/recipes-support/appstream/appstream_0.16.3.bb new file +3 -0
+
+PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
+PACKAGECONFIG[stemming] = 

"-Dstemming=true,-Dstemming=false,libstemmer"

meta/recipes-support/appstream/appstream_0.16.3.bb new file +4 -0
+
+FILES:${PN} += "${datadir}"
+
+EXTRA_OEMESON += "${@bb.utils.contains 

<mailto:${@bb.utils.contains>('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}"

meta/recipes-support/appstream/appstream_0.16.3.bb new file +2 -0
+
+BBCLASSEXTEND = "native"
meta/recipes-support/libxmlb/libxmlb/run-ptest new file +3 -0
new file mode 100644
index 0000000000..6d0bb95d3a
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+gnome-desktop-testing-runner libxmlb
meta/recipes-support/libxmlb/libxmlb_0.3.14.bb new file +3 -0
new file mode 100644
index 0000000000..90f8844051
@@ -0,0 +1,24 @@
+SUMMARY = "A library to help create and query binary XML blobs"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = 

"file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" <file://license;md5=1803fa9c2c3ce8cb06b4861d75310742/>

meta/recipes-support/libxmlb/libxmlb_0.3.14.bb new file +2 -0
+
+SRC_URI = 

"git://github.com/hughsie/libxmlb.git;branch=main;protocol=https \

meta/recipes-support/libxmlb/libxmlb_0.3.14.bb new file +8 -0
+           file://run-ptest <file://run-ptest/> \
+           "
+SRCREV = "aa577b276adc66564f5777f9a522ca3bf0bfa65e"
+S = "${WORKDIR}/git"
+
+DEPENDS = "glib-2.0 xz zstd"
+
+inherit gobject-introspection gtk-doc meson ptest-gnome lib_package 

pkgconfig

meta/recipes-support/libxmlb/libxmlb_0.3.14.bb new file +3 -0
+
+PACKAGECONFIG ??= "\
+    ${@bb.utils.contains 

<mailto:${@bb.utils.contains>('PTEST_ENABLED', '1', 'tests', '', d)} \
+"

meta/recipes-support/libxmlb/libxmlb_0.3.14.bb new file +7 -1
+PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false"
+
+GTKDOC_MESON_OPTION = "gtkdoc"
+
+FILES:${PN}-bin += "${libexecdir}"
+
+BBCLASSEXTEND = "native"
--

2.41.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#187438): <https://lists.openembedded.org/g/openembedded-core/message/187438>
Mute This Topic: <https://lists.openembedded.org/mt/101238702/3618223>
Group Owner: [email protected] <mailto:[email protected]>
Unsubscribe: <https://lists.openembedded.org/g/openembedded-core/unsub> [[email protected] <mailto:[email protected]>]
-=-=-=-=-=-=-=-=-=-=-=-