From 7006885c2475db085331e0a379f4acd653504d8d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 13 Sep 2024 13:24:26 +0000
Subject: [PATCH] =?UTF-8?q?gspell:=201.13.1=20=E2=86=92=201.14.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gspell/-/compare/1.13.1...1.14.0

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
---
 .../gspell/0001-Darwin-build-fix.patch        | 49 -------------------
 pkgs/development/libraries/gspell/default.nix |  9 +---
 2 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch

diff --git a/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch b/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch
deleted file mode 100644
index 361012c310f3..000000000000
--- a/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 339866ba796d6646f28a826b8c5f335b7b07182a Mon Sep 17 00:00:00 2001
-From: Bobby Rong <rjl931189261@126.com>
-Date: Thu, 5 Sep 2024 23:13:37 +0800
-Subject: [PATCH] build: Fix darwin build
-
-Fixes "unknown type name 'NSString'" and "undefined symbols for architecture
-arm64 __gspell_osx_get_preferred_spell_language" on darwin by restoring
-https://gitlab.gnome.org/GNOME/gspell/-/blob/1.12.2/gspell/Makefile.am#L148-L161.
----
- gspell/meson.build | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/gspell/meson.build b/gspell/meson.build
-index c5156a0..60a1271 100644
---- a/gspell/meson.build
-+++ b/gspell/meson.build
-@@ -57,6 +57,17 @@ gspell_private_c_files = [
-   'gspell-utils.c',
- ]
- 
-+gspell_static_lib_c_args = ['-DGSPELL_COMPILATION']
-+gspell_static_lib_link_args = []
-+
-+if host_machine.system() == 'darwin'
-+  GSPELL_PRIVATE_HEADERS += ['gspell-osx.h']
-+  gspell_private_c_files += ['gspell-osx.c']
-+
-+  gspell_static_lib_c_args += ['-xobjective-c']
-+  gspell_static_lib_link_args += ['-framework', 'Cocoa']
-+endif
-+
- headers_install_dir = get_option('includedir') / '@0@-@1@/gspell/'.format(meson.project_name(), GSPELL_API_VERSION)
- install_headers(
-   gspell_public_headers,
-@@ -81,9 +92,8 @@ gspell_static_lib = static_library(
-   pic: true, # gspell_static_lib is linked in a shared library.
-   include_directories: ROOT_INCLUDE_DIR,
-   dependencies: GSPELL_DEPS,
--  c_args: [
--    '-DGSPELL_COMPILATION',
--  ],
-+  c_args: gspell_static_lib_c_args,
-+  link_args: gspell_static_lib_link_args,
- )
- 
- # For unit tests, to be able to test private functions.
--- 
-GitLab
-
diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index a459d02f9667..d8725ed90bdc 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gspell";
-  version = "1.13.1";
+  version = "1.14.0";
 
   outputs = [
     "out"
@@ -31,14 +31,9 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "zO1F6Ykro1wxuaEdYqnhVC5d/Wj3+zfDNbp0SfIM1hU=";
+    sha256 = "ZOodjp7cHCW0WpIOgNr2dVnRhm/81/hDL+z+ptD+iJc=";
   };
 
-  patches = [
-    # https://gitlab.gnome.org/GNOME/gspell/-/merge_requests/10
-    ./0001-Darwin-build-fix.patch
-  ];
-
   nativeBuildInputs = [
     docbook-xsl-nons
     glib # glib-mkenums