From patchwork Fri Sep 8 13:04:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 30203 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F38AAEE7FF1 for ; Fri, 8 Sep 2023 13:04:16 +0000 (UTC) Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by mx.groups.io with SMTP id smtpd.web10.38227.1694178251923835353 for ; Fri, 08 Sep 2023 06:04:12 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.80, mailfrom: f_l_k@t-online.de) Received: from fwd78.aul.t-online.de (fwd78.aul.t-online.de [10.223.144.104]) by mailout01.t-online.de (Postfix) with SMTP id D91971F8C5 for ; Fri, 8 Sep 2023 15:04:07 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.154.164.221]) by fwd78.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1qeb9a-3y8yGH0; Fri, 8 Sep 2023 15:04:06 +0200 From: Markus Volk To: openembedded-core@lists.openembedded.org Subject: [RFC][oe-core][PATCH] RFC: import libxmlb and appstream from meta-oe Date: Fri, 8 Sep 2023 15:04:07 +0200 Message-ID: <20230908130407.2676-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1694178246-348C816C-BF7B6754/0/0 CLEAN NORMAL X-TOI-MSGID: 02e2971f-53a4-46a3-83ef-d42ec347297e List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 08 Sep 2023 13:04:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187417 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 --- meta/conf/distro/include/maintainers.inc | 2 + .../appstream/0001-fix-crosscompile.patch | 43 +++++++++++++++ .../appstream/appstream_0.16.3.bb | 52 +++++++++++++++++++ .../recipes-support/libxmlb/libxmlb/run-ptest | 3 ++ .../recipes-support/libxmlb/libxmlb_0.3.14.bb | 24 +++++++++ 5 files changed, 124 insertions(+) create mode 100644 meta/recipes-support/appstream/appstream/0001-fix-crosscompile.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 diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 3619588ae6..18977fd671 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -40,6 +40,7 @@ RECIPE_MAINTAINER:pn-alsa-ucm-conf = "Michael Opdenacker " RECIPE_MAINTAINER:pn-libxml-simple-perl = "Tim Orling " RECIPE_MAINTAINER:pn-libxml2 = "Hongxu Jia " +RECIPE_MAINTAINER:pn-libxmlb = "Markus Volk " RECIPE_MAINTAINER:pn-libxmu = "Unassigned " RECIPE_MAINTAINER:pn-libxpm = "Unassigned " RECIPE_MAINTAINER:pn-libxrandr = "Unassigned " diff --git a/meta/recipes-support/appstream/appstream/0001-fix-crosscompile.patch b/meta/recipes-support/appstream/appstream/0001-fix-crosscompile.patch new file mode 100644 index 0000000000..fe8dcff910 --- /dev/null +++ b/meta/recipes-support/appstream/appstream/0001-fix-crosscompile.patch @@ -0,0 +1,43 @@ +From 6ab00a4279823829a9b82dc9e4d055da4de88c6e Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Mon, 12 Dec 2022 15:42:42 +0100 +Subject: [PATCH] fix crosscompile + +Signed-off-by: Markus Volk + +Upstream-Status: Inappropriate [oe-specific] +--- + data/meson.build | 2 +- + meson.build | 2 +- + tools/meson.build | 9 +++++++++ + 3 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index aea0cb25..1a085fc9 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -14,7 +14,7 @@ install_data('its/metainfo.loc', + metainfo_with_relinfo = custom_target('gen-output', + input : ['../NEWS', 'org.freedesktop.appstream.cli.metainfo.xml'], + output : ['nol10n_withrelinfo_org.freedesktop.appstream.cli.metainfo.xml'], +- command : [ascli_exe, 'news-to-metainfo', '--limit=6', '@INPUT0@', '@INPUT1@', '@OUTPUT@'] ++ command : ['appstreamcli', 'news-to-metainfo', '--limit=6', '@INPUT0@', '@INPUT1@', '@OUTPUT@'] + ) + + metainfo_i18n = i18n.itstool_join( +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 + diff --git a/meta/recipes-support/appstream/appstream_0.16.3.bb b/meta/recipes-support/appstream/appstream_0.16.3.bb new file mode 100644 index 0000000000..52d23732af --- /dev/null +++ b/meta/recipes-support/appstream/appstream_0.16.3.bb @@ -0,0 +1,52 @@ +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" + +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" +SRC_URI:append:class-target = " file://0001-fix-crosscompile.patch" +SRC_URI[sha256sum] = "081c917646e94d7221c9e4aae54dacda95a27c607fa93cd8e6344a2b318b98b1" + +S = "${WORKDIR}/AppStream-${PV}" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[stemming] = "-Dstemming=true,-Dstemming=false,libstemmer" + +FILES:${PN} += "${datadir}" + +EXTRA_OEMESON:class-target += " \ + --cross-file=${WORKDIR}/meson-${PN}.cross \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)} \ +" + +do_write_config:append:class-target() { + cat >${WORKDIR}/meson-${PN}.cross <