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 0481B158099 for ; Mon, 20 Nov 2023 20:20:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17F782BC073; Mon, 20 Nov 2023 20:20:22 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C03682BC073 for ; Mon, 20 Nov 2023 20:20:21 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7DCCE335D55 for ; Mon, 20 Nov 2023 20:20:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6812813AD for ; Mon, 20 Nov 2023 20:20:17 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1700511595.2bcb37638ebd435e56c81a5880901ccf91c11741.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/gitg/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch X-VCS-Directories: dev-vcs/gitg/files/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 2bcb37638ebd435e56c81a5880901ccf91c11741 X-VCS-Branch: master Date: Mon, 20 Nov 2023 20:20:17 +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: 036d0981-791a-4156-9dc0-e659c3aa59f0 X-Archives-Hash: 00f5f82a3a62fc461dead9dc54ce12fd commit: 2bcb37638ebd435e56c81a5880901ccf91c11741 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Nov 7 18:04:48 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Nov 20 20:19:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bcb3763 dev-vcs/gitg: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Ulrich Müller gentoo.org> .../files/41-fix-build-with-meson-0.61.1.patch | 38 ---------------------- 1 file changed, 38 deletions(-) diff --git a/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch b/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch deleted file mode 100644 index 0467f7d1ad89..000000000000 --- a/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://gitlab.gnome.org/GNOME/gitg/-/commit/1978973b12848741b08695ec2020bac98584d636 -https://bugs.gentoo.org/831666 - -From: Jan Beich -Date: Mon, 24 Jan 2022 12:17:52 +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:8:0: ERROR: Function does not take positional arguments. -data/meson.build:44:0: ERROR: Function does not take positional arguments. ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index a8b90fd1..2413531d 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -6,7 +6,6 @@ desktop_config = configuration_data() - desktop_config.set('icon', application_id) - desktop_config.set('binary', gitg_name) - i18n.merge_file( -- desktop, - type: 'desktop', - input: configure_file( - input: desktop + '.in.in', -@@ -42,7 +41,6 @@ appdata_config = configuration_data() - appdata_config.set('app-id', application_id) - appdata_config.set('gettext', gitg_name) - i18n.merge_file( -- appdata, - type: 'xml', - input: configure_file( - input: appdata + '.in.in', --- -GitLab -