commit: 2d2f6dbd13a295524fc2d39039ef983e828efd84 Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> AuthorDate: Mon Jan 24 22:57:11 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 25 00:49:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d2f6dbd
games-puzzle/gnome-sudoku: fix build with meson-0.61 Closes: https://bugs.gentoo.org/831556 Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> Closes: https://github.com/gentoo/gentoo/pull/23947 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/40.2-fix-build-with-meson-0.61.1.patch | 40 ++++++++++++++++++++++ games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild | 4 +++ 2 files changed, 44 insertions(+) diff --git a/games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch b/games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch new file mode 100644 index 000000000000..02d125685ac1 --- /dev/null +++ b/games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch @@ -0,0 +1,40 @@ +https://gitlab.gnome.org/GNOME/gnome-sudoku/-/commit/7c9935a02b48f332f67bad3e4ee020b75591084a +https://bugs.gentoo.org/831556 + +From: Jan Beich <jbe...@freebsd.org> +Date: Mon, 24 Jan 2022 11:44:06 +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:5:0: ERROR: Function does not take positional arguments. +data/meson.build:24:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index f18f247..9c95e02 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml') + + resources = gnome.compile_resources('gnome-sudoku', resource_files) + +-desktop_file = i18n.merge_file('desktop', ++desktop_file = i18n.merge_file( + input: '@0...@.desktop.in'.format(application_id), + output: '@0@.desktop'.format(application_id), + install: true, +@@ -21,7 +21,7 @@ if desktop_file_validate.found() + ) + endif + +-appdata_file = i18n.merge_file('appdata', ++appdata_file = i18n.merge_file( + input: '@0...@.appdata.xml.in'.format(application_id), + output: '@0...@.appdata.xml'.format(application_id), + install: true, +-- +GitLab + diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild index 4f5555a63086..d54c45ae2d2a 100644 --- a/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild +++ b/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild @@ -33,6 +33,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch +) + src_prepare() { xdg_src_prepare vala_src_prepare
