php7/trunk/enchant-2.patch

   1 --- ext/enchant/config.m4.orig
   2 +++ ext/enchant/config.m4
   3 @@ -4,7 +4,7 @@
   4      [Include Enchant support])])
   5
   6  if test "$PHP_ENCHANT" != "no"; then
   7 -  PKG_CHECK_MODULES([ENCHANT], [enchant])
   8 +  PKG_CHECK_MODULES([ENCHANT], [enchant-2])
   9
  10    PHP_EVAL_INCLINE($ENCHANT_CFLAGS)
  11    PHP_EVAL_LIBLINE($ENCHANT_LIBS, ENCHANT_SHARED_LIBADD)
  12 --- ext/enchant/enchant.c.orig
  13 +++ ext/enchant/enchant.c
  14 @@ -738,7 +738,7 @@
  15                         for (i = 0; i < n_sugg; i++) {
  16                                 add_next_index_string(sugg, suggs[i]);
  17                         }
  18 -                       enchant_dict_free_suggestions(pdict->pdict, suggs);
  19 +                       enchant_dict_free_string_list(pdict->pdict, suggs);
  20                 }
  21
  22
  23 @@ -793,7 +793,7 @@
  24                         add_next_index_string(return_value, suggs[i]);
  25                 }
  26
  27 -               enchant_dict_free_suggestions(pdict->pdict, suggs);
  28 +               enchant_dict_free_string_list(pdict->pdict, suggs);
  29         }
  30  }
  31  /* }}} */
  32 @@ -813,7 +813,7 @@
  33
  34         PHP_ENCHANT_GET_DICT;
  35
  36 -       enchant_dict_add_to_personal(pdict->pdict, word, wordlen);
  37 +       enchant_dict_add(pdict->pdict, word, wordlen);
  38  }
  39  /* }}} */
  40
  41 @@ -851,7 +851,7 @@
  42
  43         PHP_ENCHANT_GET_DICT;
  44
  45 -       RETURN_BOOL(enchant_dict_is_in_session(pdict->pdict, word, wordlen));
  46 +       RETURN_BOOL(enchant_dict_is_added(pdict->pdict, word, wordlen));
  47  }
  48  /* }}} */
  49