commit: e1102afb93f6b26501cab2a27b77ed39eef8f65a Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> AuthorDate: Mon Jan 24 22:37:52 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 25 00:49:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1102afb
app-text/evince: fix build with meson-0.61 Closes: https://bugs.gentoo.org/831853 Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/evince/evince-41.3.ebuild | 4 ++ .../files/41.3-fix-build-with-meson-0.61.1.patch | 54 ++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/app-text/evince/evince-41.3.ebuild b/app-text/evince/evince-41.3.ebuild index 11777c63ccda..75e615774832 100644 --- a/app-text/evince/evince-41.3.ebuild +++ b/app-text/evince/evince-41.3.ebuild @@ -67,6 +67,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch +) + src_prepare() { xdg_src_prepare 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 new file mode 100644 index 000000000000..fa0a5cd82914 --- /dev/null +++ b/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch @@ -0,0 +1,54 @@ +https://gitlab.gnome.org/GNOME/evince/-/commit/1060b24d051607f14220f148d2f7723b29897a54 +https://bugs.gentoo.org/831853 + +From: r-value <[email protected]> +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, +-- +GitLab +
