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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED71E1580FD for ; Mon, 23 Dec 2024 06:09:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20093E083B; Mon, 23 Dec 2024 06:09:22 +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 68DC9E083B for ; Mon, 23 Dec 2024 06:09:19 +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 1E5AA33D3CF for ; Mon, 23 Dec 2024 06:09:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ADCFA1048 for ; Mon, 23 Dec 2024 06:09:17 +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: <1734934144.4fd211f9c84b4dfb4a2098eeea0c2900ab6f9f23.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libshumate/, media-libs/libshumate/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libshumate/files/libshumate-1.2.3-json-glib-1.9.2.patch media-libs/libshumate/libshumate-1.2.3.ebuild X-VCS-Directories: media-libs/libshumate/files/ media-libs/libshumate/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4fd211f9c84b4dfb4a2098eeea0c2900ab6f9f23 X-VCS-Branch: master Date: Mon, 23 Dec 2024 06:09: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: b70d584a-b6c6-453d-b633-e254103a6863 X-Archives-Hash: 6884c86742ecd5109f87fbcb4045c937 commit: 4fd211f9c84b4dfb4a2098eeea0c2900ab6f9f23 Author: Sam James gentoo org> AuthorDate: Mon Dec 23 06:08:52 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Dec 23 06:09:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd211f9 media-libs/libshumate: fix tests w/ newer json-glib Closes: https://bugs.gentoo.org/946836 Signed-off-by: Sam James gentoo.org> .../files/libshumate-1.2.3-json-glib-1.9.2.patch | 28 ++++++++++++++++++++++ media-libs/libshumate/libshumate-1.2.3.ebuild | 4 ++++ 2 files changed, 32 insertions(+) diff --git a/media-libs/libshumate/files/libshumate-1.2.3-json-glib-1.9.2.patch b/media-libs/libshumate/files/libshumate-1.2.3-json-glib-1.9.2.patch new file mode 100644 index 000000000000..113ab9411089 --- /dev/null +++ b/media-libs/libshumate/files/libshumate-1.2.3-json-glib-1.9.2.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/946836 +https://gitlab.gnome.org/GNOME/libshumate/-/issues/81 +https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/245 + +From d1afd9316e0038c036c326ac5133502103fb9ecf Mon Sep 17 00:00:00 2001 +From: Marcus Lundblad +Date: Mon, 19 Aug 2024 21:17:37 +0200 +Subject: [PATCH] tests: Escape \n in test with \\ + +--- + tests/vector-expression.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/vector-expression.c b/tests/vector-expression.c +index 9e258fb..59d1d67 100644 +--- a/tests/vector-expression.c ++++ b/tests/vector-expression.c +@@ -592,7 +592,7 @@ test_vector_expression_formatted_string () + node = json_from_string ("[\"format\",\ + \"Hello \",\ + [\"concat\", \"world\", \"!\"], {\"font-scale\": 0.1},\ +- \"\n\", {\"text-color\": [\"coalesce\", \"red\"]},\ ++ \"\\n\", {\"text-color\": [\"coalesce\", \"red\"]},\ + null,\ + \"test\"\ + ]", &error); +-- +GitLab diff --git a/media-libs/libshumate/libshumate-1.2.3.ebuild b/media-libs/libshumate/libshumate-1.2.3.ebuild index 6f06f64be274..21cd8ca9eff9 100644 --- a/media-libs/libshumate/libshumate-1.2.3.ebuild +++ b/media-libs/libshumate/libshumate-1.2.3.ebuild @@ -33,6 +33,10 @@ BDEPEND=" vala? ( $(vala_depend) ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.2.3-json-glib-1.9.2.patch +) + src_configure() { local emesonargs=( $(meson_use introspection gir)