[arch-commits] Commit in php/trunk (PKGBUILD enchant-2.patch)

[Jan de Groot]

    Date: Sunday, January 21, 2018 @ 22:29:59
  Author: jgc
Revision: 315211

upgpkg: php 7.2.1-3

Enchant-2 rebuild

Added:
  php/trunk/enchant-2.patch
Modified:
  php/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    8 +++++---
 enchant-2.patch |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-21 19:51:09 UTC (rev 315210)
+++ PKGBUILD	2018-01-21 22:29:59 UTC (rev 315211)
@@ -22,7 +22,7 @@
          'php-tidy'
          'php-xsl')
 pkgver=7.2.1
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -30,7 +30,7 @@
              'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre')
 checkdepends=('procps-ng')
 source=("https://php.net/distributions/${pkgbase}-${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)
 sha512sums=('2445f2cff20214b521c48592e5ab42b770c291702178d7cb2a84912c81b7e5d2cc45948a3a4a7830194fa444708d544c73efbaa8e90c95ab77937f7feffb2ffc'
             'SKIP'
             '65ea5cb38c1fc1874b2a4d08bc52443f9ed5dcc92cf99023a74292c78f9074516296f56c768f7efa8a1f0838feac47b356d3da6fdb1199419bebec3a93204ae6'
@@ -37,7 +37,8 @@
             'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e'
             '87453c9f41204bc7a20cbf2a85ee44965f7754529e2c17fb60bdfe42ded7a894d6e7fcc30fe6c650ea5f92f95920161522ef3ce0f355686a2fed7f0857abdd5c'
             '824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f'
-            '1606178f55dee8ca6a3cf47c7db486dca0c261bfffbaf4f69450a3497643910c65f8ee1543839ae4213d8b396afc6e5f86141accac553545c35fe234a50f56e6')
+            '1606178f55dee8ca6a3cf47c7db486dca0c261bfffbaf4f69450a3497643910c65f8ee1543839ae4213d8b396afc6e5f86141accac553545c35fe234a50f56e6'
+            '47612d1c002234c48c5788b9e556517d286d9c79591249b9f1f429ed4cf61ce15aeb10953f67ee408281718d50fa32e55577743936bde03e0d15b420a57ec030')
 validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F'
               '1729F83938DA44E27BA0F4D3DBDB397470D12172')
 
@@ -47,6 +48,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
 
 	rm tests/output/stream_isatty_*.phpt
 }

Added: enchant-2.patch
===================================================================
--- enchant-2.patch	                        (rev 0)
+++ enchant-2.patch	2018-01-21 22:29:59 UTC (rev 315211)
@@ -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