diff options
Diffstat (limited to 'enchant-2.patch')
| -rw-r--r-- | enchant-2.patch | 46 |
1 files changed, 17 insertions, 29 deletions
diff --git a/enchant-2.patch b/enchant-2.patch index 75be01369ffb..c2721d717ba4 100644 --- a/enchant-2.patch +++ b/enchant-2.patch @@ -1,29 +1,17 @@ ---- 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 @@ +--- ext/enchant/config.m4.orig ++++ ext/enchant/config.m4 +@@ -4,7 +4,7 @@ + [Include Enchant support])]) + + if test "$PHP_ENCHANT" != "no"; then +- PKG_CHECK_MODULES([ENCHANT], [enchant]) ++ PKG_CHECK_MODULES([ENCHANT], [enchant-2]) + + PHP_EVAL_INCLINE($ENCHANT_CFLAGS) + PHP_EVAL_LIBLINE($ENCHANT_LIBS, ENCHANT_SHARED_LIBADD) +--- ext/enchant/enchant.c.orig ++++ ext/enchant/enchant.c +@@ -740,7 +740,7 @@ for (i = 0; i < n_sugg; i++) { add_next_index_string(sugg, suggs[i]); } @@ -32,7 +20,7 @@ } -@@ -798,7 +798,7 @@ +@@ -797,7 +797,7 @@ add_next_index_string(return_value, suggs[i]); } @@ -41,7 +29,7 @@ } } /* }}} */ -@@ -818,7 +818,7 @@ +@@ -817,7 +817,7 @@ PHP_ENCHANT_GET_DICT; @@ -50,7 +38,7 @@ } /* }}} */ -@@ -856,7 +856,7 @@ +@@ -855,7 +855,7 @@ PHP_ENCHANT_GET_DICT; |