summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorThore Bödecker2018-02-26 19:51:25 +0100
committerThore Bödecker2018-02-26 19:51:25 +0100
commitc49281d1822a90ba5fa27f1258dd4d3bbeecd0e9 (patch)
treeffafb861bf4d08541163cf1524523f4ee06b89e4
parent39d7bcf4ba69ae8c08b673cbefa45458a3c28e19 (diff)
downloadaur-c49281d1822a90ba5fa27f1258dd4d3bbeecd0e9.tar.gz
fix enchant extension for enchant-2
Signed-off-by: Thore Bödecker <me@foxxx0.de>
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--use-enchant2.patch38
3 files changed, 43 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3eee7288835..180df67a020 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Feb 26 10:37:42 UTC 2018
+# Mon Feb 26 18:51:15 UTC 2018
pkgbase = php56
pkgdesc = A general-purpose scripting language that is especially suited to web development
pkgver = 5.6.33
- pkgrel = 2
+ pkgrel = 3
url = http://php.net
arch = i686
arch = x86_64
@@ -49,7 +49,7 @@ pkgbase = php56
sha512sums = a398e9cde4ba57d243abb5b394152d87bc1fddc2d5fc934569e1f912a5a80eba3ae14720fe99fcda50722bedc5d65abcbde2822f5075091c4a83a2f6bb22c122
sha512sums = c6b74e1b39224e79d33915a0d32fe2d08114d1dcec93035017af783b8b73b6475779e3e649abb35b73ea2fd6553120696c48ebb0894531282fbc9e1b36da9f3b
sha512sums = 9cc548c9395f0765e6ebf54604dc8e71da38ffbc10eba50ba9b7e2f91690c53056f62efa2060fc8670de94e0642027c6eaa6c2820ba99e2b489695d1e320fcf3
- sha512sums = a055e5828de2840d1da4e18d4be2d31a14d4ffb3370185933357aee3110e04bf5ea01516d1e9b2c05ae11d637528bffd858dd1f6ed439a58314fed5f945456f6
+ sha512sums = 5f0dc48f13de7024db1bd6189967b389aa6d8cf9ab9dc1b242b4ea4250df1edd909364efb2d840e38227676fee5dee93bac38056db2a80ad6c7ba0e13f71fcd1
pkgname = php56
pkgdesc = An HTML-embedded scripting language
diff --git a/PKGBUILD b/PKGBUILD
index 53c9e7e32a3..f7fd45b1ede 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,7 +32,7 @@ pkgname=("${pkgbase}"
"${pkgbase}-tidy"
"${pkgbase}-xsl")
pkgver=5.6.33
-pkgrel=2
+pkgrel=3
pkgdesc="A general-purpose scripting language that is especially suited to web development"
arch=('i686' 'x86_64')
license=('PHP')
@@ -55,7 +55,7 @@ sha512sums=('c494721594511f79a103ea3c73c5035aa0fcbca626710a0b85d2395693caf6762ed
'a398e9cde4ba57d243abb5b394152d87bc1fddc2d5fc934569e1f912a5a80eba3ae14720fe99fcda50722bedc5d65abcbde2822f5075091c4a83a2f6bb22c122'
'c6b74e1b39224e79d33915a0d32fe2d08114d1dcec93035017af783b8b73b6475779e3e649abb35b73ea2fd6553120696c48ebb0894531282fbc9e1b36da9f3b'
'9cc548c9395f0765e6ebf54604dc8e71da38ffbc10eba50ba9b7e2f91690c53056f62efa2060fc8670de94e0642027c6eaa6c2820ba99e2b489695d1e320fcf3'
- 'a055e5828de2840d1da4e18d4be2d31a14d4ffb3370185933357aee3110e04bf5ea01516d1e9b2c05ae11d637528bffd858dd1f6ed439a58314fed5f945456f6')
+ '5f0dc48f13de7024db1bd6189967b389aa6d8cf9ab9dc1b242b4ea4250df1edd909364efb2d840e38227676fee5dee93bac38056db2a80ad6c7ba0e13f71fcd1')
validpgpkeys=('6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3'
'0BD78B5F97500D450838F95DFE857D9A90D90EC1')
diff --git a/use-enchant2.patch b/use-enchant2.patch
index b503e4c4030..f2c41b42f10 100644
--- a/use-enchant2.patch
+++ b/use-enchant2.patch
@@ -47,3 +47,41 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+--- ext/enchant/enchant.c 2018-01-02 22:36:05.000000000 +0000
++++ ext/enchant/enchant.c 2018-01-21 22:34:50.205791491 +0000
+@@ -741,7 +741,7 @@
+ for (i = 0; i < n_sugg; i++) {
+ add_next_index_string(sugg, suggs[i]);
+ }
+- enchant_dict_free_suggestions(pdict->pdict, suggs);
++ enchant_dict_free_string_list(pdict->pdict, suggs);
+ }
+
+
+@@ -798,7 +798,7 @@
+ add_next_index_string(return_value, suggs[i]);
+ }
+
+- enchant_dict_free_suggestions(pdict->pdict, suggs);
++ enchant_dict_free_string_list(pdict->pdict, suggs);
+ }
+ }
+ /* }}} */
+@@ -818,7 +818,7 @@
+
+ PHP_ENCHANT_GET_DICT;
+
+- enchant_dict_add_to_personal(pdict->pdict, word, wordlen);
++ enchant_dict_add(pdict->pdict, word, wordlen);
+ }
+ /* }}} */
+
+@@ -856,7 +856,7 @@
+
+ PHP_ENCHANT_GET_DICT;
+
+- RETURN_BOOL(enchant_dict_is_in_session(pdict->pdict, word, wordlen));
++ RETURN_BOOL(enchant_dict_is_added(pdict->pdict, word, wordlen));
+ }
+ /* }}} */
+