diff options
author | wangmy <wangmy@fujitsu.com> | 2022-04-04 02:47:28 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-19 14:14:10 +0100 |
commit | 4ac64a54539f34f5d500521206551feee23d0045 (patch) | |
tree | 93d05683a9c11cb623e89e88fc1c93849342da04 /meta/recipes-support/shared-mime-info | |
parent | ecbf60aa99f99094900eb682db83bba5bf45d794 (diff) | |
download | poky-4ac64a54539f34f5d500521206551feee23d0045.tar.gz |
shared-mime-info: upgrade 2.1 -> 2.2
0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch
removed since it's included in 2.2
Changelog:
=========
* model/3mf: new
* Match shared libraries with version suffix
* model/obj: add mtllib and Blender comment based magic
* model/mtl: add Blender comment magic, increase newmtl range
* model/obj, model/mtl: new types
* Add Electron Archive Format type application/x-asar
* text/x-qml: Lower match priority to avoid conflicts with Python
* Move '*.blend' to top of Blender glob list
* Adding SPARQL media types
* application/zip: Add '*.zipx' glob and test fixture
* Added DSD mime type
* Differentiate comic book archives
* FITS: Add missing 'application/fits' and legacy globs
* Add Godot engine files
* Add FlashForge "xgcode" mime-type
* text/x-objc++src: new type
* image/heif: test .hif extension too
* image/hif: add *.hif glob
* image/heif: add another test case
* image/heif: add magics
* Add a build-tools option to allow installing only the mime data
* Add compressed SVG glob pattern '*.svg.gz'
* Add Apple Wallet pass type application/vnd.apple.pkpass
* migrate from custom itstool to builtin msgfmt for creating translated XML
* Make the remaining plain text types subclasses of text/plain
* audio/mobile-xmf: separate from audio/x-xmf
* Adding ZIM file
* Make text/x-mrml a subclass of application/xml
* image/avif: move acronym and expansion to separate fields from comment
* freedesktop_generate.sh: Don't hardcode ninja
* Add text/x-mpl2
* application/x-apple-systemprofiler+xml: require _SPCommandLineArguments in plist
* image/jpeg: add test case with embedded property list XML
* audio/vnd.dts.hd: include parent type magic in magic match
* model/gltf+json: new type
* model/gltf-binary: new type
* application/x-object: add *.mod and a test case
* application/x-mod: add some ProTracker magics and a test case
* image/jxl: include test files in test list
* tests: add trailing linefeed to mime-detection list
* Make application/x-mswinurl a subclass of text/plain
* Change description for *.desktop files to "desktop entry"
* application/x-x509-ca-cert: add magics and test cases
* application/pkix-cert: add BEGIN/END X509 CERTIFICATE magic
* application/pkix-crl: add magic and test case
* application/pkix-cert: add magic and test case
* image/jxl: new type
* Added .sc filename extension for Scala source code, as it is occasionally used
* application/schema+json: new type
* Add text/x-crystal
* application/x-krita: remove stray period from comment
* adding org-mode
* Add Elixir source code mime type
* Add two new offsets for .kra and .krz
* text/x-python3: add *.pyi glob (Python stub files)
* image/x-canon-cr3: new
* image/x-xpixmap: make XPM3 magic more specific
* image/x-xpixmap: add XPM2 magic
* application/x-troff-man: add *.[1-9] glob
* application/toml: new type
* Lower priority of "BEGIN {" for perl, awk uses that too
* Add Smacker video type video/vnd.radgamettools.smacker
* Clarify database license
* meson: make xmlto optional, build spec only if found
* application/x-7z-compressed: add *.7z.001 glob
* Add Bink video type video/vnd.radgamettools.bink
* image/x-nikon-nrw: add test case
* image/x-nikon-nrw: new type
* application/x-vhdx-disk: improve acronym and its expansion
* application/ovf: new
* application/x-qed-disk: new
* application/x-vdi-disk: new
* application/x-vmdk-disk: new
* application/x-vhd-disk, /x-vhdx-disk: new
* application/vnd.apple.numbers, .pages: add older magics and test cases
* Add text/x-dart
* application/vnd.apple.numbers, /vnd.apple.pages: new types
* xdgmime: configure as submodule
(From OE-Core rev: d82a373862eaf92f0d502e0f9e5ea413c816bfbd)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/shared-mime-info')
-rw-r--r-- | meta/recipes-support/shared-mime-info/files/0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch | 70 | ||||
-rw-r--r-- | meta/recipes-support/shared-mime-info/shared-mime-info_git.bb | 8 |
2 files changed, 3 insertions, 75 deletions
diff --git a/meta/recipes-support/shared-mime-info/files/0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch b/meta/recipes-support/shared-mime-info/files/0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch deleted file mode 100644 index d09013bb3c..0000000000 --- a/meta/recipes-support/shared-mime-info/files/0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | From 5ca815cb79f64fab9cbb428b95a861fc0c30c116 Mon Sep 17 00:00:00 2001 | ||
2 | From: Eli Schwartz <eschwartz@archlinux.org> | ||
3 | Date: Mon, 8 Nov 2021 18:22:47 -0500 | ||
4 | Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating | ||
5 | translated XML | ||
6 | |||
7 | gettext upstream has supported this for a very long time, and using it | ||
8 | means we don't need to jump through hoops to run ninja inside ninja in | ||
9 | order to generate the .mo files for itstool. | ||
10 | |||
11 | Although meson 0.60.0 added support for real targets for the built .mo | ||
12 | files, this changed the rules for output filenames, breaking the script. | ||
13 | But msgfmt does not care, and anyways comes with builtin meson functions | ||
14 | for convenient use. | ||
15 | |||
16 | Fixes #170 | ||
17 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/162] | ||
18 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
19 | --- | ||
20 | data/freedesktop_generate.sh | 12 ------------ | ||
21 | data/meson.build | 16 +++++----------- | ||
22 | 2 files changed, 5 insertions(+), 23 deletions(-) | ||
23 | delete mode 100755 data/freedesktop_generate.sh | ||
24 | |||
25 | diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh | ||
26 | deleted file mode 100755 | ||
27 | index ff13e75..0000000 | ||
28 | --- a/data/freedesktop_generate.sh | ||
29 | +++ /dev/null | ||
30 | @@ -1,12 +0,0 @@ | ||
31 | -#!/bin/sh -e | ||
32 | - | ||
33 | -src_root="$1" | ||
34 | -build_root="$2" | ||
35 | - | ||
36 | -ninja -C "${build_root}" shared-mime-info-gmo | ||
37 | - | ||
38 | -itstool \ | ||
39 | - --its "${src_root}/data/its/shared-mime-info.its" \ | ||
40 | - --join "${src_root}/data/freedesktop.org.xml.in" \ | ||
41 | - -o "${build_root}/data/freedesktop.org.xml" \ | ||
42 | - "${build_root}/po/"*".gmo" | ||
43 | diff --git a/data/meson.build b/data/meson.build | ||
44 | index 263567d..c5696f2 100644 | ||
45 | --- a/data/meson.build | ||
46 | +++ b/data/meson.build | ||
47 | @@ -1,18 +1,12 @@ | ||
48 | |||
49 | install_man('update-mime-database.1') | ||
50 | |||
51 | -freedesktop_org_xml = custom_target('freedesktop.org.xml', | ||
52 | - input : files( | ||
53 | - 'freedesktop.org.xml.in', | ||
54 | - 'its/shared-mime-info.its', | ||
55 | - 'its/shared-mime-info.loc', | ||
56 | - ), | ||
57 | +freedesktop_org_xml = i18n.merge_file( | ||
58 | + input: 'freedesktop.org.xml.in', | ||
59 | output: 'freedesktop.org.xml', | ||
60 | - command: [ | ||
61 | - find_program('freedesktop_generate.sh'), | ||
62 | - meson.source_root(), | ||
63 | - meson.build_root() | ||
64 | - ], | ||
65 | + data_dirs: '.', | ||
66 | + po_dir: '../po', | ||
67 | + type: 'xml', | ||
68 | install: true, | ||
69 | install_dir: get_option('datadir') / 'mime' / 'packages', | ||
70 | ) | ||
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 6179abfef7..387dd7bbad 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 | |||
@@ -8,11 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
8 | 8 | ||
9 | DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native xmlto-native" | 9 | DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native xmlto-native" |
10 | 10 | ||
11 | SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master \ | 11 | SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master" |
12 | file://0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch \ | 12 | SRCREV = "13695c7225c2f525a435e72739c33ac32bbfbbb9" |
13 | " | 13 | PV = "2.2" |
14 | SRCREV = "18e558fa1c8b90b86757ade09a4ba4d6a6cf8f70" | ||
15 | PV = "2.1" | ||
16 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
17 | 15 | ||
18 | inherit meson pkgconfig gettext python3native mime | 16 | inherit meson pkgconfig gettext python3native mime |