From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/tali/, games-board/tali/files/
Date: Thu, 20 Jan 2022 03:11:02 +0000 (UTC) [thread overview]
Message-ID: <1642647859.ac876c4e5a239a94e238a1a924de98487a939dc5.sam@gentoo> (raw)
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
reply other threads:[~2022-01-20 3:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1642647859.ac876c4e5a239a94e238a1a924de98487a939dc5.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox