summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2023-09-17 20:28:24 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-20 08:57:26 +0100
commit3be4d2d4cd192867d6b0c25de7a7f3b917f2a120 (patch)
tree261f1246ee81f5b35aa30e4e3c397ef68601e460 /meta
parent2564f3a432f8a6200d26c9ff91f82e0a51a268f8 (diff)
downloadpoky-3be4d2d4cd192867d6b0c25de7a7f3b917f2a120.tar.gz
appstream: import recipe from meta-oe
libadwaita 1.4.0 has a dependency on it (From OE-Core rev: 913f1b0f17374bb20cc3e2bc80c47a1548faa202) Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch36
-rw-r--r--meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch31
-rw-r--r--meta/recipes-support/appstream/appstream_0.16.3.bb45
3 files changed, 112 insertions, 0 deletions
diff --git a/meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch b/meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
new file mode 100644
index 0000000000..d4f2951e7a
--- /dev/null
+++ b/meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
@@ -0,0 +1,36 @@
1From 79bf322768990b28c29a9d907edcca52ff48e0b8 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
3Date: Wed, 26 Jul 2023 23:21:10 +0400
4Subject: meson: do not rely on an exe wrapper
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
10
11Upstream-Status: Backport [https://github.com/ximion/appstream/commit/79bf322768990b28c29a9d907edcca52ff48e0b8]
12---
13 data/meson.build | 7 +++++++
14 1 file changed, 7 insertions(+)
15
16diff --git a/data/meson.build b/data/meson.build
17index aea0cb25..ec0e434f 100644
18--- a/data/meson.build
19+++ b/data/meson.build
20@@ -7,6 +7,13 @@ install_data('its/metainfo.its',
21 install_data('its/metainfo.loc',
22 install_dir: join_paths(get_option('datadir'), 'gettext', 'its'))
23
24+# Do not rely on an exe wrapper for rel-info, use the system one in that case
25+if meson.is_cross_build()
26+ dependency('appstream', version: '>=' + as_version, native: true,
27+ not_found_message: 'Native appstream required for cross-building')
28+ ascli_exe = find_program('appstreamcli')
29+endif
30+
31 # NOTE: We do not translate the release notes on purpose here.
32 # If you do want to give translators a chance to translate them,
33 # ascli news-to-metainfo needs to produce a temporary file to translate
34--
352.41.0
36
diff --git a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
new file mode 100644
index 0000000000..9cbfaca82f
--- /dev/null
+++ b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
@@ -0,0 +1,31 @@
1From 6ab00a4279823829a9b82dc9e4d055da4de88c6e Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Mon, 12 Dec 2022 15:42:42 +0100
4Subject: [PATCH] remove hardcoded path
5
6Signed-off-by: Markus Volk <f_l_k@t-online.de>
7
8Dont include hardcoded path. This fixes:
9| cc1: error: include location "/usr/include" is unsafe for cross-compilation [-Werror=poison-system-directories]
10
11Upstream-Status: Inappropriate [oe-specific]
12---
13 meson.build | 2 +-
14 1 files changed, 1 insertions(+), 1 deletions(-)
15
16diff --git a/meson.build b/meson.build
17index fd0e3373..2f273ada 100644
18--- a/meson.build
19+++ b/meson.build
20@@ -124,7 +124,7 @@ if get_option ('gir')
21 dependency('gobject-introspection-1.0', version: '>=1.56')
22 endif
23
24-stemmer_inc_dirs = include_directories(['/usr/include'])
25+stemmer_inc_dirs = include_directories([''])
26 if get_option('stemming')
27 stemmer_lib = cc.find_library('stemmer', required: true)
28 if not cc.has_header('libstemmer.h')
29--
302.34.1
31
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..bde679e256
--- /dev/null
+++ b/meta/recipes-support/appstream/appstream_0.16.3.bb
@@ -0,0 +1,45 @@
1SUMMARY = "AppStream is a collaborative effort for making machine-readable software metadata easily available."
2HOMEPAGE = "https://github.com/ximion/appstream"
3LICENSE = "LGPL-2.1-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da"
5
6DEPENDS = " \
7 appstream-native \
8 curl-native \
9 curl \
10 docbook-xml-dtd4-native \
11 gperf-native \
12 glib-2.0 \
13 libyaml \
14 libxml2 \
15 libxmlb \
16 libxslt-native \
17 itstool-native \
18 docbook-xsl-stylesheets-native \
19 python3-pygments-native \
20"
21
22inherit meson gobject-introspection gettext gtk-doc pkgconfig vala
23
24GIR_MESON_OPTION = "gir"
25GTKDOC_MESON_OPTION = "apidocs"
26
27SRC_URI = " \
28 https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz \
29 file://0001-remove-hardcoded-path.patch \
30 file://0001-meson-do-not-rely-on-an-exe-wrapper.patch \
31"
32SRC_URI[sha256sum] = "081c917646e94d7221c9e4aae54dacda95a27c607fa93cd8e6344a2b318b98b1"
33
34S = "${WORKDIR}/AppStream-${PV}"
35
36PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
37
38PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
39PACKAGECONFIG[stemming] = "-Dstemming=true,-Dstemming=false,libstemmer"
40
41FILES:${PN} += "${datadir}"
42
43EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}"
44
45BBCLASSEXTEND = "native"