[arch-commits] Commit in php71/trunk (PKGBUILD enchant-2.patch)

[Jan de Groot]

    Date: Sunday, January 21, 2018 @ 22:48:34
  Author: jgc
Revision: 284805

upgpkg: php71 7.1.13-4

Adjust enchant-2 patch to fix FS#56835

Modified:
  php71/trunk/PKGBUILD
  php71/trunk/enchant-2.patch

-----------------+
 PKGBUILD        |    2 +-
 enchant-2.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-21 22:21:29 UTC (rev 284804)
+++ PKGBUILD	2018-01-21 22:48:34 UTC (rev 284805)
@@ -39,7 +39,7 @@
             '7d982a3cefb3eaec0b3458340e4991c2959c10d1518ecb7c1d041884b14efc73'
             '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
             '78f60b1d9f3a0ef8af77208feed76e303b3a13e93b80613c1e5a729004a5343c'
-            '2be98e145bda8c4af53f0013c248d11f0cec48164575de3593fac45a7431eee7')
+            'b11c3de747ef222696f5135556d624e3f7f0135a3cb1b06082f1ec8e9b7eeb0a')
 
 prepare() {
 	cd ${srcdir}/${pkgbase%71}-${pkgver}

Modified: enchant-2.patch
===================================================================
--- enchant-2.patch	2018-01-21 22:21:29 UTC (rev 284804)
+++ enchant-2.patch	2018-01-21 22:48:34 UTC (rev 284805)
@@ -44,3 +44,41 @@
      if test -n "$ENCHANT_LIBDIR"; then
  
    if test "$ENCHANT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ENCHANT_LIBDIR" != "/usr/lib"; then
+--- 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));
+ }
+ /* }}} */
+