commit: d20307bf0fbaa96de81a26f454dc000e0042eb57 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jan 25 02:31:23 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 25 02:31:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d20307bf
app-text/gtranslator: fix build with meson 0.61 Closes: https://bugs.gentoo.org/831966 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/gtranslator-40.0-meson-0.61.patch | 30 ++++++++++++++++++++++ app-text/gtranslator/gtranslator-40.0.ebuild | 6 ++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch b/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch new file mode 100644 index 000000000000..a43a32eb4a6b --- /dev/null +++ b/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch @@ -0,0 +1,30 @@ +https://gitlab.gnome.org/GNOME/gtranslator/-/commit/7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22.patch +https://bugs.gentoo.org/831966 + +From: Jan Beich <jbe...@freebsd.org> +Date: Mon, 24 Jan 2022 11:57:43 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:15:0: ERROR: Function does not take positional arguments. +data/meson.build:37:0: ERROR: Function does not take positional arguments. +--- a/data/meson.build ++++ b/data/meson.build +@@ -13,7 +13,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: '@0@.desktop'.format(gtr_app_id), +@@ -35,7 +34,6 @@ appdata_in = configure_file( + ) + + i18n.merge_file( +- appdata, + input: appdata_in, + output: appdata, + po_dir: po_dir, +GitLab diff --git a/app-text/gtranslator/gtranslator-40.0.ebuild b/app-text/gtranslator/gtranslator-40.0.ebuild index 00fa6d54bb65..bb0973914e18 100644 --- a/app-text/gtranslator/gtranslator-40.0.ebuild +++ b/app-text/gtranslator/gtranslator-40.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,6 +40,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${P}-meson-0.61.patch +) + src_configure() { local emesonargs=( $(meson_use gtk-doc gtk_doc)
