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 A5551158088 for ; Thu, 3 Feb 2022 06:21:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51BB12BC04F; Thu, 3 Feb 2022 06:21:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 385892BC04F for ; Thu, 3 Feb 2022 06:21:02 +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 219DE3432DB for ; Thu, 3 Feb 2022 06:20:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E9B12C4 for ; Thu, 3 Feb 2022 06:20:55 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1643869242.bae28b0b7b08931a69c159a7daf11d8f0cf07360.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/sound-juicer/, media-sound/sound-juicer/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/sound-juicer/files/3.38.0-meson-drop-unused-argument-for-i18n.merge_file.patch media-sound/sound-juicer/sound-juicer-3.38.0.ebuild X-VCS-Directories: media-sound/sound-juicer/ media-sound/sound-juicer/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: bae28b0b7b08931a69c159a7daf11d8f0cf07360 X-VCS-Branch: master Date: Thu, 3 Feb 2022 06:20:55 +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: 313f3ecf-d14a-4734-b6e5-1443d35f0ae7 X-Archives-Hash: d0f5b54816c48423bc501f79ca7986a2 commit: bae28b0b7b08931a69c159a7daf11d8f0cf07360 Author: Matt Turner gentoo org> AuthorDate: Thu Feb 3 05:52:25 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Feb 3 06:20:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae28b0b media-sound/sound-juicer: Fix build with meson 0.61 Closes: https://bugs.gentoo.org/831477 Signed-off-by: Matt Turner gentoo.org> ...-drop-unused-argument-for-i18n.merge_file.patch | 35 ++++++++++++++++++++++ .../sound-juicer/sound-juicer-3.38.0.ebuild | 4 +++ 2 files changed, 39 insertions(+) diff --git a/media-sound/sound-juicer/files/3.38.0-meson-drop-unused-argument-for-i18n.merge_file.patch b/media-sound/sound-juicer/files/3.38.0-meson-drop-unused-argument-for-i18n.merge_file.patch new file mode 100644 index 000000000000..586fc118921f --- /dev/null +++ b/media-sound/sound-juicer/files/3.38.0-meson-drop-unused-argument-for-i18n.merge_file.patch @@ -0,0 +1,35 @@ +From 9f97ca1faca396099f52264a9729aa355f8d122e Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Tue, 25 Jan 2022 12:15:31 +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:2:0: ERROR: Function does not take positional arguments. +data/meson.build:31: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 ccff2d80..4dac8166 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,6 +1,5 @@ + # Desktop file + i18n.merge_file( +- 'desktop', + input: configure_file( + input: 'org.gnome.SoundJuicer.desktop.in.in', + output: 'org.gnome.SoundJuicer.desktop.in', +@@ -29,7 +28,6 @@ configure_file( + + # Metainfo + metainfo_file = i18n.merge_file( +- 'metainfo', + input: files(join_paths('metainfo', 'org.gnome.SoundJuicer.metainfo.xml.in')), + output: 'org.gnome.SoundJuicer.metainfo.xml', + po_dir: po_dir, +-- +2.34.1 + diff --git a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild index 3516bda7b7e5..b5cda89740e5 100644 --- a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild +++ b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild @@ -47,6 +47,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PV}-meson-drop-unused-argument-for-i18n.merge_file.patch +) + src_prepare() { # Avoid sandbox failures sed -i -e '/gst_inspect/d' meson.build || die