diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-06-08 09:46:54 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-09 13:14:00 +0100 |
commit | 2a3a105eaff4ab98c1849f5d76826fa66172ca89 (patch) | |
tree | 396bc4e56f192ce6ffec20a95880395fd5dce562 /meta | |
parent | f9b4abc12e048c71cd2643b5bdd521ba34f47a06 (diff) | |
download | poky-2a3a105eaff4ab98c1849f5d76826fa66172ca89.tar.gz |
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 <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/shared-mime-info/shared-mime-info_git.bb | 24 |
1 files 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" | |||
5 | LICENSE = "GPLv2" | 5 | LICENSE = "GPLv2" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
7 | 7 | ||
8 | DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native" | 8 | DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native xmlto-native" |
9 | 9 | ||
10 | SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https" | 10 | SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https" |
11 | SRCREV = "829b26d85e7d89a0caee03046c3bce373f04c80a" | 11 | SRCREV = "ef58b2b2f7ad4070171c6e45e3b3764daa3ff2c1" |
12 | PV = "1.15" | 12 | PV = "2.0" |
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
14 | 14 | ||
15 | inherit autotools pkgconfig gettext python3native mime | 15 | inherit meson pkgconfig gettext python3native mime |
16 | 16 | ||
17 | EXTRA_OECONF = "--disable-update-mimedb" | 17 | EXTRA_OEMESON = "-Dupdate-mimedb=true" |
18 | 18 | ||
19 | FILES_${PN} += "${datadir}/mime" | 19 | FILES_${PN} += "${datadir}/mime" |
20 | FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc" | 20 | FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc ${datadir}/gettext/its" |
21 | 21 | ||
22 | # freedesktop.org.xml is only required when updating the mime database, | 22 | # freedesktop.org.xml is only required when updating the mime database, |
23 | # package it separately | 23 | # package it separately |
@@ -25,16 +25,4 @@ PACKAGES =+ "shared-mime-info-data" | |||
25 | FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml" | 25 | FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml" |
26 | RDEPENDS_shared-mime-info-data = "shared-mime-info" | 26 | RDEPENDS_shared-mime-info-data = "shared-mime-info" |
27 | 27 | ||
28 | do_install () { | ||
29 | autotools_do_install | ||
30 | |||
31 | update-mime-database ${D}${datadir}/mime | ||
32 | } | ||
33 | |||
34 | do_install_class-native () { | ||
35 | autotools_do_install | ||
36 | |||
37 | ${B}/update-mime-database ${D}${datadir}/mime | ||
38 | } | ||
39 | |||
40 | BBCLASSEXTEND = "native nativesdk" | 28 | BBCLASSEXTEND = "native nativesdk" |