From 6b5b7199dc38c8c5a120cdae1a4d6e886fdf2730 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 7 Aug 2024 13:37:01 +0000
Subject: [PATCH] =?UTF-8?q?libshumate:=201.2.3=20=E2=86=92=201.3.beta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/libshumate/-/compare/1.2.3...1.3.beta

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
---
 pkgs/development/libraries/libshumate/default.nix   |  9 +++++++--
 .../libshumate/json-glib-192-newline-escape.patch   | 13 +++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/libshumate/json-glib-192-newline-escape.patch

diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix
index f449c5e1c1b7..0c51b9598ef2 100644
--- a/pkgs/development/libraries/libshumate/default.nix
+++ b/pkgs/development/libraries/libshumate/default.nix
@@ -22,16 +22,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libshumate";
-  version = "1.2.3";
+  version = "1.3.beta";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "devdoc"; # demo app
 
   src = fetchurl {
     url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz";
-    hash = "sha256-TMbNc/bYcVX2J2arY+WqzEc72aDONZBpMqz8g56WTAw=";
+    hash = "sha256-VMOsrq0FRul8tMY6++U8ydK2irVCT/g/B7HZIWuuKys=";
   };
 
+  patches = [
+    # https://gitlab.gnome.org/GNOME/libshumate/-/issues/81
+    ./json-glib-192-newline-escape.patch
+  ];
+
   depsBuildBuild = [
     # required to find native gi-docgen when cross compiling
     pkg-config
diff --git a/pkgs/development/libraries/libshumate/json-glib-192-newline-escape.patch b/pkgs/development/libraries/libshumate/json-glib-192-newline-escape.patch
new file mode 100644
index 000000000000..49cead75df60
--- /dev/null
+++ b/pkgs/development/libraries/libshumate/json-glib-192-newline-escape.patch
@@ -0,0 +1,13 @@
+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);