Added patch to fix php71-intl-noconflict with icu 61.1

1 files changed, 5 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 77fc7de0ccfb..75745268e294 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ _realpkg=${pkgbase%-noconflict}
 pkgname=("${pkgbase}"
          "${_realpkg}-"{cgi,apache,fpm,embed,phpdbg,dblib,enchant,gd,imap,intl,mcrypt,odbc,pgsql,pspell,snmp,sqlite,tidy,xsl}"-noconflict")
 pkgver=7.1.16
-pkgrel=1
+pkgrel=2
 pkgdesc="php 7.1 compiled as to not conflict with php 7.2+"
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -35,7 +35,7 @@ validpgpkeys=(
         '1729F83938DA44E27BA0F4D3DBDB397470D12172'
 )
 source=("https://php.net/distributions/${_pkgbase}-${pkgver}.tar.xz"{,.asc}
-        'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch' enchant-2.patch)
+        'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch' 'enchant-2.patch' 'intl.patch')
 sha256sums=('a5d67e477248a3911af7ef85c8400c1ba8cd632184186fd31070b96714e669f1'
             'SKIP'
             '258b33b6531b1128d9804c8b608b6013423a421edcf764747042d07e79ec6df3'
@@ -43,7 +43,8 @@ sha256sums=('a5d67e477248a3911af7ef85c8400c1ba8cd632184186fd31070b96714e669f1'
             '06f3fa51052d5cf21369e1f6ee0b13365a93bfa05ff672d02f30e8ea4974d815'
             '3f4625d50cf50ce828c6c23f20e1292a0e009fe2c8922368cddda9d44dbc1cc8'
             '46a35d04bdef718f4974e732331bbd9988d77de3f4a6f5867a184dd175dfaf3b'
-            'b11c3de747ef222696f5135556d624e3f7f0135a3cb1b06082f1ec8e9b7eeb0a')
+            'b11c3de747ef222696f5135556d624e3f7f0135a3cb1b06082f1ec8e9b7eeb0a'
+           'd9a36adc12ecf0932e89b4b1d74dcf616ca88721fd281b2cca85d2bcc9343ad6')
 
 prepare() {
 	cd ${srcdir}/${_pkgbase}-${pkgver}
@@ -52,6 +53,7 @@ prepare() {
 	patch -p0 -i ${srcdir}/php-fpm.patch
 	patch -p0 -i ${srcdir}/php.ini.patch
 	patch -p1 -i ../enchant-2.patch
+        patch -p1 -i ../intl.patch
 }
 
 build() {
@@ -130,7 +132,6 @@ build() {
 
 	EXTENSION_DIR=/usr/lib/${_realpkg}/modules
 	export EXTENSION_DIR
-
 	mkdir ${srcdir}/build
 	cd ${srcdir}/build
 	ln -s ../${_pkgbase}-${pkgver}/configure