summarylogtreecommitdiffstats
path: root/generate_patches
diff options
context:
space:
mode:
authorIliya Ivanov2020-01-02 16:00:34 +0200
committerIliya Ivanov2020-01-02 16:00:34 +0200
commit820ce0afd6dfc4ae5e1af06810f6e708a93dadcf (patch)
treeed3b5d38b7522705310bb4af707335f8fe8b292a /generate_patches
parent2ddeb3c32496b293a93c081f381f4784a22f7213 (diff)
downloadaur-php-zts.tar.gz
php 7.4.1
Diffstat (limited to 'generate_patches')
-rwxr-xr-xgenerate_patches22
1 files changed, 19 insertions, 3 deletions
diff --git a/generate_patches b/generate_patches
index d3f04eb307a..eb196d50644 100755
--- a/generate_patches
+++ b/generate_patches
@@ -4,7 +4,7 @@
makepkg -o --nodeps --noprepare --skipinteg
-pushd src/${_pkgbase}-${pkgver}
+pushd src/${pkgbase}-${pkgver}
sed -e '/if test "$APACHE_VERSION" -lt 2004001; then/i PHP_BUILD_THREAD_SAFE' \
-e '/if test "$APACHE_VERSION" -lt 2004001; then/,+10d' \
@@ -28,15 +28,28 @@ sed \
-e 's#^PIDFile=.*#PIDFile=/run/php-fpm/php-fpm.pid#' \
-i.orig sapi/fpm/php-fpm.service.in
-extensions=";extension=bcmath\n;extension=bz2\n;extension=calendar\nextension=curl\n;extension=dba\n;extension=enchant\n;extension=exif\n;extension=ftp\n;extension=gd\n;extension=gettext\n;extension=gmp\n;extension=iconv\n;extension=imap\n;extension=intl\n;extension=sodium\n;extension=ldap\n;extension=mysqli\n;extension=odbc\n;zend_extension=opcache\n;extension=pdo_dblib\n;extension=pdo_mysql\n;extension=pdo_odbc\n;extension=pdo_pgsql\n;extension=pdo_sqlite\n;extension=pgsql\n;extension=pspell\n;extension=shmop\n;extension=snmp\n;extension=soap\n;extension=sockets\n;extension=sqlite3\n;extension=sysvmsg\n;extension=sysvsem\n;extension=sysvshm\n;extension=tidy\n;extension=xmlrpc\n;extension=xsl\nextension=zip\n"
+extensions=";extension=bcmath\n;extension=bz2\n;extension=calendar\nextension=curl\n;extension=dba\n;extension=enchant\n;extension=exif\n;extension=ffi\n;extension=ftp\n;extension=gd\n;extension=gettext\n;extension=gmp\n;extension=iconv\n;extension=imap\n;extension=intl\n;extension=ldap\n;extension=mysqli\n;extension=odbc\n;zend_extension=opcache\n;extension=pdo_dblib\n;extension=pdo_mysql\n;extension=pdo_odbc\n;extension=pdo_pgsql\n;extension=pdo_sqlite\n;extension=pgsql\n;extension=pspell\n;extension=shmop\n;extension=snmp\n;extension=soap\n;extension=sockets\n;extension=sodium\n;extension=sqlite3\n;extension=sysvmsg\n;extension=sysvsem\n;extension=sysvshm\n;extension=tidy\n;extension=xmlrpc\n;extension=xsl\nextension=zip\n"
sed \
-r ":a;N;\$!ba;s/; Notes for Windows environments :\n.+;?extension=\w+\n/${extensions}/g" \
-i.orig php.ini-production
sed \
- -e 's#^; extension_dir = "\./"$#extension_dir = "/usr/lib/php/modules/"#g' \
+ -e 's#^;extension_dir = "\./"$#extension_dir = "/usr/lib/php/modules/"#g' \
-i php.ini-production
+sed \
+ -r 's#PKG_CHECK_MODULES\(\[ENCHANT\], \[enchant\]\)#PKG_CHECK_MODULES([ENCHANT], [enchant-2])#g' \
+ -i.orig ext/enchant/config.m4
+sed \
+ -r 's#enchant_dict_free_suggestions\(pdict->pdict, suggs\)#enchant_dict_free_string_list(pdict->pdict, suggs)#g' \
+ -i.orig ext/enchant/enchant.c
+sed \
+ -r 's#enchant_dict_add_to_personal\(pdict->pdict, word, wordlen\)#enchant_dict_add(pdict->pdict, word, wordlen)#g' \
+ -i ext/enchant/enchant.c
+sed \
+ -r 's#enchant_dict_is_in_session\(pdict->pdict, word, wordlen\)#enchant_dict_is_added(pdict->pdict, word, wordlen)#g' \
+ -i ext/enchant/enchant.c
+
diff -u sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 | filterdiff --clean --remove-timestamps > ../../apache.patch
diff -u sapi/fpm/Makefile.frag.orig sapi/fpm/Makefile.frag | filterdiff --clean --remove-timestamps > ../../php-fpm.patch
@@ -46,4 +59,7 @@ diff -u sapi/fpm/php-fpm.service.in.orig sapi/fpm/php-fpm.service.in | filterdif
diff -u php.ini-production.orig php.ini-production | filterdiff --clean --remove-timestamps > ../../php.ini.patch
+diff -u ext/enchant/config.m4.orig ext/enchant/config.m4 | filterdiff --clean --remove-timestamps > ../../enchant-2.patch
+diff -u ext/enchant/enchant.c.orig ext/enchant/enchant.c | filterdiff --clean --remove-timestamps >> ../../enchant-2.patch
+
popd