fix freetype >=2.9.1 compatibility

Signed-off-by: Thore Bödecker <me@foxxx0.de>
author: Thore Bödecker 2018-05-20 11:06:20 +0200
committer: Thore Bödecker 2018-05-20 11:06:20 +0200
commit: 2692f480ae7a20fc4b1e6bd1e3d156e414e8ce6c (patch)
tree: c4fa70181d6e1aefd2071b450ed66fba295f5360
parent: 54ea0780108f740b001538dde3fdf8513f36e2b9 (diff)
download: aur-2692f480ae7a20fc4b1e6bd1e3d156e414e8ce6c.tar.gz
4 files changed, 261 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9c59149684f8..fb54c5c4f802 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Apr 29 14:36:12 UTC 2018
+# Sun May 20 09:05:46 UTC 2018
 pkgbase = php56
 	pkgdesc = A general-purpose scripting language that is especially suited to web development
 	pkgver = 5.6.36
-	pkgrel = 1
+	pkgrel = 2
 	url = http://php.net
 	arch = i686
 	arch = x86_64
@@ -32,6 +32,7 @@ pkgbase = php56
 	makedepends = db
 	makedepends = gmp
 	makedepends = systemd
+	makedepends = libnsl
 	source = https://secure.php.net/distributions/php-5.6.36.tar.xz
 	source = https://secure.php.net/distributions/php-5.6.36.tar.xz.asc
 	source = php.ini.patch
@@ -41,6 +42,7 @@ pkgbase = php56
 	source = php-fpm.service
 	source = php-fpm.tmpfiles
 	source = use-enchant2.patch
+	source = php-freetype-2.9.1.patch
 	sha512sums = 807c68ab85b6685b19707bd18cfd46f3695b2dc67f9f17f85476634e4a80a036cb413ccae05ed5ba529eafe8df57ebf758dd664ed2942ec44f90a6e8b0172e5e
 	sha512sums = SKIP
 	sha512sums = e742d6e3e43bce75e11b4646cdbf06c5661c66cc22d5615caff1e293ed35e95973290940c93d6abeec2d43f02761baabf24e6954720d7df8f2bd7de2c3f9ba0d
@@ -49,7 +51,8 @@ pkgbase = php56
 	sha512sums = a398e9cde4ba57d243abb5b394152d87bc1fddc2d5fc934569e1f912a5a80eba3ae14720fe99fcda50722bedc5d65abcbde2822f5075091c4a83a2f6bb22c122
 	sha512sums = c6b74e1b39224e79d33915a0d32fe2d08114d1dcec93035017af783b8b73b6475779e3e649abb35b73ea2fd6553120696c48ebb0894531282fbc9e1b36da9f3b
 	sha512sums = 9cc548c9395f0765e6ebf54604dc8e71da38ffbc10eba50ba9b7e2f91690c53056f62efa2060fc8670de94e0642027c6eaa6c2820ba99e2b489695d1e320fcf3
-	sha512sums = 5f0dc48f13de7024db1bd6189967b389aa6d8cf9ab9dc1b242b4ea4250df1edd909364efb2d840e38227676fee5dee93bac38056db2a80ad6c7ba0e13f71fcd1
+	sha512sums = 9fa342db6530bf1b6c86d6eb5020f86eab08b7c134d649291755d3b8356837509ac9dd8a8c8a26a7c98468045abcb128bdf9cc7c6646ccf06da43909aa7b019b
+	sha512sums = 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875
 
 pkgname = php56
 	pkgdesc = An HTML-embedded scripting language
@@ -71,6 +74,7 @@ pkgname = php56-apache
 	install = php-apache.install
 	depends = php56
 	depends = apache
+	depends = libnsl
 	provides = php-apache=5.6.36
 	backup = etc/httpd/conf/extra/php56_module.conf
 
@@ -85,6 +89,7 @@ pkgname = php56-fpm
 pkgname = php56-embed
 	pkgdesc = Embedded PHP SAPI library
 	depends = php56
