aboutsummaryrefslogtreecommitdiffstats
path: root/community/php7/enchant-2.patch
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2019-12-02 04:21:22 -0500
committerAndy Postnikov <apostnikov@gmail.com>2020-06-15 02:46:20 +0300
commitb315e28b96f16c2a8973a55a736e1e35482203dd (patch)
treefba078473d12220cecc531800b04e4a12cce9d2f /community/php7/enchant-2.patch
parent8231e3d86e62fbbf4b8b7bf5235e5f43d19c2e4a (diff)
downloadaports-b315e28b96f16c2a8973a55a736e1e35482203dd.tar.gz
aports-b315e28b96f16c2a8973a55a736e1e35482203dd.tar.bz2
aports-b315e28b96f16c2a8973a55a736e1e35482203dd.tar.xz
community/php7: upgrade to 7.4.7
Diffstat (limited to 'community/php7/enchant-2.patch')
-rw-r--r--community/php7/enchant-2.patch73
1 files changed, 42 insertions, 31 deletions
diff --git a/community/php7/enchant-2.patch b/community/php7/enchant-2.patch
index e60d1705d0..9d421c3bf0 100644
--- a/community/php7/enchant-2.patch
+++ b/community/php7/enchant-2.patch
@@ -1,33 +1,33 @@
-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
+--- php-7.4.4/ext/enchant/config.m4 2020-03-17 10:40:22.000000000 +0000
++++ php-7.4.4/ext/enchant/config.m4 2020-03-27 21:25:27.754470703 +0000
+@@ -4,21 +4,21 @@ PHP_ARG_WITH([enchant],
+ [Include Enchant support])])
- 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
+ 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)
+
+ AC_DEFINE(HAVE_ENCHANT, 1, [ ])
+
+- PHP_CHECK_LIBRARY(enchant, enchant_get_version,
++ PHP_CHECK_LIBRARY(enchant-2, enchant_get_version,
+ [
+ AC_DEFINE(HAVE_ENCHANT_GET_VERSION, 1, [ ])
+ ], [ ], [
+ $ENCHANT_LIBS
+ ])
+
+- PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
++ PHP_CHECK_LIBRARY(enchant-2, enchant_broker_set_param,
+ [
+ AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM, 1, [ ])
+ ], [ ], [
+--- a/ext/enchant/enchant.c.orig
+++ b/ext/enchant/enchant.c
-@@ -738,7 +738,7 @@ PHP_FUNCTION(enchant_dict_quick_check)
+@@ -738,7 +738,7 @@
for (i = 0; i < n_sugg; i++) {
add_next_index_string(sugg, suggs[i]);
}
@@ -36,7 +36,7 @@ index 063b419b..13ff8024 100644
}
-@@ -795,7 +795,7 @@ PHP_FUNCTION(enchant_dict_suggest)
+@@ -793,7 +793,7 @@
add_next_index_string(return_value, suggs[i]);
}
@@ -45,7 +45,7 @@ index 063b419b..13ff8024 100644
}
}
/* }}} */
-@@ -815,7 +815,7 @@ PHP_FUNCTION(enchant_dict_add_to_personal)
+@@ -813,7 +813,7 @@
PHP_ENCHANT_GET_DICT;
@@ -54,7 +54,7 @@ index 063b419b..13ff8024 100644
}
/* }}} */
-@@ -853,7 +853,7 @@ PHP_FUNCTION(enchant_dict_is_in_session)
+@@ -851,7 +851,7 @@
PHP_ENCHANT_GET_DICT;
@@ -63,3 +63,14 @@ index 063b419b..13ff8024 100644
}
/* }}} */
+--- php-7.4.4/build/php.m4 2020-03-17 06:40:21.000000000 -0400
++++ php-7.4.4/build/php.m4 2020-04-05 09:27:14.634620646 -0400
+@@ -1541,7 +1541,7 @@ AC_DEFUN([PHP_CHECK_LIBRARY], [
+ ],[
+ LDFLAGS=$save_old_LDFLAGS
+ ext_shared=$save_ext_shared
+- unset ac_cv_lib_$1[]_$2
++ unset ac_cv_lib_[]translit($1, -, _)_$2
+ $4
+ ])dnl
+ ])