]> git.pld-linux.org Git - packages/evince.git/commitdiff
- meson fixes from git auto/th/evince-41.4-1
authorJakub Bogusz <qboosh@pld-linux.org>
Wed, 16 Mar 2022 21:10:57 +0000 (22:10 +0100)
committerJakub Bogusz <qboosh@pld-linux.org>
Wed, 16 Mar 2022 21:10:57 +0000 (22:10 +0100)
evince-meson.patch [new file with mode: 0644]

diff --git a/evince-meson.patch b/evince-meson.patch
new file mode 100644 (file)
index 0000000..9f24044
--- /dev/null
@@ -0,0 +1,49 @@
+From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Wed, 17 Nov 2021 18:22:45 +0800
+Subject: [PATCH] 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
+---
+ 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 e44c1d6d7..ab3df9acf 100644
+--- a/backend/meson.build
++++ b/backend/meson.build
+@@ -50,7 +50,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 8a308b853..afc302098 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 34c86661f..f74efb3c4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -492,7 +492,6 @@ install_headers(
+ appdata = ev_namespace + '.appdata.xml'
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
This page took 0.035862 seconds and 4 git commands to generate.