+	depends = libnsl
 	provides = php-embed=5.6.36
 
 pkgname = php56-phpdbg
@@ -95,6 +100,7 @@ pkgname = php56-phpdbg
 pkgname = php56-dblib
 	pkgdesc = dblib module for PHP
 	depends = php56
+	depends = freetds
 	provides = php-dblib=5.6.36
 
 pkgname = php56-pear
diff --git a/PKGBUILD b/PKGBUILD
index cfdf9480b9c9..77c713f36e4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,7 +32,7 @@ pkgname=("${pkgbase}"
          "${pkgbase}-tidy"
          "${pkgbase}-xsl")
 pkgver=5.6.36
-pkgrel=1
+pkgrel=2
 pkgdesc="A general-purpose scripting language that is especially suited to web development"
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -40,13 +40,14 @@ url='http://php.net'
 makedepends=('apache' 'c-client' 'postgresql-libs' 'libldap' 'smtp-forwarder'
              'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
              'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'gd' 'icu'
-             'curl' 'libxslt' 'openssl-1.0' 'db' 'gmp' 'systemd')
+             'curl' 'libxslt' 'openssl-1.0' 'db' 'gmp' 'systemd' 'libnsl')
 
 source=("https://secure.php.net/distributions/${_pkgbase}-${pkgver}.tar.xz"
         "https://secure.php.net/distributions/${_pkgbase}-${pkgver}.tar.xz.asc"
         'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles'
-        'use-enchant2.patch')
+        'use-enchant2.patch'
+        'php-freetype-2.9.1.patch')
 sha512sums=('807c68ab85b6685b19707bd18cfd46f3695b2dc67f9f17f85476634e4a80a036cb413ccae05ed5ba529eafe8df57ebf758dd664ed2942ec44f90a6e8b0172e5e'
             'SKIP'
             'e742d6e3e43bce75e11b4646cdbf06c5661c66cc22d5615caff1e293ed35e95973290940c93d6abeec2d43f02761baabf24e6954720d7df8f2bd7de2c3f9ba0d'
@@ -55,7 +56,8 @@ sha512sums=('807c68ab85b6685b19707bd18cfd46f3695b2dc67f9f17f85476634e4a80a036cb4
             'a398e9cde4ba57d243abb5b394152d87bc1fddc2d5fc934569e1f912a5a80eba3ae14720fe99fcda50722bedc5d65abcbde2822f5075091c4a83a2f6bb22c122'
             'c6b74e1b39224e79d33915a0d32fe2d08114d1dcec93035017af783b8b73b6475779e3e649abb35b73ea2fd6553120696c48ebb0894531282fbc9e1b36da9f3b'
             '9cc548c9395f0765e6ebf54604dc8e71da38ffbc10eba50ba9b7e2f91690c53056f62efa2060fc8670de94e0642027c6eaa6c2820ba99e2b489695d1e320fcf3'
-            '5f0dc48f13de7024db1bd6189967b389aa6d8cf9ab9dc1b242b4ea4250df1edd909364efb2d840e38227676fee5dee93bac38056db2a80ad6c7ba0e13f71fcd1')
+            '9fa342db6530bf1b6c86d6eb5020f86eab08b7c134d649291755d3b8356837509ac9dd8a8c8a26a7c98468045abcb128bdf9cc7c6646ccf06da43909aa7b019b'
+            '0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875')
 validpgpkeys=('6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3'
               '0BD78B5F97500D450838F95DFE857D9A90D90EC1')
 
