mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-02-10 18:31:50 +01:00
66 lines
2.0 KiB
Diff
66 lines
2.0 KiB
Diff
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));
|
|
}
|
|
/* }}} */
|
|
|