| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 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 | ) |