From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7502D158087 for ; Thu, 20 Jan 2022 03:11:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EE56E076B; Thu, 20 Jan 2022 03:11:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DA912E075F for ; Thu, 20 Jan 2022 03:11:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7B8A342D66 for ; Thu, 20 Jan 2022 03:11:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4738D2A2 for ; Thu, 20 Jan 2022 03:11:02 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642647859.ac876c4e5a239a94e238a1a924de98487a939dc5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/tali/, games-board/tali/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-board/tali/files/tali-40.4-meson-0.61-build.patch games-board/tali/tali-40.4.ebuild X-VCS-Directories: games-board/tali/files/ games-board/tali/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ac876c4e5a239a94e238a1a924de98487a939dc5 X-VCS-Branch: master Date: Thu, 20 Jan 2022 03:11:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0d136b07-2010-49b0-8403-972c792d5571 X-Archives-Hash: e94c018802d7977f2d7ba7d8052fcc5c commit: ac876c4e5a239a94e238a1a924de98487a939dc5 Author: Sam James gentoo org> AuthorDate: Thu Jan 20 03:04:19 2022 +0000 Commit: Sam James gentoo 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 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 +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