From 1898956d4fb51404a527e909230781848a9d3118 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Wed, 25 Mar 2020 07:26:01 +0000
Subject: user/php7: bump to 7.4.4

* Use system libgd
* Use system oniguruma
* Upstream has migrated from pcre to pcre2
* Drop comments about extensions that aren't being built (imap, recode,
  sodium, tidy)
* Drop php7-wddx (has been removed from core upstream)
* Drop php7-litespeed (I don't think anyone uses this)
* Pin subpackage versions to main package
* Fix _extensions_by_load_order so all extensions are tested
  * This increases the test suite size from ~ 9000 to ~ 15000
* Add additional API/ABI checks from Fedora
---
 user/php7/enchant-2.patch | 64 ++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

(limited to 'user/php7/enchant-2.patch')

diff --git a/user/php7/enchant-2.patch b/user/php7/enchant-2.patch
index ed048de28..709345cf0 100644
--- a/user/php7/enchant-2.patch
+++ b/user/php7/enchant-2.patch
@@ -1,31 +1,33 @@
-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 @@
+--- 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])])
+ 
+ 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 @@
  			for (i = 0; i < n_sugg; i++) {
  				add_next_index_string(sugg, suggs[i]);
  			}
@@ -34,7 +36,7 @@ Lifted from Arch: https://git.archlinux.org/svntogit/packages.git/tree/trunk/enc
  		}
  
  
-@@ -798,7 +798,7 @@
+@@ -793,7 +793,7 @@
  			add_next_index_string(return_value, suggs[i]);
  		}
  
@@ -43,7 +45,7 @@ Lifted from Arch: https://git.archlinux.org/svntogit/packages.git/tree/trunk/enc
  	}
  }
  /* }}} */
-@@ -818,7 +818,7 @@
+@@ -813,7 +813,7 @@
  
  	PHP_ENCHANT_GET_DICT;
  
@@ -52,7 +54,7 @@ Lifted from Arch: https://git.archlinux.org/svntogit/packages.git/tree/trunk/enc
  }
  /* }}} */
  
-@@ -856,7 +856,7 @@
+@@ -851,7 +851,7 @@
  
  	PHP_ENCHANT_GET_DICT;
  
-- 
cgit v1.2.3-70-g09d2