commit: 0ce8647a88d4fc41b3ba91d70735e8184fe2d770 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jan 25 00:55:55 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 25 00:55:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ce8647a
media-gfx/frogr: fix build with meson 0.61 Closes: https://bugs.gentoo.org/831497 Signed-off-by: Sam James <sam <AT> gentoo.org> .../frogr/files/frogr-1.5-meson-0.61-build.patch | 33 ++++++++++++++++++++++ media-gfx/frogr/frogr-1.5.ebuild | 3 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch b/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch new file mode 100644 index 000000000000..cb72250ae72f --- /dev/null +++ b/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch @@ -0,0 +1,33 @@ +https://gitlab.gnome.org/GNOME/frogr/-/merge_requests/5 +https://bugs.gentoo.org/831497 + +From 1eeb32b94b9e14e7ea2b9267e3378bae9e3e852d Mon Sep 17 00:00:00 2001 +From: Jan Beich <jbe...@freebsd.org> +Date: Mon, 24 Jan 2022 12:22:25 +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:32:0: ERROR: Function does not take positional arguments. +data/meson.build:42:0: ERROR: Function does not take positional arguments. +--- a/data/meson.build ++++ b/data/meson.build +@@ -29,7 +29,7 @@ data_conf.set('BINDIR', join_paths(prefix, bindir)) + generated_desktop = configure_file(input: 'org.gnome.frogr.desktop.in.in', + output: 'org.gnome.frogr.desktop.in', + configuration: data_conf) +-i18n.merge_file('desktop', ++i18n.merge_file( + input: generated_desktop, + output: 'org.gnome.frogr.desktop', + install: true, +@@ -39,7 +39,7 @@ i18n.merge_file('desktop', + + # Appdata XML file + appdatadir = join_paths(datadir, 'metainfo') +-i18n.merge_file('appdata', ++i18n.merge_file( + input: 'org.gnome.frogr.appdata.xml.in', + output: 'org.gnome.frogr.appdata.xml', + install: true, +GitLab diff --git a/media-gfx/frogr/frogr-1.5.ebuild b/media-gfx/frogr/frogr-1.5.ebuild index 011ea5c4f2b7..7d0577497123 100644 --- a/media-gfx/frogr/frogr-1.5.ebuild +++ b/media-gfx/frogr/frogr-1.5.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="6" @@ -31,6 +31,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/frogr-1.5-warning-level.patch" + "${FILESDIR}/frogr-1.5-meson-0.61-build.patch" ) src_configure() {
