Date: Sunday, January 21, 2018 @ 22:21:19 Author: jgc Revision: 284803
upgpkg: php71 7.1.13-4 Enchant-2 rebuild Added: php71/trunk/enchant-2.patch Modified: php71/trunk/PKGBUILD -----------------+ PKGBUILD | 8 +++++--- enchant-2.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-21 22:01:09 UTC (rev 284802) +++ PKGBUILD 2018-01-21 22:21:19 UTC (rev 284803) @@ -22,7 +22,7 @@ 'php71-tidy' 'php71-xsl') pkgver=7.1.13 -pkgrel=3 +pkgrel=4 arch=('x86_64') license=('PHP') url='http://www.php.net' @@ -31,7 +31,7 @@ checkdepends=('procps-ng') validpgpkeys=('1729F83938DA44E27BA0F4D3DBDB397470D12172') source=("https://php.net/distributions/${pkgbase%71}-${pkgver}.tar.xz"{,.asc} - 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch') + 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch' enchant-2.patch) sha256sums=('1a0b3f2fb61959b57a3ee01793a77ed3f19bde5aa90c43dcacc85ea32f64fc10' 'SKIP' '258b33b6531b1128d9804c8b608b6013423a421edcf764747042d07e79ec6df3' @@ -38,7 +38,8 @@ 'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce' '7d982a3cefb3eaec0b3458340e4991c2959c10d1518ecb7c1d041884b14efc73' '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5' - '78f60b1d9f3a0ef8af77208feed76e303b3a13e93b80613c1e5a729004a5343c') + '78f60b1d9f3a0ef8af77208feed76e303b3a13e93b80613c1e5a729004a5343c' + '2be98e145bda8c4af53f0013c248d11f0cec48164575de3593fac45a7431eee7') prepare() { cd ${srcdir}/${pkgbase%71}-${pkgver} @@ -46,6 +47,7 @@ patch -p0 -i ${srcdir}/apache.patch patch -p0 -i ${srcdir}/php-fpm.patch patch -p0 -i ${srcdir}/php.ini.patch + patch -p1 -i ../enchant-2.patch } build() { Added: enchant-2.patch =================================================================== --- enchant-2.patch (rev 0) +++ enchant-2.patch 2018-01-21 22:21:19 UTC (rev 284803) @@ -0,0 +1,46 @@ +--- 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.1.13/configure.orig 2018-01-21 22:03:51.494656374 +0000 ++++ php-7.1.13/configure 2018-01-21 22:12:35.932571143 +0000 +@@ -29838,9 +29838,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 +@@ -29862,7 +29862,7 @@ + + + if test "$ext_shared" = "yes"; then +- ENCHANT_SHARED_LIBADD="-lenchant $ENCHANT_SHARED_LIBADD" ++ ENCHANT_SHARED_LIBADD="-lenchant-2 $ENCHANT_SHARED_LIBADD" + if test -n "$ENCHANT_LIBDIR"; then + + if test "$ENCHANT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ENCHANT_LIBDIR" != "/usr/lib"; then