summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Rob van Nues2022-05-09 22:38:15 +0200
committer Matteo Bernardini2022-10-01 10:12:27 +0200
commit7553318627d66f7a90922eb92e84666f1d817176 (patch)
tree9578295a63fb99ad1f9e7a53fbb023dd8a8f77ce
parent1bbfcb24994b4f85d5525c6a462e1110099ea32e (diff)
downloadslackbuilds-evince.tar.gz
office/evince: Patch for the newer meson.evince
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--office/evince/Remove-incorrect-args-for-i18n.merge_file.patch51
-rw-r--r--office/evince/evince.SlackBuild2
2 files changed, 53 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,
diff --git a/office/evince/evince.SlackBuild b/office/evince/evince.SlackBuild
index 8b706be14c..2cd205f7af 100644
--- a/office/evince/evince.SlackBuild
+++ b/office/evince/evince.SlackBuild
@@ -80,6 +80,8 @@ chown -R root:root .
find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
\! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+patch -p1 < $CWD/Remove-incorrect-args-for-i18n.merge_file.patch
+
mkdir build
cd build
CFLAGS="$SLKCFLAGS" \