From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libshumate/, media-libs/libshumate/files/
Date: Mon, 23 Dec 2024 06:09:17 +0000 (UTC) [thread overview]
Message-ID: <1734934144.4fd211f9c84b4dfb4a2098eeea0c2900ab6f9f23.sam@gentoo> (raw)
commit: 4fd211f9c84b4dfb4a2098eeea0c2900ab6f9f23
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 06:08:52 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 <ml@dfupdate.se>
+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)
next reply other threads:[~2024-12-23 6:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-23 6:09 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-20 14:36 [gentoo-commits] repo/gentoo:master commit in: media-libs/libshumate/, media-libs/libshumate/files/ Mart Raudsepp
2023-07-09 1:32 Matt Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1734934144.4fd211f9c84b4dfb4a2098eeea0c2900ab6f9f23.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox