commit: 563a1ad15e7b3191c8b6e65fbb8b6587d069f829 Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> AuthorDate: Mon Jan 24 22:12:19 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 25 00:49:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=563a1ad1
net-irc/polari: fix build with meson-0.61 Closes: https://bugs.gentoo.org/831922 Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/40.0-fix-build-with-meson-0.61.1.patch | 45 ++++++++++++++++++++++ net-irc/polari/polari-40.0.ebuild | 4 ++ 2 files changed, 49 insertions(+) diff --git a/net-irc/polari/files/40.0-fix-build-with-meson-0.61.1.patch b/net-irc/polari/files/40.0-fix-build-with-meson-0.61.1.patch new file mode 100644 index 000000000000..2decad2dc23f --- /dev/null +++ b/net-irc/polari/files/40.0-fix-build-with-meson-0.61.1.patch @@ -0,0 +1,45 @@ +https://gitlab.gnome.org/GNOME/polari/-/commit/0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d +https://bugs.gentoo.org/831922 + +From: Jan Beich <jbe...@freebsd.org> +Date: Mon, 24 Jan 2022 12:32:00 +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/appdata/meson.build:2:0: ERROR: Function does not take positional arguments. +data/meson.build:5:0: ERROR: Function does not take positional arguments. + +Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/242> +--- + data/appdata/meson.build | 2 +- + data/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/appdata/meson.build b/data/appdata/meson.build +index 88b4a0be..781ba22f 100644 +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,5 +1,5 @@ + appdata_name = app_id + '.appdata.xml' +-appdata = i18n.merge_file(appdata_name, ++appdata = i18n.merge_file( + input: appdata_name + '.in', + output: appdata_name, + po_dir: '../../po', +diff --git a/data/meson.build b/data/meson.build +index cedfd57b..655ae700 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,7 @@ subdir('appdata') + subdir('icons') + + desktop_filename = app_id + '.desktop' +-desktop_file = i18n.merge_file(desktop_filename, ++desktop_file = i18n.merge_file( + input: desktop_filename + '.in', + output: desktop_filename, + po_dir: '../po', +-- +GitLab + diff --git a/net-irc/polari/polari-40.0.ebuild b/net-irc/polari/polari-40.0.ebuild index 05f24422d4b5..d4342b04b5eb 100644 --- a/net-irc/polari/polari-40.0.ebuild +++ b/net-irc/polari/polari-40.0.ebuild @@ -43,6 +43,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch +) + pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update
