[gentoo-commits] repo/gentoo:master commit in: games-puzzle/gnome-tetravex/files/, games-puzzle/gnome-tetravex/

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/gnome-tetravex/files/, games-puzzle/gnome-tetravex/

[Sam James]

commit:     7a7df12b8d193f9c05d46eda0de60b70bd6337b6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 02:09:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 02:09:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a7df12b

games-puzzle/gnome-tetravex: fix build with meson 0.61

Closes: https://bugs.gentoo.org/831493
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/gnome-tetravex-3.38.2-meson-0.61.patch   | 33 ++++++++++++++++++++++
 .../gnome-tetravex/gnome-tetravex-3.38.2.ebuild    |  4 +++
 2 files changed, 37 insertions(+)

diff --git a/games-puzzle/gnome-tetravex/files/gnome-tetravex-3.38.2-meson-0.61.patch b/games-puzzle/gnome-tetravex/files/gnome-tetravex-3.38.2-meson-0.61.patch
new file mode 100644
index 000000000000..97f27d95a06a
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/files/gnome-tetravex-3.38.2-meson-0.61.patch
@@ -0,0 +1,33 @@
+https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20.patch
+https://bugs.gentoo.org/831493
+
+From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:48:22 +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:37:0: ERROR: Function does not take positional arguments.
+data/meson.build:59:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -34,7 +34,7 @@ endif
+ 
+ # Desktop file
+ if get_option('build_gui')
+-  desktop_file = i18n.merge_file ('desktop-file',
++  desktop_file = i18n.merge_file (
+                            input: project_id + '.desktop.in',
+                           output: project_id + '.desktop',
+                          install: true,
+@@ -56,7 +56,7 @@ endif
+ 
+ # AppData file
+ if get_option('build_gui')
+-  appdata_file = i18n.merge_file ('appdata-file',
++  appdata_file = i18n.merge_file (
+                            input: project_id + '.appdata.xml.in',
+                           output: project_id + '.appdata.xml',
+                          install: true,
+GitLab

diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
index 1c9ab8809a6e..254fde622d9d 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
@@ -29,6 +29,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.38.2-meson-0.61.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 	vala_src_prepare