@@ -73,7 +75,12 @@ prepare() {
 
   # thanks to Jörg Schuck for providing this patch
   # https://gist.github.com/jschuck/5d237974e5856a221ccb347c9ccf8711
-  patch -p0 -N -i "${srcdir}/use-enchant2.patch"
+  patch -p0 -N -l -i "${srcdir}/use-enchant2.patch"
+
+  # fix compatibility with freetype >=2.9.1
+  # kudos to Brian Evans <grknight@gentoo.org>
+  # https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-lang/php/files/php-freetype-2.9.1.patch
+  patch -p1 -N -l -i "${srcdir}/php-freetype-2.9.1.patch"
 }
 
 build() {
@@ -308,7 +315,7 @@ package_php56-cgi() {
 
 package_php56-apache() {
   pkgdesc='Apache SAPI for PHP'
-  depends=("${pkgbase}" 'apache')
+  depends=("${pkgbase}" 'apache' 'libnsl')
   provides=("${_pkgbase}-apache=$pkgver")
   backup=("etc/httpd/conf/extra/${pkgbase}_module.conf")
   install='php-apache.install'
@@ -340,7 +347,7 @@ package_php56-fpm() {
 
 package_php56-embed() {
   pkgdesc='Embedded PHP SAPI library'
-  depends=("${pkgbase}")
+  depends=("${pkgbase}" 'libnsl')
   provides=("${_pkgbase}-embed=$pkgver")
 
   install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp56.so
@@ -358,7 +365,7 @@ package_php56-phpdbg() {
 
 package_php56-dblib() {
   pkgdesc='dblib module for PHP'
-  depends=("${pkgbase}")
+  depends=("${pkgbase}" 'freetds')
   provides=("${_pkgbase}-dblib=$pkgver")
 
   install -D -m755 ${srcdir}/build-php/modules/pdo_dblib.so ${pkgdir}/usr/lib/${pkgbase}/modules/pdo_dblib.so
diff --git a/php-freetype-2.9.1.patch b/php-freetype-2.9.1.patch
new file mode 100644
index 000000000000..02dfd9ce3cd4
--- /dev/null
+++ b/php-freetype-2.9.1.patch
@@ -0,0 +1,233 @@
+--- a/ext/gd/config.m4	2018-04-24 11:09:54.000000000 -0400
++++ b/ext/gd/config.m4	2018-05-04 15:18:49.867283889 -0400
+@@ -186,21 +186,36 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+-    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/bin/freetype-config"; then
+-        FREETYPE2_DIR=$i
+-        FREETYPE2_CONFIG="$i/bin/freetype-config"
+-        break
++    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++    AC_MSG_CHECKING(for freetype2)
++
++    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
++
++      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
++      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
++      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
++      FREETYPE2_DIR="found"
++
++      AC_MSG_RESULT(from pkgconfig: version $FREETYPE2_VERSION found)
++    else
++
++      for i in $PHP_FREETYPE_DIR /usr/local /usr; do
++        if test -f "$i/bin/freetype-config"; then
++          FREETYPE2_DIR=$i
++          FREETYPE2_CONFIG="$i/bin/freetype-config"
++          break
++        fi
++      done
++
++      if test -z "$FREETYPE2_DIR"; then
++        AC_MSG_ERROR([freetype-config not found.])
+       fi
+-    done
+ 
+-    if test -z "$FREETYPE2_DIR"; then
+-      AC_MSG_ERROR([freetype-config not found.])
++      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
++      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
++      AC_MSG_RESULT(found via freetype-config)
+     fi
+ 
+-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
+-    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
+-
+     PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
+     PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
+     AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
+--- a/configure	2018-04-24 11:10:05.000000000 -0400
++++ b/configure	2018-05-04 15:18:45.626367913 -0400
+@@ -34348,21 +34348,79 @@
+ 
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+-    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/bin/freetype-config"; then
+-        FREETYPE2_DIR=$i
+-        FREETYPE2_CONFIG="$i/bin/freetype-config"
+-        break
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
++$as_echo_n "checking for freetype2... " >&6; }
++
++
++    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
++
++      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
++      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
++      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
++      FREETYPE2_DIR="found"
++
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgconfig: version $FREETYPE2_VERSION found" >&5
++$as_echo "from pkgconfig: version $FREETYPE2_VERSION found" >&6; }
++    else
++
++      for i in $PHP_FREETYPE_DIR /usr/local /usr; do
++        if test -f "$i/bin/freetype-config"; then
++          FREETYPE2_DIR=$i
++          FREETYPE2_CONFIG="$i/bin/freetype-config"
++          break
++        fi
++      done
++
++      if test -z "$FREETYPE2_DIR"; then
++        as_fn_error $? "freetype-config not found." "$LINENO" 5
+       fi
+-    done
+ 
+-    if test -z "$FREETYPE2_DIR"; then
+-      as_fn_error $? "freetype-config not found." "$LINENO" 5
++      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
++      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found via freetype-config" >&5
++$as_echo "found via freetype-config" >&6; }
+     fi
+ 
+-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
+-    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
+-
+ 
+   for ac_i in $FREETYPE2_CFLAGS; do
+     case $ac_i in
+@@ -36019,21 +36076,78 @@
+ 
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+-    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/bin/freetype-config"; then
+-        FREETYPE2_DIR=$i
+-        FREETYPE2_CONFIG="$i/bin/freetype-config"
+-        break
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
++$as_echo_n "checking for freetype2... " >&6; }
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++
++    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
++
++      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
++      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
++      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
++
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgconfig: version $FREETYPE_VERSON found" >&5
++$as_echo "from pkgconfig: version $FREETYPE_VERSON found" >&6; }
++    else
++
++      for i in $PHP_FREETYPE_DIR /usr/local /usr; do
++        if test -f "$i/bin/freetype-config"; then
++          FREETYPE2_DIR=$i
++          FREETYPE2_CONFIG="$i/bin/freetype-config"
++          break
++        fi
++      done
++
++      if test -z "$FREETYPE2_DIR"; then
++        as_fn_error $? "freetype-config not found." "$LINENO" 5
+       fi
+-    done
+ 
+-    if test -z "$FREETYPE2_DIR"; then
+-      as_fn_error $? "freetype-config not found." "$LINENO" 5
++      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
++      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found via freetype-config" >&5
++$as_echo "found via freetype-config" >&6; }
+     fi
+ 
+-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
+-    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
+-
+ 
+   for ac_i in $FREETYPE2_CFLAGS; do
+     case $ac_i in
diff --git a/use-enchant2.patch b/use-enchant2.patch
index f2c41b42f103..d505a7cc48c8 100644
--- a/use-enchant2.patch
+++ b/use-enchant2.patch
@@ -49,7 +49,7 @@
  
 --- ext/enchant/enchant.c	2018-01-02 22:36:05.000000000 +0000
 +++ ext/enchant/enchant.c	2018-01-21 22:34:50.205791491 +0000
-@@ -741,7 +741,7 @@
+@@ -750,7 +750,7 @@
  			for (i = 0; i < n_sugg; i++) {
  				add_next_index_string(sugg, suggs[i]);
  			}
@@ -58,7 +58,7 @@
  		}
  
  
-@@ -798,7 +798,7 @@
+@@ -807,7 +807,7 @@
  			add_next_index_string(return_value, suggs[i]);
  		}
  
@@ -67,7 +67,7 @@
  	}
  }
  /* }}} */
-@@ -818,7 +818,7 @@
+@@ -827,7 +827,7 @@
  
  	PHP_ENCHANT_GET_DICT;
  
@@ -76,7 +76,7 @@
  }
  /* }}} */
  
-@@ -856,7 +856,7 @@
+@@ -865,7 +865,7 @@
  
  	PHP_ENCHANT_GET_DICT;
author	Thore Bödecker	2018-05-20 11:06:20 +0200
committer	Thore Bödecker	2018-05-20 11:06:20 +0200
commit	2692f480ae7a20fc4b1e6bd1e3d156e414e8ce6c (patch)
tree	c4fa70181d6e1aefd2071b450ed66fba295f5360
parent	54ea0780108f740b001538dde3fdf8513f36e2b9 (diff)
download	aur-2692f480ae7a20fc4b1e6bd1e3d156e414e8ce6c.tar.gz