Convert to meson, replace custom call to
update-mime-database with a built-in meson option.
Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com>
---
.../shared-mime-info/shared-mime-info_git.bb | 24 +++++--------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
index f0d5bc62e9..e82c818e5c 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
@@ -5,19 +5,19 @@ SECTION = "base"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native"
+DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native
xmlto-native"
SRC_URI =
"git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https"
-SRCREV = "829b26d85e7d89a0caee03046c3bce373f04c80a"
-PV = "1.15"
+SRCREV = "ef58b2b2f7ad4070171c6e45e3b3764daa3ff2c1"
+PV = "2.0"
S = "${WORKDIR}/git"
-inherit autotools pkgconfig gettext python3native mime
+inherit meson pkgconfig gettext python3native mime
-EXTRA_OECONF = "--disable-update-mimedb"
+EXTRA_OEMESON = "-Dupdate-mimedb=true"
FILES_${PN} += "${datadir}/mime"
-FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc"
+FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc
${datadir}/gettext/its"
# freedesktop.org.xml is only required when updating the mime database,
# package it separately
@@ -25,16 +25,4 @@ PACKAGES =+ "shared-mime-info-data"
FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml"
RDEPENDS_shared-mime-info-data = "shared-mime-info"
-do_install () {
- autotools_do_install
-
- update-mime-database ${D}${datadir}/mime
-}
-
-do_install_class-native () {
- autotools_do_install
-
- ${B}/update-mime-database ${D}${datadir}/mime
-}
-
BBCLASSEXTEND = "native nativesdk"
--
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#139329):
https://lists.openembedded.org/g/openembedded-core/message/139329
Mute This Topic: https://lists.openembedded.org/mt/74747465/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
