From 366cc209668d691ae1bae6075358193adc67a5fc Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 13 Sep 2024 13:24:48 +0000
Subject: [PATCH] =?UTF-8?q?libshumate:=201.3.beta=20=E2=86=92=201.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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, 2 insertions(+), 20 deletions(-)
 delete 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 0c51b9598ef2..98a3ea533bef 100644
--- a/pkgs/development/libraries/libshumate/default.nix
+++ b/pkgs/development/libraries/libshumate/default.nix
@@ -22,21 +22,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libshumate";
-  version = "1.3.beta";
+  version = "1.3.0";
 
   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-VMOsrq0FRul8tMY6++U8ydK2irVCT/g/B7HZIWuuKys=";
+    hash = "sha256-giem6Cgc3hIjKJT++Ddg1E+maznvAzxh7ZNKhsbcddQ=";
   };
 
-  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
deleted file mode 100644
index 49cead75df60..000000000000
--- a/pkgs/development/libraries/libshumate/json-glib-192-newline-escape.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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);