summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBehnam Momeni2017-12-11 21:58:43 +0330
committerBehnam Momeni2017-12-11 21:58:43 +0330
commitb01fd559bd46dd6001a592dca9bbee8e7b7c04f7 (patch)
tree64077cd680effaf4d0c2e060c5c0404897415cab
parente1a1fb7852552d40138a5167299c25dca75c3e73 (diff)
downloadaur-b01fd559bd46dd6001a592dca9bbee8e7b7c04f7.tar.gz
Upgrading to upstream version 2.1.2
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD24
-rw-r--r--configure.patch19
-rw-r--r--warnings-fix.patch258
4 files changed, 11 insertions, 305 deletions
diff --git a/.SRCINFO b/.SRCINFO
index acc1ddde57c..82c49704c85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,19 @@
# Generated by mksrcinfo v8
-# Tue Jan 17 10:16:38 UTC 2017
+# Mon Dec 11 18:20:19 UTC 2017
pkgbase = enchant-pure
pkgdesc = A wrapper library for pure and generic spell checking for all languages, supporting Aspell and Myspell/Hunspell backend engines
- pkgver = 1.6.1.r74.e412b19
+ pkgver = 2.1.2
pkgrel = 1
url = https://github.com/AbiWord/enchant
arch = any
license = LGPL
depends = aspell>=0.50.0
- depends = dbus-glib>=0.62
+ depends = glib2
depends = hunspell
provides = enchant
conflicts = enchant
- options = !libtool
- source = enchant-1.6.1.r74.e412b19.tar.gz::https://github.com/AbiWord/enchant/archive/e412b1998ec0071a5d55fe5f9decd2c4df18b122.tar.gz
- source = warnings-fix.patch
- source = configure.patch
- sha512sums = a176d265fed76636da464a0fe7527162ca1d5367f5409dd836eab48f3eae53b1329bf52c33c07d82aba4845f55493801494843363ef4dd35d748b7cc858a4a00
- sha512sums = 33312d3714eef836764aeab538517fbe5c44b72593ce9d68e4161d22139c0a859c4a619090c454451db3e2c14790b36c50c1f8ebfcbffe4498b6ee4d5a04faaa
- sha512sums = c2b889eb336e44690278768d67464be14a73e24b1bc9078e226efbdc63e4a46e9c86adbc111dc51dbbcac82f0f84a1bb37c612d70067ced0016053a2fd836f77
+ source = https://github.com/AbiWord/enchant/releases/download/v2.1.2/enchant-2.1.2.tar.gz
+ sha512sums = 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
pkgname = enchant-pure
diff --git a/PKGBUILD b/PKGBUILD
index 4e6116b847b..93daf80ae13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,7 @@
pkgname=('enchant-pure')
_pkgname=enchant
-pkgver="1.6.1.r74.e412b19"
-_commithash="e412b1998ec0071a5d55fe5f9decd2c4df18b122"
+pkgver="2.1.2"
pkgrel=1
pkgdesc="A wrapper library for pure and generic spell checking for all languages, supporting Aspell and Myspell/Hunspell backend engines"
@@ -13,27 +12,16 @@ url="https://github.com/AbiWord/enchant"
arch=('any')
license=('LGPL')
-depends=('aspell>=0.50.0' 'dbus-glib>=0.62' 'hunspell')
+depends=('aspell>=0.50.0' 'glib2' 'hunspell')
provides=("${_pkgname}")
conflicts=("${_pkgname}")
-options=('!libtool')
-source=("enchant-${pkgver}.tar.gz::https://github.com/AbiWord/${_pkgname}/archive/${_commithash}.tar.gz"
- "warnings-fix.patch" "configure.patch")
-sha512sums=('a176d265fed76636da464a0fe7527162ca1d5367f5409dd836eab48f3eae53b1329bf52c33c07d82aba4845f55493801494843363ef4dd35d748b7cc858a4a00'
- '33312d3714eef836764aeab538517fbe5c44b72593ce9d68e4161d22139c0a859c4a619090c454451db3e2c14790b36c50c1f8ebfcbffe4498b6ee4d5a04faaa'
- 'c2b889eb336e44690278768d67464be14a73e24b1bc9078e226efbdc63e4a46e9c86adbc111dc51dbbcac82f0f84a1bb37c612d70067ced0016053a2fd836f77')
-
-prepare() {
- mv "${srcdir}/${_pkgname}-${_commithash}/" "${srcdir}/${_pkgname}-${pkgver}"
- cd "${srcdir}/${_pkgname}-${pkgver}"
- patch -p1 -i ../warnings-fix.patch
-}
+source=("https://github.com/AbiWord/enchant/releases/download/v${pkgver}/${_pkgname}-${pkgver}.tar.gz")
+sha512sums=('6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4')
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
- ./autogen.sh --prefix=/usr --enable-static=no --disable-ispell --disable-voikko --disable-uspell --disable-hspell --enable-zemberek=no --with-myspell-dir=/usr/share/myspell
- patch -p1 -i ../configure.patch
- ./configure --prefix=/usr --enable-static=no --disable-ispell --disable-voikko --disable-uspell --disable-hspell --enable-zemberek=no --with-myspell-dir=/usr/share/myspell
+ ./configure --prefix=/usr --enable-static=no --with-aspell=yes --with-hunspell=yes --with-voikko=no --with-hspell=no --with-zemberek=no --with-applespell=no
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
diff --git a/configure.patch b/configure.patch
deleted file mode 100644
index 989df01ae74..00000000000
--- a/configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- enchant-1.6.1.r74.e412b19/configure 2017-01-17 13:42:47.705009200 +0330
-+++ enchant-1.6.1.r74.e412b19.new/configure 2017-01-17 13:42:44.788385224 +0330
-@@ -2511,7 +2511,6 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--1.6.1
-
- am__api_version='1.15'
-
-@@ -19039,7 +19038,7 @@
- $as_echo "yes" >&6; }
- build_zemberek=yes
- fi
--
-+build_zemberek=no
-
-
-
diff --git a/warnings-fix.patch b/warnings-fix.patch
deleted file mode 100644
index 1485366acc5..00000000000
--- a/warnings-fix.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-diff -ruN enchant-1.6.1.r74.e412b19/src/aspell/aspell_provider.c enchant-1.6.1.r74.e412b19.new/src/aspell/aspell_provider.c
---- enchant-1.6.1.r74.e412b19/src/aspell/aspell_provider.c 2017-01-16 01:12:51.000000000 +0330
-+++ enchant-1.6.1.r74.e412b19.new/src/aspell/aspell_provider.c 2017-01-17 11:50:06.308224891 +0330
-@@ -284,9 +284,9 @@
- #endif
-
- static void
--aspell_provider_free_string_list (EnchantProvider * me, char **str_list)
-+aspell_provider_free_string_list (EnchantProvider * me, const char * const *str_list)
- {
-- g_strfreev (str_list);
-+ g_strfreev ((char **) str_list);
- }
-
- static void
-diff -ruN enchant-1.6.1.r74.e412b19/src/enchant.c enchant-1.6.1.r74.e412b19.new/src/enchant.c
---- enchant-1.6.1.r74.e412b19/src/enchant.c 2017-01-16 01:12:51.000000000 +0330
-+++ enchant-1.6.1.r74.e412b19.new/src/enchant.c 2017-01-17 11:52:14.669679399 +0330
-@@ -769,7 +769,7 @@
- /********************************************************************************/
-
- static void
--enchant_provider_free_string_list (EnchantProvider * provider, char ** string_list)
-+enchant_provider_free_string_list (EnchantProvider * provider, const char * const * string_list)
- {
- if (provider && provider->free_string_list)
- (*provider->free_string_list) (provider, string_list);
-@@ -872,7 +872,7 @@
- enchant_dict_merge_suggestions(EnchantDict * dict,
- char ** suggs,
- size_t n_suggs,
-- char ** new_suggs,
-+ const char * const * new_suggs,
- size_t n_new_suggs)
- {
- size_t i, j;
-@@ -911,7 +911,7 @@
-
- static char **
- enchant_dict_get_good_suggestions(EnchantDict * dict,
-- char ** suggs,
-+ const char * const * suggs,
- size_t n_suggs,
- size_t* out_n_filtered_suggs)
- {
-@@ -920,6 +920,7 @@
- char ** filtered_suggs;
-
- session = ((EnchantDictPrivateData*)dict->enchant_private_data)->session;
-+ (void) session; // unused
-
- filtered_suggs = g_new0 (char *, n_suggs + 1);
- n_filtered_suggs = 0;
-@@ -962,7 +963,8 @@
- {
- EnchantSession * session;
- size_t n_suggs = 0, n_dict_suggs = 0, n_pwl_suggs = 0, n_suggsT = 0;
-- char **suggs, **dict_suggs = NULL, **pwl_suggs = NULL, **suggsT;
-+ char **suggs;
-+ const char * const *dict_suggs = NULL, * const *pwl_suggs = NULL, * const *suggsT;
-
- g_return_val_if_fail (dict, NULL);
- g_return_val_if_fail (word, NULL);
-@@ -978,11 +980,11 @@
- /* Check for suggestions from provider dictionary */
- if (dict->suggest)
- {
-- dict_suggs = (*dict->suggest) (dict, word, len,
-+ dict_suggs = (const char * const *) (*dict->suggest) (dict, word, len,
- &n_dict_suggs);
- if(dict_suggs)
- {
-- suggsT = enchant_dict_get_good_suggestions(dict, dict_suggs, n_dict_suggs, &n_suggsT);
-+ suggsT = (const char * const *) enchant_dict_get_good_suggestions(dict, dict_suggs, n_dict_suggs, &n_suggsT);
- enchant_provider_free_string_list (session->provider, dict_suggs);
- dict_suggs = suggsT;
- n_dict_suggs = n_suggsT;
-@@ -992,10 +994,10 @@
- /* Check for suggestions from personal dictionary */
- if(session->personal)
- {
-- pwl_suggs = enchant_pwl_suggest(session->personal, word, len, dict_suggs, &n_pwl_suggs);
-+ pwl_suggs = (const char * const *) enchant_pwl_suggest(session->personal, word, len, dict_suggs, &n_pwl_suggs);
- if(pwl_suggs)
- {
-- suggsT = enchant_dict_get_good_suggestions(dict, pwl_suggs, n_pwl_suggs, &n_suggsT);
-+ suggsT = (const char * const *) enchant_dict_get_good_suggestions(dict, pwl_suggs, n_pwl_suggs, &n_suggsT);
- enchant_pwl_free_string_list (session->personal, pwl_suggs);
- pwl_suggs = suggsT;
- n_pwl_suggs = n_suggsT;
-@@ -1027,8 +1029,8 @@
- suggs = NULL;
- }
-
-- g_strfreev(dict_suggs);
-- g_strfreev(pwl_suggs);
-+ g_strfreev((char **) dict_suggs);
-+ g_strfreev((char **) pwl_suggs);
-
- if (out_n_suggs)
- *out_n_suggs = n_suggs;
-@@ -1977,9 +1979,9 @@
- if (provider->list_dicts)
- {
- size_t n_dicts, i;
-- char ** dicts;
-+ const char * const * dicts;
-
-- dicts = (*provider->list_dicts) (provider, &n_dicts);
-+ dicts = (const char * const *) (*provider->list_dicts) (provider, &n_dicts);
-
- for (i = 0; i < n_dicts; i++)
- {
-@@ -2073,9 +2075,9 @@
- else if (provider->list_dicts)
- {
- size_t n_dicts, i;
-- char ** dicts;
-+ const char * const * dicts;
-
-- dicts = (*provider->list_dicts) (provider, &n_dicts);
-+ dicts = (const char * const *) (*provider->list_dicts) (provider, &n_dicts);
-
- for (i = 0; (i < n_dicts) && !exists; i++)
- {
-@@ -2378,7 +2380,7 @@
- return _enchant_get_dirs_from_string (param_value);
- }
-
--ENCHANT_MODULE_EXPORT(char *)
-+ENCHANT_MODULE_EXPORT(const char *)
- enchant_get_version (void) {
- return ENCHANT_VERSION_STRING;
- }
-diff -ruN enchant-1.6.1.r74.e412b19/src/enchant.h enchant-1.6.1.r74.e412b19.new/src/enchant.h
---- enchant-1.6.1.r74.e412b19/src/enchant.h 2017-01-16 01:12:51.000000000 +0330
-+++ enchant-1.6.1.r74.e412b19.new/src/enchant.h 2017-01-17 11:50:06.311558176 +0330
-@@ -51,8 +51,7 @@
- typedef struct str_enchant_broker EnchantBroker;
- typedef struct str_enchant_dict EnchantDict;
-
--/* const */
--ENCHANT_MODULE_EXPORT (char *)
-+ENCHANT_MODULE_EXPORT (const char *)
- enchant_get_version (void);
-
- ENCHANT_MODULE_EXPORT (EnchantBroker *)
-diff -ruN enchant-1.6.1.r74.e412b19/src/enchant-provider.h enchant-1.6.1.r74.e412b19.new/src/enchant-provider.h
---- enchant-1.6.1.r74.e412b19/src/enchant-provider.h 2017-01-16 01:12:51.000000000 +0330
-+++ enchant-1.6.1.r74.e412b19.new/src/enchant-provider.h 2017-01-17 11:50:06.311558176 +0330
-@@ -130,7 +130,7 @@
-
- /* frees string lists returned by list_dicts and dict->suggest */
- void (*free_string_list) (struct str_enchant_provider * me,
-- char **str_list);
-+ const char * const *str_list);
-
- char ** (*list_dicts) (struct str_enchant_provider * me,
- size_t * out_n_dicts);
-diff -ruN enchant-1.6.1.r74.e412b19/src/hspell/hspell_provider.c enchant-1.6.1.r74.e412b19.new/src/hspell/hspell_provider.c
---- enchant-1.6.1.r74.e412b19/src/hspell/hspell_provider.c 2017-01-16 01:12:51.000000000 +0330
-+++ enchant-1.6.1.r74.e412b19.new/src/hspell/hspell_provider.c 2017-01-17 11:50:06.311558176 +0330
-@@ -252,9 +252,9 @@
- }
-
- static void
--hspell_provider_free_string_list (EnchantProvider * me, char **str_list)
-+hspell_provider_free_string_list (EnchantProvider * me, const char * const *str_list)
- {
-- g_strfreev (str_list);
-+ g_strfreev ((char **) str_list);
- }
-
- static void
-diff -ruN enchant-1.6.1.r74.e412b19/src/myspell/myspell_checker.cpp enchant-1.6.1.r74.e412b19.new/src/myspell/myspell_checker.cpp
---- enchant-1.6.1.r74.e412b19/src/myspell/myspell_checker.cpp 2017-01-16 01:12:51.000000000 +0330
-+++ enchant-1.6.1.r74.e412b19.new/src/myspell/myspell_checker.cpp 2017-01-17 11:50:06.311558176 +0330
-@@ -38,6 +38,8 @@
- #include "enchant.h"
- #include "enchant-provider.h"
-
-+#include "atypes.hxx"
-+
- #ifdef near
- #undef near
- #endif
-@@ -552,9 +554,9 @@
- }
-
- static void
--myspell_provider_free_string_list (EnchantProvider * me, char **str_list)
-+myspell_provider_free_string_list (EnchantProvider * me, const char * const *str_list)
- {
-- g_strfreev (str_list);
-+ g_strfreev ((char **) str_list);
- }
-
- static EnchantDict *
-diff -ruN enchant-1.6.1.r74.e412b19/src/pwl.c enchant-1.6.1.r74.e412b19.new/src/pwl.c
---- enchant-1.6.1.r74.e412b19/src/pwl.c 2017-01-16 01:12:51.000000000 +0330
-+++ enchant-1.6.1.r74.e412b19.new/src/pwl.c 2017-01-17 11:50:06.311558176 +0330
-@@ -282,7 +282,7 @@
- {
- char buffer[BUFSIZ];
- char* line;
-- size_t line_number = 1;
-+ unsigned int line_number = 1;
- FILE *f;
- struct stat stats;
-
-@@ -692,7 +692,7 @@
- }
- }
-
--static int best_distance(char** suggs, const char *const word, size_t len)
-+static int best_distance(const char * const * suggs, const char *const word, size_t len)
- {
- int best_dist;
- char** sugg_it;
-@@ -803,9 +803,9 @@
-
- }
-
--void enchant_pwl_free_string_list(EnchantPWL *pwl, char** string_list)
-+void enchant_pwl_free_string_list(EnchantPWL *pwl, const char * const * string_list)
- {
-- g_strfreev(string_list);
-+ g_strfreev((char **) string_list);
- }
-
- static EnchantTrie* enchant_trie_init(void)
-diff -ruN enchant-1.6.1.r74.e412b19/src/pwl.h enchant-1.6.1.r74.e412b19.new/src/pwl.h
---- enchant-1.6.1.r74.e412b19/src/pwl.h 2017-01-16 01:12:51.000000000 +0330
-+++ enchant-1.6.1.r74.e412b19.new/src/pwl.h 2017-01-17 11:50:06.311558176 +0330
-@@ -50,7 +50,7 @@
- char** enchant_pwl_suggest(EnchantPWL *me,const char *const word,
- size_t len, const char*const*const suggs, size_t* out_n_suggs);
- void enchant_pwl_free(EnchantPWL* me);
--void enchant_pwl_free_string_list(EnchantPWL* me, char** string_list);
-+void enchant_pwl_free_string_list(EnchantPWL* me, const char * const * string_list);
-
- #ifdef __cplusplus
- }
-diff -ruN enchant-1.6.1.r74.e412b19/src/zemberek/zemberek_provider.cpp enchant-1.6.1.r74.e412b19.new/src/zemberek/zemberek_provider.cpp
---- enchant-1.6.1.r74.e412b19/src/zemberek/zemberek_provider.cpp 2017-01-16 01:12:51.000000000 +0330
-+++ enchant-1.6.1.r74.e412b19.new/src/zemberek/zemberek_provider.cpp 2017-01-17 11:50:06.311558176 +0330
-@@ -111,9 +111,9 @@
- }
-
- static void
--zemberek_provider_free_string_list (EnchantProvider * me, char **str_list)
-+zemberek_provider_free_string_list (EnchantProvider * me, const char * const *str_list)
- {
-- g_strfreev (str_list);
-+ g_strfreev ((char **) str_list);
- }
-
- static char **