mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 06:06:43 +00:00
shared-mime-info: updated build opts & patches
- conditionally install to sysroot & update db for sway - db generation for arm
This commit is contained in:
parent
e11ef2509d
commit
b26f261433
@ -7,8 +7,24 @@ PKG_SHA256="37df6475da31a8b5fc63a54ba0770a3eefa0a708b778cb6366dccee96393cb60"
|
|||||||
PKG_LICENSE="GPL2"
|
PKG_LICENSE="GPL2"
|
||||||
PKG_SITE="https://freedesktop.org/wiki/Software/shared-mime-info/"
|
PKG_SITE="https://freedesktop.org/wiki/Software/shared-mime-info/"
|
||||||
PKG_URL="https://gitlab.freedesktop.org/xdg/${PKG_NAME}/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
PKG_URL="https://gitlab.freedesktop.org/xdg/${PKG_NAME}/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||||
PKG_DEPENDS_TARGET="toolchain glib libxml2 gettext itstool:host"
|
PKG_DEPENDS_HOST="toolchain:host glib:host libxml2:host gettext:host itstool:host"
|
||||||
|
PKG_DEPENDS_TARGET="toolchain glib libxml2 gettext shared-mime-info:host"
|
||||||
PKG_LONGDESC="The shared-mime-info package contains the core database of common types."
|
PKG_LONGDESC="The shared-mime-info package contains the core database of common types."
|
||||||
PKG_BUILD_FLAGS="-parallel -sysroot"
|
PKG_BUILD_FLAGS="-parallel"
|
||||||
|
|
||||||
|
configure_package() {
|
||||||
|
# Sway Support
|
||||||
|
if [ ! "${WINDOWMANAGER}" = "sway" ]; then
|
||||||
|
PKG_BUILD_FLAGS+=" -sysroot"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
PKG_MESON_OPTS_HOST="-Dupdate-mimedb=false"
|
||||||
PKG_MESON_OPTS_TARGET="-Dupdate-mimedb=false"
|
PKG_MESON_OPTS_TARGET="-Dupdate-mimedb=false"
|
||||||
|
|
||||||
|
post_makeinstall_target() {
|
||||||
|
# Create /usr/share/mime/mime.cache
|
||||||
|
if [ "${WINDOWMANAGER}" = "sway" ]; then
|
||||||
|
${TOOLCHAIN}/bin/update-mime-database ${INSTALL}/usr/share/mime
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
@ -1,37 +0,0 @@
|
|||||||
diff -Nur shared-mime-info-2.1.orig/data/meson.build shared-mime-info-2.1/data/meson.build
|
|
||||||
--- shared-mime-info-2.1.orig/data/meson.build 2021-01-01 06:12:16.000000000 +1100
|
|
||||||
+++ shared-mime-info-2.1/data/meson.build 2021-01-14 00:25:58.299790452 +1100
|
|
||||||
@@ -1,6 +1,4 @@
|
|
||||||
|
|
||||||
-install_man('update-mime-database.1')
|
|
||||||
-
|
|
||||||
freedesktop_org_xml = i18n.merge_file(
|
|
||||||
input: 'freedesktop.org.xml.in',
|
|
||||||
output: 'freedesktop.org.xml',
|
|
||||||
@@ -15,15 +13,3 @@
|
|
||||||
[ 'its/shared-mime-info.loc', 'its/shared-mime-info.its', ],
|
|
||||||
install_dir : get_option('datadir') / 'gettext/its'
|
|
||||||
)
|
|
||||||
-
|
|
||||||
-custom_target('shared-mime-info-spec-html',
|
|
||||||
- input : 'shared-mime-info-spec.xml',
|
|
||||||
- output: 'shared-mime-info-spec-html',
|
|
||||||
- command: [
|
|
||||||
- xmlto,
|
|
||||||
- '-o', '@OUTPUT@',
|
|
||||||
- 'html-nochunks',
|
|
||||||
- '@INPUT@',
|
|
||||||
- ],
|
|
||||||
- build_by_default: true,
|
|
||||||
-)
|
|
||||||
diff -Nur shared-mime-info-2.1.orig/meson.build shared-mime-info-2.1/meson.build
|
|
||||||
--- shared-mime-info-2.1.orig/meson.build 2021-01-01 06:12:16.000000000 +1100
|
|
||||||
+++ shared-mime-info-2.1/meson.build 2021-01-14 00:24:18.552142696 +1100
|
|
||||||
@@ -22,7 +22,6 @@
|
|
||||||
|
|
||||||
itstool = find_program('itstool')
|
|
||||||
xmllint = find_program('xmllint')
|
|
||||||
-xmlto = find_program('xmlto')
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
# Find xdgmime
|
|
@ -0,0 +1,58 @@
|
|||||||
|
From baeb49e36bc162bcbd243e733d2a9f1eb9abfefb Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
|
||||||
|
Date: Sun, 24 Jan 2021 11:45:52 +0200
|
||||||
|
Subject: [PATCH] meson: make xmlto optional, build spec only if found
|
||||||
|
|
||||||
|
Refs https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/150
|
||||||
|
---
|
||||||
|
data/meson.build | 22 ++++++++++++----------
|
||||||
|
meson.build | 2 +-
|
||||||
|
2 files changed, 13 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/data/meson.build b/data/meson.build
|
||||||
|
index 263567d..24361c9 100644
|
||||||
|
--- a/data/meson.build
|
||||||
|
+++ b/data/meson.build
|
||||||
|
@@ -22,14 +22,16 @@ install_data(
|
||||||
|
install_dir : get_option('datadir') / 'gettext/its'
|
||||||
|
)
|
||||||
|
|
||||||
|
-custom_target('shared-mime-info-spec-html',
|
||||||
|
- input : 'shared-mime-info-spec.xml',
|
||||||
|
- output: 'shared-mime-info-spec-html',
|
||||||
|
- command: [
|
||||||
|
- xmlto,
|
||||||
|
- '-o', '@OUTPUT@',
|
||||||
|
- 'html-nochunks',
|
||||||
|
- '@INPUT@',
|
||||||
|
- ],
|
||||||
|
- build_by_default: true,
|
||||||
|
+if xmlto.found()
|
||||||
|
+ custom_target('shared-mime-info-spec-html',
|
||||||
|
+ input : 'shared-mime-info-spec.xml',
|
||||||
|
+ output: 'shared-mime-info-spec-html',
|
||||||
|
+ command: [
|
||||||
|
+ xmlto,
|
||||||
|
+ '-o', '@OUTPUT@',
|
||||||
|
+ 'html-nochunks',
|
||||||
|
+ '@INPUT@',
|
||||||
|
+ ],
|
||||||
|
+ build_by_default: true,
|
||||||
|
)
|
||||||
|
+endif
|
||||||
|
diff --git a/meson.build b/meson.build
|
||||||
|
index 9a28573..0d08c8a 100644
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -22,7 +22,7 @@ config.set_quoted('VERSION', meson.project_version())
|
||||||
|
|
||||||
|
itstool = find_program('itstool')
|
||||||
|
xmllint = find_program('xmllint')
|
||||||
|
-xmlto = find_program('xmlto')
|
||||||
|
+xmlto = find_program('xmlto', required: false)
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
# Find xdgmime
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user