diff options
-rw-r--r-- | .SRCINFO | 52 | ||||
-rw-r--r-- | PKGBUILD | 12 | ||||
-rw-r--r-- | intl.patch | 56 |
3 files changed, 30 insertions, 90 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Apr 5 13:13:00 UTC 2018 +# Tue Apr 24 23:48:04 UTC 2018 pkgbase = php71-noconflict pkgdesc = php 7.1 compiled as to not conflict with php 7.2+ - pkgver = 7.1.16 - pkgrel = 2 + pkgver = 7.1.17 + pkgrel = 1 url = http://www.php.net arch = i686 arch = x86_64 @@ -30,16 +30,15 @@ pkgbase = php71-noconflict makedepends = postfix makedepends = freetds makedepends = pcre - source = https://php.net/distributions/php-7.1.16.tar.xz - source = https://php.net/distributions/php-7.1.16.tar.xz.asc + source = https://php.net/distributions/php-7.1.17.tar.xz + source = https://php.net/distributions/php-7.1.17.tar.xz.asc source = apache.patch source = apache.conf source = php-fpm.patch source = php-fpm.tmpfiles source = php.ini.patch source = enchant-2.patch - source = intl.patch - sha256sums = a5d67e477248a3911af7ef85c8400c1ba8cd632184186fd31070b96714e669f1 + sha256sums = 1a784806866e06367f7a5c88775d239d6f30041c7ce65a8232d03a3d4de56d56 sha256sums = SKIP sha256sums = 258b33b6531b1128d9804c8b608b6013423a421edcf764747042d07e79ec6df3 sha256sums = ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce @@ -47,7 +46,6 @@ pkgbase = php71-noconflict sha256sums = 3f4625d50cf50ce828c6c23f20e1292a0e009fe2c8922368cddda9d44dbc1cc8 sha256sums = 46a35d04bdef718f4974e732331bbd9988d77de3f4a6f5867a184dd175dfaf3b sha256sums = b11c3de747ef222696f5135556d624e3f7f0135a3cb1b06082f1ec8e9b7eeb0a - sha256sums = d9a36adc12ecf0932e89b4b1d74dcf616ca88721fd281b2cca85d2bcc9343ad6 pkgname = php71-noconflict pkgdesc = A general-purpose scripting language that is especially suited to web development @@ -55,26 +53,26 @@ pkgname = php71-noconflict depends = curl depends = libzip depends = pcre - provides = php=7.1.16 + provides = php=7.1.17 backup = etc/php71/php.ini pkgname = php71-cgi-noconflict pkgdesc = CGI and FCGI SAPI for PHP depends = php71-noconflict - provides = php-cgi=7.1.16 + provides = php-cgi=7.1.17 pkgname = php71-apache-noconflict pkgdesc = Apache SAPI for PHP depends = php71-noconflict depends = apache - provides = php-apache=7.1.16 + provides = php-apache=7.1.17 backup = etc/httpd/conf/extra/php71_module.conf pkgname = php71-fpm-noconflict pkgdesc = FastCGI Process Manager for PHP depends = php71-noconflict depends = systemd - provides = php-fpm=7.1.16 + provides = php-fpm=7.1.17 options = !emptydirs backup = etc/php71/php-fpm.conf backup = etc/php71/php-fpm.d/www.conf @@ -83,91 +81,91 @@ pkgname = php71-embed-noconflict pkgdesc = Embedded PHP SAPI library depends = php71-noconflict depends = libsystemd - provides = php-embed=7.1.16 + provides = php-embed=7.1.17 options = !emptydirs pkgname = php71-phpdbg-noconflict pkgdesc = Interactive PHP debugger depends = php71-noconflict - provides = php-phpdbg=7.1.16 + provides = php-phpdbg=7.1.17 options = !emptydirs pkgname = php71-dblib-noconflict pkgdesc = dblib module for PHP depends = php71-noconflict depends = freetds - provides = php-dblib=7.1.16 + provides = php-dblib=7.1.17 pkgname = php71-enchant-noconflict pkgdesc = enchant module for PHP depends = php71-noconflict depends = enchant - provides = php-enchant=7.1.16 + provides = php-enchant=7.1.17 pkgname = php71-gd-noconflict pkgdesc = gd module for PHP depends = php71-noconflict depends = gd - provides = php-gd=7.1.16 + provides = php-gd=7.1.17 pkgname = php71-imap-noconflict pkgdesc = imap module for PHP depends = php71-noconflict depends = c-client - provides = php-imap=7.1.16 + provides = php-imap=7.1.17 pkgname = php71-intl-noconflict pkgdesc = intl module for PHP depends = php71-noconflict depends = icu - provides = php-intl=7.1.16 + provides = php-intl=7.1.17 pkgname = php71-mcrypt-noconflict pkgdesc = mcrypt module for PHP depends = php71-noconflict depends = libmcrypt depends = libtool - provides = php-mcrypt=7.1.16 + provides = php-mcrypt=7.1.17 pkgname = php71-odbc-noconflict pkgdesc = ODBC modules for PHP depends = php71-noconflict depends = unixodbc - provides = php-odbc=7.1.16 + provides = php-odbc=7.1.17 pkgname = php71-pgsql-noconflict pkgdesc = PostgreSQL modules for PHP depends = php71-noconflict depends = postgresql-libs - provides = php-pgsql=7.1.16 + provides = php-pgsql=7.1.17 pkgname = php71-pspell-noconflict pkgdesc = pspell module for PHP depends = php71-noconflict depends = aspell - provides = php-pspell=7.1.16 + provides = php-pspell=7.1.17 pkgname = php71-snmp-noconflict pkgdesc = snmp module for PHP depends = php71-noconflict depends = net-snmp - provides = php-snmp=7.1.16 + provides = php-snmp=7.1.17 pkgname = php71-sqlite-noconflict pkgdesc = sqlite module for PHP depends = php71-noconflict depends = sqlite - provides = php-sqlite=7.1.16 + provides = php-sqlite=7.1.17 pkgname = php71-tidy-noconflict pkgdesc = tidy module for PHP depends = php71-noconflict depends = tidy - provides = php-tidy=7.1.16 + provides = php-tidy=7.1.17 pkgname = php71-xsl-noconflict pkgdesc = xsl module for PHP depends = php71-noconflict depends = libxslt - provides = php-xsl=7.1.16 + provides = php-xsl=7.1.17 @@ -8,8 +8,8 @@ _pkgbase=${pkgbase%71-noconflict} _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=2 +pkgver=7.1.17 +pkgrel=1 pkgdesc="php 7.1 compiled as to not conflict with php 7.2+" arch=('i686' 'x86_64') license=('PHP') @@ -35,16 +35,15 @@ 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' 'intl.patch') -sha256sums=('a5d67e477248a3911af7ef85c8400c1ba8cd632184186fd31070b96714e669f1' + 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch' 'enchant-2.patch') +sha256sums=('1a784806866e06367f7a5c88775d239d6f30041c7ce65a8232d03a3d4de56d56' 'SKIP' '258b33b6531b1128d9804c8b608b6013423a421edcf764747042d07e79ec6df3' 'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce' '06f3fa51052d5cf21369e1f6ee0b13365a93bfa05ff672d02f30e8ea4974d815' '3f4625d50cf50ce828c6c23f20e1292a0e009fe2c8922368cddda9d44dbc1cc8' '46a35d04bdef718f4974e732331bbd9988d77de3f4a6f5867a184dd175dfaf3b' - 'b11c3de747ef222696f5135556d624e3f7f0135a3cb1b06082f1ec8e9b7eeb0a' - 'd9a36adc12ecf0932e89b4b1d74dcf616ca88721fd281b2cca85d2bcc9343ad6') + 'b11c3de747ef222696f5135556d624e3f7f0135a3cb1b06082f1ec8e9b7eeb0a') prepare() { cd ${srcdir}/${_pkgbase}-${pkgver} @@ -53,7 +52,6 @@ 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() { diff --git a/intl.patch b/intl.patch deleted file mode 100644 index a3c8ed4bbca2..000000000000 --- a/intl.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2248,6 +2248,9 @@ AC_DEFUN([PHP_SETUP_ICU],[ - ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` - PHP_EVAL_INCLINE($ICU_INCS) - PHP_EVAL_LIBLINE($ICU_LIBS, $1) -+ -+ ICU_EXTRA_FLAGS=`$ICU_CONFIG --cxxflags` -+ ICU_EXTRA_FLAGS="$ICU_EXTRA_FLAGS -DU_USING_ICU_NAMESPACE=1" - fi - ]) - ---- a/ext/intl/config.m4 -+++ b/ext/intl/config.m4 -@@ -86,7 +86,7 @@ if test "$PHP_INTL" != "no"; then - breakiterator/codepointiterator_methods.cpp \ - uchar/uchar.c \ - idn/idn.c \ -- $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,cxx) -+ $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $ICU_EXTRA_FLAGS,cxx) - PHP_ADD_BUILD_DIR($ext_builddir/collator) - PHP_ADD_BUILD_DIR($ext_builddir/converter) - PHP_ADD_BUILD_DIR($ext_builddir/common) ---- a/ext/intl/config.w32 -+++ b/ext/intl/config.w32 -@@ -130,7 +130,7 @@ if (PHP_INTL != "no") { - ADD_FLAG("LIBS_INTL", "iculx.lib"); - } - -- ADD_FLAG("CFLAGS_INTL", "/EHsc"); -+ ADD_FLAG("CFLAGS_INTL", "/EHsc /D U_USING_ICU_NAMESPACE=1"); - AC_DEFINE("HAVE_INTL", 1, "Internationalization support enabled"); - } else { - WARNING("intl not enabled; libraries and/or headers not found"); --- ---- a/configure.orig -+++ b/configure -@@ -45216,6 +45204,9 @@ - esac - done - -+ -+ ICU_EXTRA_FLAGS=`$ICU_CONFIG --cxxflags` -+ ICU_EXTRA_FLAGS="$ICU_EXTRA_FLAGS -DU_USING_ICU_NAMESPACE=1" - fi - - -@@ -45639,7 +45630,7 @@ - ext_srcdir=$abs_srcdir/ext/intl - ext_dir=ext/intl - -- ac_extra=`echo "$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` -+ ac_extra=`echo "$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $ICU_EXTRA_FLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_INTL_SHARED=no |