| 1 |
commit: e1102afb93f6b26501cab2a27b77ed39eef8f65a |
| 2 |
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> |
| 3 |
AuthorDate: Mon Jan 24 22:37:52 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 25 00:49:09 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1102afb |
| 7 |
|
| 8 |
app-text/evince: fix build with meson-0.61 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831853 |
| 11 |
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
app-text/evince/evince-41.3.ebuild | 4 ++ |
| 15 |
.../files/41.3-fix-build-with-meson-0.61.1.patch | 54 ++++++++++++++++++++++ |
| 16 |
2 files changed, 58 insertions(+) |
| 17 |
|
| 18 |
diff --git a/app-text/evince/evince-41.3.ebuild b/app-text/evince/evince-41.3.ebuild |
| 19 |
index 11777c63ccda..75e615774832 100644 |
| 20 |
--- a/app-text/evince/evince-41.3.ebuild |
| 21 |
+++ b/app-text/evince/evince-41.3.ebuild |
| 22 |
@@ -67,6 +67,10 @@ BDEPEND=" |
| 23 |
virtual/pkgconfig |
| 24 |
" |
| 25 |
|
| 26 |
+PATCHES=( |
| 27 |
+ "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch |
| 28 |
+) |
| 29 |
+ |
| 30 |
src_prepare() { |
| 31 |
xdg_src_prepare |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch b/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch |
| 35 |
new file mode 100644 |
| 36 |
index 000000000000..fa0a5cd82914 |
| 37 |
--- /dev/null |
| 38 |
+++ b/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch |
| 39 |
@@ -0,0 +1,54 @@ |
| 40 |
+https://gitlab.gnome.org/GNOME/evince/-/commit/1060b24d051607f14220f148d2f7723b29897a54 |
| 41 |
+https://bugs.gentoo.org/831853 |
| 42 |
+ |
| 43 |
+From: r-value <i@××××××.moe> |
| 44 |
+Date: Wed, 17 Nov 2021 18:22:45 +0800 |
| 45 |
+Subject: [PATCH] Remove incorrect args for i18n.merge_file |
| 46 |
+ |
| 47 |
+`i18n.merge_file` has been ignoring positional arguments for |
| 48 |
+a time and explicitly rejects with error since meson 0.60.0 |
| 49 |
+--- |
| 50 |
+ backend/meson.build | 1 - |
| 51 |
+ data/meson.build | 1 - |
| 52 |
+ meson.build | 1 - |
| 53 |
+ 3 files changed, 3 deletions(-) |
| 54 |
+ |
| 55 |
+diff --git a/backend/meson.build b/backend/meson.build |
| 56 |
+index e44c1d6d7..ab3df9acf 100644 |
| 57 |
+--- a/backend/meson.build |
| 58 |
++++ b/backend/meson.build |
| 59 |
+@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends |
| 60 |
+ ) |
| 61 |
+ |
| 62 |
+ i18n.merge_file( |
| 63 |
+- appstream, |
| 64 |
+ input: appstream_in, |
| 65 |
+ output: appstream, |
| 66 |
+ po_dir: po_dir, |
| 67 |
+diff --git a/data/meson.build b/data/meson.build |
| 68 |
+index 8a308b853..afc302098 100644 |
| 69 |
+--- a/data/meson.build |
| 70 |
++++ b/data/meson.build |
| 71 |
+@@ -15,7 +15,6 @@ foreach desktop: desktops |
| 72 |
+ ) |
| 73 |
+ |
| 74 |
+ i18n.merge_file( |
| 75 |
+- desktop, |
| 76 |
+ type: 'desktop', |
| 77 |
+ input: desktop_in, |
| 78 |
+ output: desktop, |
| 79 |
+diff --git a/meson.build b/meson.build |
| 80 |
+index 34c86661f..f74efb3c4 100644 |
| 81 |
+--- a/meson.build |
| 82 |
++++ b/meson.build |
| 83 |
+@@ -492,7 +492,6 @@ install_headers( |
| 84 |
+ appdata = ev_namespace + '.appdata.xml' |
| 85 |
+ |
| 86 |
+ i18n.merge_file( |
| 87 |
+- appdata, |
| 88 |
+ input: appdata + '.in', |
| 89 |
+ output: appdata, |
| 90 |
+ po_dir: po_dir, |
| 91 |
+-- |
| 92 |
+GitLab |
| 93 |
+ |
Archives