libexttextcat: 3.3.1 -> 3.4.1

2 files changed, 2 insertions, 41 deletions

diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix
index a75fada7484..6aaadb0b02e 100644
--- a/pkgs/development/libraries/libexttextcat/default.nix
+++ b/pkgs/development/libraries/libexttextcat/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libexttextcat-3.3.1";
+  name = "libexttextcat-3.4.1";
 
   src = fetchurl {
     url = "http://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz";
-    sha256 = "1a7ablpipfbiyhl6wsraj5z8pj3qkqgnrms73wzsqhpbyww334h4";
+    sha256 = "0g1spzpsfbv3y8k9m1v53imz18437q93iq101hind7m4x00j6wpl";
   };
 
-  patches = [ ./memory-leaks.patch ];
-
   meta = {
     description = "An N-Gram-Based Text Categorization library primarily intended for language guessing";
     homepage = http://www.freedesktop.org/wiki/Software/libexttextcat;
diff --git a/pkgs/development/libraries/libexttextcat/memory-leaks.patch b/pkgs/development/libraries/libexttextcat/memory-leaks.patch
deleted file mode 100644
index 0be4ffdc93a..00000000000
--- a/pkgs/development/libraries/libexttextcat/memory-leaks.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Combined upstream commits 980592386f23db8b0dc84c434805cb167d0cc091 and
-5ef4ad86ec934282cba891922ec2d13784da3354.
-diff -u b/src/textcat.c b/src/textcat.c
---- b/src/textcat.c
-+++ b/src/textcat.c
-@@ -212,8 +212,6 @@
-                                 sizeof(char) * (tmp_size + 1));
-             if (tmp == NULL)
-             {
--                free(finger_print_file_name);
--                finger_print_file_name_size = 0;
-                 goto BAILOUT;
-             }
-             else
-@@ -226,10 +224,7 @@
-         strcat(finger_print_file_name, segment[0]);
- 
-         if (fp_Read(h->fprint[h->size], finger_print_file_name, 400) == 0)
--        {
--            textcat_Done(h);
-             goto BAILOUT;
--        }
-         h->fprint_disable[h->size] = 0xF0;  /* 0xF0 is the code for enabled
-                                                languages, 0x0F is for disabled 
-                                              */
-@@ -242,9 +237,10 @@
-     return h;
- 
-   BAILOUT:
-+    free(finger_print_file_name);
-     fclose(fp);
-+    textcat_Done(h);
-     return NULL;
--
- }
- 
- extern candidate_t *textcat_GetClassifyFullOutput(void *handle)