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 5DB5F158087 for ; Thu, 20 Jan 2022 03:11:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B227E075F; 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 DF4D7E077F for ; Thu, 20 Jan 2022 03:11:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 00BD133BDC5 for ; Thu, 20 Jan 2022 03:11:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 33193275 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: <1642647643.1956405d5a510da460f0ab36d3937226953e2d12.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/hitori/files/, games-puzzle/hitori/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-puzzle/hitori/files/hitori-3.38.3-meson-0.61-build.patch games-puzzle/hitori/hitori-3.38.3.ebuild X-VCS-Directories: games-puzzle/hitori/files/ games-puzzle/hitori/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1956405d5a510da460f0ab36d3937226953e2d12 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: e1dabbbb-9a0c-4103-9b1d-ed89b2db78fe X-Archives-Hash: 39035cc3c97fe2dd526065668a41b3bf commit: 1956405d5a510da460f0ab36d3937226953e2d12 Author: Sam James gentoo org> AuthorDate: Thu Jan 20 03:00:43 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 20 03:00:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1956405d games-puzzle/hitori: fix build with meson 0.61 Closes: https://bugs.gentoo.org/831462 Signed-off-by: Sam James gentoo.org> .../files/hitori-3.38.3-meson-0.61-build.patch | 35 ++++++++++++++++++++++ games-puzzle/hitori/hitori-3.38.3.ebuild | 6 +++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/games-puzzle/hitori/files/hitori-3.38.3-meson-0.61-build.patch b/games-puzzle/hitori/files/hitori-3.38.3-meson-0.61-build.patch new file mode 100644 index 000000000000..a89b1b498502 --- /dev/null +++ b/games-puzzle/hitori/files/hitori-3.38.3-meson-0.61-build.patch @@ -0,0 +1,35 @@ +https://gitlab.gnome.org/GNOME/hitori/-/commit/d25728e122f1d7b985029a5ba96810c3e57c27f7.patch +https://bugs.gentoo.org/831462 + +From: Philip Withnall +Date: Tue, 2 Nov 2021 12:04:29 +0000 +Subject: [PATCH] build: Drop positional arguments from i18n.merge_file() calls +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Meson never took positional arguments in this function, but didn’t warn +about it until Meson 0.60. Drop the unnecessary arguments to fix the +warning. + +Signed-off-by: Philip Withnall +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,6 +1,6 @@ + subdir('icons') + +-desktop_file = i18n.merge_file('desktop-file', ++desktop_file = i18n.merge_file( + type: 'desktop', + input: '@0@.desktop.in'.format(application_id), + output: '@0@.desktop'.format(application_id), +@@ -20,7 +20,7 @@ if desktop_file_validate.found() + ) + endif + +-appdata_file = i18n.merge_file('appdata-file', ++appdata_file = i18n.merge_file( + input: '@0@.appdata.xml.in'.format(application_id), + output: '@0@.appdata.xml'.format(application_id), + po_dir: join_paths(meson.source_root(), 'po'), +GitLab diff --git a/games-puzzle/hitori/hitori-3.38.3.ebuild b/games-puzzle/hitori/hitori-3.38.3.ebuild index 03d77e2e63fd..e6f87c980f0f 100644 --- a/games-puzzle/hitori/hitori-3.38.3.ebuild +++ b/games-puzzle/hitori/hitori-3.38.3.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 @@ -25,6 +25,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${P}-meson-0.61-build.patch +) + pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update