diff mbox series

[meta-gnome,18/18] appstream: remove recipe

Message ID 20230918215156.1920452-18-f_l_k@t-online.de
State Under Review
Headers show
Series [meta-gnome,01/18] gvfs: upgrade 1.51.90 -> 1.52.0 | expand

Commit Message

Markus Volk Sept. 18, 2023, 9:51 p.m. UTC
It was moved to oe-core

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...-meson-do-not-rely-on-an-exe-wrapper.patch | 36 ---------------
 .../0001-remove-hardcoded-path.patch          | 31 -------------
 .../appstream/appstream_0.16.3.bb             | 45 -------------------
 3 files changed, 112 deletions(-)
 delete mode 100644 meta-oe/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
 delete mode 100644 meta-oe/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
 delete mode 100644 meta-oe/recipes-support/appstream/appstream_0.16.3.bb
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch b/meta-oe/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
deleted file mode 100644
index 6214b6f4d..000000000
--- a/meta-oe/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
+++ /dev/null
@@ -1,36 +0,0 @@ 
-From 79bf322768990b28c29a9d907edcca52ff48e0b8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
-Date: Wed, 26 Jul 2023 23:21:10 +0400
-Subject: [PATCH 01/60] meson: do not rely on an exe wrapper
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-
-Upstream-Status: Backport [https://github.com/ximion/appstream/commit/79bf322768990b28c29a9d907edcca52ff48e0b8]
----
- data/meson.build | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/data/meson.build b/data/meson.build
-index aea0cb25..ec0e434f 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -7,6 +7,13 @@ install_data('its/metainfo.its',
- install_data('its/metainfo.loc',
-               install_dir: join_paths(get_option('datadir'), 'gettext', 'its'))
- 
-+# Do not rely on an exe wrapper for rel-info, use the system one in that case
-+if meson.is_cross_build()
-+    dependency('appstream', version: '>=' + as_version, native: true,
-+               not_found_message: 'Native appstream required for cross-building')
-+    ascli_exe = find_program('appstreamcli')
-+endif
-+
- # NOTE: We do not translate the release notes on purpose here.
- # If you do want to give translators a chance to translate them,
- # ascli news-to-metainfo needs to produce a temporary file to translate
--- 
-2.41.0
-
diff --git a/meta-oe/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch b/meta-oe/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
deleted file mode 100644
index 9cbfaca82..000000000
--- a/meta-oe/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
-From 6ab00a4279823829a9b82dc9e4d055da4de88c6e 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
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
-
-Dont include hardcoded path. This fixes:
-| cc1: error: include location "/usr/include" is unsafe for cross-compilation [-Werror=poison-system-directories]
-
-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
-
diff --git a/meta-oe/recipes-support/appstream/appstream_0.16.3.bb b/meta-oe/recipes-support/appstream/appstream_0.16.3.bb
deleted file mode 100644
index 1d466ad18..000000000
--- a/meta-oe/recipes-support/appstream/appstream_0.16.3.bb
+++ /dev/null
@@ -1,45 +0,0 @@ 
-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 \
-	file://0001-remove-hardcoded-path.patch \
-	file://0001-meson-do-not-rely-on-an-exe-wrapper.patch \
-"
-SRC_URI[sha256sum] = "081c917646e94d7221c9e4aae54dacda95a27c607fa93cd8e6344a2b318b98b1"
-
-S = "${WORKDIR}/AppStream-${PV}"
-
-PACKAGECONFIG ?= "stemming ${@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 += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}"
-
-BBCLASSEXTEND = "native"