diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-20 02:06:02 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-20 02:06:02 +0000 |
| commit | c776a7bce1b89e0315939f8607b91e793b6ccb67 (patch) | |
| tree | bb63328cf0d516adcf06a6eb52ebc7d50b215db5 /user/php7/enchant-2.patch | |
| parent | 34a8b8725db414e6f51b35a6c248d4c67f53c154 (diff) | |
| parent | 333e6c234387f048557fdd4235c5a1809474f6f2 (diff) | |
| download | packages-c776a7bce1b89e0315939f8607b91e793b6ccb67.tar.gz packages-c776a7bce1b89e0315939f8607b91e793b6ccb67.tar.bz2 packages-c776a7bce1b89e0315939f8607b91e793b6ccb67.tar.xz packages-c776a7bce1b89e0315939f8607b91e793b6ccb67.zip | |
Merge branch 'php7' into 'master'
user/php7: bump to 7.2.16, modernize, build with enchant-2
* Drop CVE-2018-19935.patch: included as of version 7.2.14
See merge request !204
Diffstat (limited to 'user/php7/enchant-2.patch')
| -rw-r--r-- | user/php7/enchant-2.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/user/php7/enchant-2.patch b/user/php7/enchant-2.patch new file mode 100644 index 000000000..ed048de28 --- /dev/null +++ b/user/php7/enchant-2.patch @@ -0,0 +1,63 @@ +Lifted from Arch: https://git.archlinux.org/svntogit/packages.git/tree/trunk/enchant-2.patch?h=packages/php + +--- php-7.1.13/ext/enchant/config.m4.orig 2018-01-03 02:32:29.000000000 +0000 ++++ php-7.1.13/ext/enchant/config.m4 2018-01-21 22:10:03.788875780 +0000 +@@ -14,9 +14,9 @@ + 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 +@@ -31,7 +31,7 @@ + + 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, + [ +--- php-7.2.1/ext/enchant/enchant.c.orig 2018-01-02 22:36:05.000000000 +0000 ++++ php-7.2.1/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)); + } + /* }}} */ + |