diff options
author | Matteo Bernardini | 2022-08-02 09:52:43 +0200 |
---|---|---|
committer | Matteo Bernardini | 2022-08-02 09:52:43 +0200 |
commit | 93fc3c470fe292665db464c7ae9d370fb47851a9 (patch) | |
tree | 16ae319d8b113339b4747b83a80f7af61d20286e /office/evince/Remove-incorrect-args-for-i18n.merge_file.patch | |
parent | 7d5e7e0843f54c6ba993f6b6fd99f766b51217a2 (diff) | |
download | slackbuilds-b004123432b97f647c38e1dc69077738bfa99c19.tar.gz |
20220802.1 global branch merge.current-20220802.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'office/evince/Remove-incorrect-args-for-i18n.merge_file.patch')
-rw-r--r-- | office/evince/Remove-incorrect-args-for-i18n.merge_file.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/office/evince/Remove-incorrect-args-for-i18n.merge_file.patch b/office/evince/Remove-incorrect-args-for-i18n.merge_file.patch new file mode 100644 index 0000000000..d444af8369 --- /dev/null +++ b/office/evince/Remove-incorrect-args-for-i18n.merge_file.patch @@ -0,0 +1,51 @@ +From: r-value <i@rvalue.moe> +Date: Wed, 17 Nov 2021 18:22:45 +0800 +Subject: Remove incorrect args for i18n.merge_file + +`i18n.merge_file` has been ignoring positional arguments for +a time and explicitly rejects with error since meson 0.60.0 + +Origin: upstream, 42.0, commit:1060b24d051607f14220f148d2f7723b29897a54 +Bug-Debian: https://bugs.debian.org/1005520 +--- + backend/meson.build | 1 - + data/meson.build | 1 - + meson.build | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/backend/meson.build b/backend/meson.build +index 14629f2..2f972a8 100644 +--- a/backend/meson.build ++++ b/backend/meson.build +@@ -53,7 +53,6 @@ foreach backend, backend_mime_types: backends + ) + + i18n.merge_file( +- appstream, + input: appstream_in, + output: appstream, + po_dir: po_dir, +diff --git a/data/meson.build b/data/meson.build +index 8a308b8..afc3020 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -15,7 +15,6 @@ foreach desktop: desktops + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/meson.build b/meson.build +index 07fb8ec..0bb5d0f 100644 +--- a/meson.build ++++ b/meson.build +@@ -498,7 +498,6 @@ install_headers( + appdata = ev_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, |