[arch-commits] Commit in php/trunk (PKGBUILD)

[Pierre Schmitz]

    Date: Sunday, August 31, 2014 @ 11:11:43
  Author: pierre
Revision: 220823

upgpkg: php 5.6.0-4

Use system gd

Modified:
  php/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-31 04:17:47 UTC (rev 220822)
+++ PKGBUILD	2014-08-31 09:11:43 UTC (rev 220823)
@@ -23,14 +23,14 @@
          'php-tidy'
          'php-xsl')
 pkgver=5.6.0
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
 makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
              'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
-             'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
-             'curl' 'libxslt' 'openssl' 'db' 'gmp' 'freetype2' 'systemd')
+             'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'gd' 'libxpm' 'icu'
+             'curl' 'libxslt' 'openssl' 'db' 'gmp' 'systemd')
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz"
         "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz.asc"
         'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
@@ -93,7 +93,7 @@
 		--with-enchant=shared,/usr \
 		--with-fpm-systemd \
 		--with-freetype-dir=/usr \
-		--with-gd=shared \
+		--with-gd=shared,/usr \
 		--with-gdbm \
 		--with-gettext=shared \
 		--with-gmp=shared \
@@ -304,7 +304,7 @@
 
 package_php-gd() {
 	pkgdesc='gd module for PHP'
-	depends=('php' 'libjpeg' 'libvpx')
+	depends=('php' 'gd' 'libvpx')
 
 	install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
 }