From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1648515-garchives=archives.gentoo.org@lists.gentoo.org>
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 E140B15802E
for <garchives@archives.gentoo.org>; Sun, 30 Jun 2024 18:27:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 374E0E2B70;
Sun, 30 Jun 2024 18:27:52 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 21526E2B70
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Jun 2024 18:27:52 +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 6998733BEBE
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Jun 2024 18:27:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D11771BC0
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Jun 2024 18:27:49 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1719772064.d9691f1d5dd9a126804102572ac812d9c8a4ee16.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/gstreamer-meson.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: d9691f1d5dd9a126804102572ac812d9c8a4ee16
X-VCS-Branch: master
Date: Sun, 30 Jun 2024 18:27:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: bc07a109-1dd5-499b-a0a3-f7a606cd0fb1
X-Archives-Hash: 6555c323513a27e63c49c9e52cf7b6ac
commit: d9691f1d5dd9a126804102572ac812d9c8a4ee16
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 18:26:34 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 18:27:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9691f1d
gstreamer-meson.eclass: fix handling meson-1.5's pretty-printed JSON
meson-1.5 pretty-prints its JSON which means the target JSON file here
spawns multiple lines. <$x> will only read one line, per
https://github.com/makamaka/JSON-PP/issues/85#issuecomment-1367719155.
Switch to reading the whole file like in https://stackoverflow.com/a/24959863.
Cloess: https://bugs.gentoo.org/935245
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/gstreamer-meson.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass
index a26b06ba4595..937c86a0f15b 100644
--- a/eclass/gstreamer-meson.eclass
+++ b/eclass/gstreamer-meson.eclass
@@ -393,7 +393,7 @@ use utf8;
use JSON::PP;
open(my $targets_file, '<:encoding(UTF-8)', 'meson-info/intro-targets.json') || die $!;
-my $data = decode_json <$targets_file>;
+my $data = decode_json (join '', <$targets_file>);
close($targets_file) || die $!;
if(!$ARGV[0]) {