diff options
| -rw-r--r-- | community/php7/APKBUILD | 8 | ||||
| -rw-r--r-- | community/php7/enchant-2.patch | 65 |
2 files changed, 70 insertions, 3 deletions
diff --git a/community/php7/APKBUILD b/community/php7/APKBUILD index 9ed5514235..f4fe2d5ddd 100644 --- a/community/php7/APKBUILD +++ b/community/php7/APKBUILD @@ -27,7 +27,7 @@ pkgname=php7 _pkgreal=php pkgver=7.3.17 -pkgrel=0 +pkgrel=1 _apiver=20180731 _suffix=${pkgname#php} # Is this package the default (latest) PHP version? @@ -54,7 +54,7 @@ makedepends=" bzip2-dev curl-dev db-dev - enchant-dev + enchant2-dev freetds-dev freetype-dev gdbm-dev @@ -103,6 +103,7 @@ source="https://php.net/distributions/$_pkgreal-$pkgver.tar.xz php7-fpm-version-suffix.patch allow-build-recode-and-imap-together.patch fix-tests-devserver.patch + enchant-2.patch " builddir="$srcdir/$_pkgreal-$pkgver" @@ -694,4 +695,5 @@ ebf571c5e595221b9944d7e840807ebb68c1be38bf117186e19a3bd1070310ece5918bcaa5f94167 2128eb8e7e44e4f45909f2aa83c071bf7677f5c96e29a0182ac59d5850c7b3437e4b1b67c1a20f14d65f4b370985f838ea061541690ebcfbc9cb21d64744bc7a sharedir.patch fc680157c9bfaa600a82da0b2b8b96c9515eda653479bc9a9424e96683ea7c983190af0e54dcaf34256646069924df55f3f2d9a97fb11e971463a60f6df0e90f php7-fpm-version-suffix.patch a07f6f54a298be6f10caa0ce68cebdf1c7cd1404ddb6a0f2c3a77fb7af3c4172bc4474ffc784f3dc92514e4da2639e558aca6dc1cffcc2e55af0743eaad7de47 allow-build-recode-and-imap-together.patch -695ce980ea659575ba26b8443051620e83dc806e04b3bbace791f14af5c581ae4329e2c6326b554c60dab1a13f6b7c3fde49f20032540e53f80ecfade88c5b94 fix-tests-devserver.patch" +695ce980ea659575ba26b8443051620e83dc806e04b3bbace791f14af5c581ae4329e2c6326b554c60dab1a13f6b7c3fde49f20032540e53f80ecfade88c5b94 fix-tests-devserver.patch +b9b63a5fab6844cf98b7220948c94ea967b8bc9b6d76236e3b74e69f06513dd9e7c6684cda90f203adbb243c5bdfa5a51bd8dbab1bd0e266f0443480db9e31ed enchant-2.patch" diff --git a/community/php7/enchant-2.patch b/community/php7/enchant-2.patch new file mode 100644 index 0000000000..e60d1705d0 --- /dev/null +++ b/community/php7/enchant-2.patch @@ -0,0 +1,65 @@ +diff --git a/ext/enchant/config.m4 b/ext/enchant/config.m4 +index 81b77c9b..0fa74f29 100755 +--- a/ext/enchant/config.m4 ++++ b/ext/enchant/config.m4 +@@ -12,9 +12,9 @@ if test "$PHP_ENCHANT" != "no"; then + ENCHANT_SEARCH_DIRS="/usr/local /usr" + fi + for i in $ENCHANT_SEARCH_DIRS; do +- if test -f $i/include/enchant/enchant.h; then ++ if test -f $i/include/enchant-2/enchant.h; then + ENCHANT_DIR=$i +- ENCHANT_INCDIR=$i/include/enchant ++ ENCHANT_INCDIR=$i/include/enchant-2 + elif test -f $i/include/enchant.h; then + ENCHANT_DIR=$i + ENCHANT_INCDIR=$i/include +@@ -29,7 +29,7 @@ if test "$PHP_ENCHANT" != "no"; then + + AC_DEFINE(HAVE_ENCHANT,1,[ ]) + PHP_SUBST(ENCHANT_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(enchant, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(enchant-2, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD) + PHP_ADD_INCLUDE($ENCHANT_INCDIR) + PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param, + [ +diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c +index 063b419b..13ff8024 100644 +--- a/ext/enchant/enchant.c ++++ b/ext/enchant/enchant.c +@@ -738,7 +738,7 @@ PHP_FUNCTION(enchant_dict_quick_check) + 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); + } + + +@@ -795,7 +795,7 @@ PHP_FUNCTION(enchant_dict_suggest) + add_next_index_string(return_value, suggs[i]); + } + +- enchant_dict_free_suggestions(pdict->pdict, suggs); ++ enchant_dict_free_string_list(pdict->pdict, suggs); + } + } + /* }}} */ +@@ -815,7 +815,7 @@ PHP_FUNCTION(enchant_dict_add_to_personal) + + PHP_ENCHANT_GET_DICT; + +- enchant_dict_add_to_personal(pdict->pdict, word, wordlen); ++ enchant_dict_add(pdict->pdict, word, wordlen); + } + /* }}} */ + +@@ -853,7 +853,7 @@ PHP_FUNCTION(enchant_dict_is_in_session) + + 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)); + } + /* }}} */ + |