[gentoo-commits] repo/gentoo:master commit in: games-board/tali/, games-board/tali/files/

[gentoo-commits] repo/gentoo:master commit in: games-board/tali/, games-board/tali/files/

[Sam James]

commit:     ac876c4e5a239a94e238a1a924de98487a939dc5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 03:04:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 03:04:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac876c4e

games-board/tali: fix build with meson 0.61

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

 .../tali/files/tali-40.4-meson-0.61-build.patch    | 29 ++++++++++++++++++++++
 games-board/tali/tali-40.4.ebuild                  |  6 ++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/games-board/tali/files/tali-40.4-meson-0.61-build.patch b/games-board/tali/files/tali-40.4-meson-0.61-build.patch
new file mode 100644
index 000000000000..e5cfa34c3560
--- /dev/null
+++ b/games-board/tali/files/tali-40.4-meson-0.61-build.patch
@@ -0,0 +1,29 @@
+https://gitlab.gnome.org/GNOME/tali/-/merge_requests/14.patch
+https://bugs.gentoo.org/831461
+
+From 79509bf3e9456f52d6ac87538700e3ac89db4006 Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Tue, 16 Nov 2021 05:56:26 +0000
+Subject: [PATCH] Remove incorrect i18n.merge_file argument
+
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -22,7 +22,7 @@ install_data ([ 'gnome-dice-1.svg',
+ install_data (project_id + '.gschema.xml',
+               install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
+ 
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+                  input: project_id + '.desktop.in',
+                  output: project_id + '.desktop',
+                  install: true,
+@@ -41,7 +41,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-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-board/tali/tali-40.4.ebuild b/games-board/tali/tali-40.4.ebuild
index e944d0be9fd3..08ed71f85541 100644
--- a/games-board/tali/tali-40.4.ebuild
+++ b/games-board/tali/tali-40.4.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
@@ -28,6 +28,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-0.61-build.patch
+)
+
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update