Update to 2.2.5

This commit is contained in:
Sandro Mani 2019-07-01 14:50:15 +02:00
parent 3791a18b5b
commit 1de56325e9
4 changed files with 7 additions and 56 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/enchant-2.2.1.tar.gz
/enchant-2.2.3.tar.gz
/enchant-2.2.4.tar.gz
/enchant-2.2.5.tar.gz

View File

@ -1,6 +1,6 @@
Name: enchant2
Version: 2.2.4
Release: 2%{?snap}%{?dist}
Version: 2.2.5
Release: 1%{?snap}%{?dist}
Summary: An Enchanting Spell Checking Library
License: LGPLv2+
@ -10,9 +10,6 @@ Source0: https://github.com/AbiWord/enchant/releases/download/v%{version}/
# Look for aspell using pkg-config, instead of AC_CHECK_LIB which adds -laspell
# to the global LIBS and over-links libenchant (#1574893)
Patch0: enchant_aspell.patch
# Fix memory leaks (#1718084)
# https://github.com/AbiWord/enchant/issues/215
Patch1: enchant_mem-leaks.patch
BuildRequires: automake autoconf libtool
@ -105,6 +102,9 @@ find %{buildroot} -name '*.la' -delete
%changelog
* Mon Jul 01 2019 Sandro Mani <manisandro@gmail.com> - 2.2.5-1
- Update to 2.2.5
* Fri Jun 28 2019 Sandro Mani <manisandro@gmail.com> - 2.2.4-2
- Add patch to fix memory leaks (#1718084)
- Pass --without-hspell

View File

@ -1,50 +0,0 @@
diff -rupN enchant-2.2.4/providers/enchant_hunspell.cpp enchant-2.2.4-new/providers/enchant_hunspell.cpp
--- enchant-2.2.4/providers/enchant_hunspell.cpp 2017-12-17 21:08:34.000000000 +0100
+++ enchant-2.2.4-new/providers/enchant_hunspell.cpp 2019-06-28 12:54:47.053512522 +0200
@@ -181,25 +181,34 @@ s_buildDictionaryDirs (std::vector<std::
{
dirs.clear ();
+ gchar * tmp;
char * config_dir = enchant_get_user_config_dir ();
- dirs.push_back (g_build_filename (config_dir, "hunspell", nullptr));
+ tmp = g_build_filename (config_dir, "hunspell", nullptr);
+ dirs.push_back (tmp);
free (config_dir);
+ g_free(tmp);
for (const gchar* const * iter = g_get_system_data_dirs (); *iter; iter++)
{
- dirs.push_back (g_build_filename (*iter, "hunspell", nullptr));
+ tmp = g_build_filename (*iter, "hunspell", nullptr);
+ dirs.push_back (tmp);
+ g_free(tmp);
}
/* Dynamically locate library and search for modules relative to it. */
char * enchant_prefix = enchant_get_prefix_dir();
if(enchant_prefix)
{
- dirs.push_back (g_build_filename(enchant_prefix, "share", "enchant", "hunspell", nullptr));
+ tmp = g_build_filename(enchant_prefix, "share", "enchant", "hunspell", nullptr);
+ dirs.push_back (tmp);
g_free(enchant_prefix);
+ g_free(tmp);
}
#ifdef ENCHANT_HUNSPELL_DICT_DIR
- dirs.push_back (enchant_relocate (ENCHANT_HUNSPELL_DICT_DIR));
+ config_dir = enchant_relocate (ENCHANT_HUNSPELL_DICT_DIR);
+ dirs.push_back (config_dir);
+ free(config_dir);
#endif
}
@@ -286,6 +295,7 @@ hunspell_request_dictionary (const char
g_dir_close (dir);
return dict;
}
+ g_free(dict);
}
}

View File

@ -1 +1 @@
SHA512 (enchant-2.2.4.tar.gz) = 3860f04e276e1afa8969041b3f57411136d6b96ecf90996cdb122739e87be432f12219d2635c29d2e7ef3f2eeb366013026b6f8327a9749ffbc3a1dfafb4b870
SHA512 (enchant-2.2.5.tar.gz) = cc4d00ea2c94fcf2cef0281e13b86c49cfbff74c60315126bab8b1d91d8da1fb8fd0dc215a1eb44b07d8be33bc54cb9e63107874ef1caa04714fbe4b7484280f