From 531fe443dc2a4e4bc06eb0723e623831a80c139b Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 21 May 2013 06:38:49 +0000
Subject: main/php: link gd extension to libiconv

ref #1916
---
 main/php/APKBUILD       | 14 ++++++++++----
 main/php/gd-iconv.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 main/php/gd-iconv.patch

(limited to 'main')

diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 0e288c7ebf2..5ef1b950e61 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=php
 pkgver=5.4.15
-pkgrel=0
+pkgrel=1
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 arch="all"
@@ -45,6 +45,7 @@ makedepends="
 	sqlite-dev
 	unixodbc-dev
 	zlib-dev
+	autoconf
 	"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-common $pkgname-cgi
 	$pkgname-cli $pkgname-fpm $pkgname-apache2 $pkgname-embed
@@ -104,6 +105,7 @@ source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2
 	php-fpm.initd
 	php5-module.conf
 	php-install-pear-xml.patch
+	gd-iconv.patch
 	"
 
 _apiver="20100412"
@@ -124,6 +126,7 @@ prepare() {
 		error "Upstreram API version is now $vapi. Expecting $_vapi"
 		return 1
 	fi
+	autoconf
 }
 
 _do_build() {
@@ -473,12 +476,15 @@ wddx()		{ _mv_ext wddx; }
 md5sums="145ea5e845e910443ff1eddb3dbcf56a  php-5.4.15.tar.bz2
 9ab162ff3428511a68aa9801c746e0d5  php-fpm.initd
 67719f428f44ec004da18705cbabe2ee  php5-module.conf
-483bc0a85c50a9a9aedbe14a19ed4526  php-install-pear-xml.patch"
+483bc0a85c50a9a9aedbe14a19ed4526  php-install-pear-xml.patch
+3e0faaaf0abd573300d54f92325e4dba  gd-iconv.patch"
 sha256sums="2d2285da48ccd2db311b2608fdfafd18b363a9f7e3796d53dd53e5b6752a0136  php-5.4.15.tar.bz2
 96e68f7c545adcac56ed1f5824b33041e270680ca884a9cfe27e7f4ac8abfd3b  php-fpm.initd
 ceec4d5b2a128c6a97e49830af604f0bb555bca1a86a9cd0366b828ba392257f  php5-module.conf
-f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab  php-install-pear-xml.patch"
+f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab  php-install-pear-xml.patch
+acbbc559063e04f69b3c481af007c00541846750c7d47a6daeb72b22c1b793fe  gd-iconv.patch"
 sha512sums="4535ea672e138447d4255406c7e93fb8152819e3540058473aed032a25b962061369b7225f4e39d7d1883e74d4b8978c27a1a20db946049deccfe5a596b2175c  php-5.4.15.tar.bz2
 33247a1c9188eba893bb0be13456eeeec9b971c7f482a4e2bd0f318fb63d8c67d379a021840768bef8e4d630be859c5bdb424c1e90b9b816ec691c078147e915  php-fpm.initd
 895e94c791bd82060ad820fef049d366a09c932097faa6b7b9a2c2e9e00a18cb7c0f9b128679c7659b404379266fd0f95dba5c0333f626194cf60f7bf6044102  php5-module.conf
-f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505  php-install-pear-xml.patch"
+f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505  php-install-pear-xml.patch
+18836154d589fd105e220ad12557789bf4f253f91fb11292c27a96f8ab4ba1619bc21a2f8e5e9df296fb9914c0d94394baad79ffbf9a459d56f7e0a6558094f4  gd-iconv.patch"
diff --git a/main/php/gd-iconv.patch b/main/php/gd-iconv.patch
new file mode 100644
index 00000000000..ed7384ee9d2
--- /dev/null
+++ b/main/php/gd-iconv.patch
@@ -0,0 +1,47 @@
+diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
+index 0e35ece..3593cd7 100644
+--- a/ext/gd/config.m4
++++ b/ext/gd/config.m4
+@@ -6,6 +6,9 @@ dnl
+ dnl Configure options
+ dnl
+ 
++PHP_ARG_WITH(iconv-dir, iconv dir for GD and XMLRPC-EPI,
++[  --with-iconv-dir=DIR      GD/XMLRPC-EPI: iconv dir for GD/XMLRPC-EPI],no,no)
++
+ PHP_ARG_WITH(gd, for GD support,
+ [  --with-gd[=DIR]         Include GD support.  DIR is the GD library base
+                           install directory [BUNDLED]])
+@@ -374,6 +377,18 @@ dnl enable the support in bundled GD library
+     GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
+   fi
+ 
++  dnl link to iconv if needed
++  if test "$PHP_ICONV_DIR" != "no"; then
++    PHP_ICONV=$PHP_ICONV_DIR
++  fi
++
++  if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then
++    PHP_ICONV=yes
++  fi
++
++  PHP_SETUP_ICONV(GD_SHARED_LIBADD, [], [
++    AC_MSG_ERROR([iconv not found, in order to build gd you need the iconv library])
++  ])
+ else
+ 
+  if test "$PHP_GD" != "no"; then
+diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
+index 389d4ad..a12575b 100644
+--- a/ext/xmlrpc/config.m4
++++ b/ext/xmlrpc/config.m4
+@@ -18,9 +18,6 @@ fi
+ PHP_ARG_WITH(libexpat-dir, libexpat dir for XMLRPC-EPI,
+ [  --with-libexpat-dir=DIR   XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)],no,no)
+ 
+-PHP_ARG_WITH(iconv-dir, iconv dir for XMLRPC-EPI,
+-[  --with-iconv-dir=DIR      XMLRPC-EPI: iconv dir for XMLRPC-EPI],no,no)
+-
+ if test "$PHP_XMLRPC" != "no"; then
+ 
+   PHP_ADD_EXTENSION_DEP(xmlrpc, libxml)
-- 
cgit v1.2.3