From 2a3a105eaff4ab98c1849f5d76826fa66172ca89 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 8 Jun 2020 09:46:54 +0200 Subject: shared-mime-info: upgrade 1.15 -> 2.0 Convert to meson, replace custom call to update-mime-database with a built-in meson option. (From OE-Core rev: eeb6de06d2e6b3a7edf03c17e830aafc935e6f20) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../shared-mime-info/shared-mime-info_git.bb | 24 ++++++---------------- 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'meta/recipes-support') 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" -- cgit v1.2.3-54-g00ecf