summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2018-05-08 13:56:32 -0400
committerBrian Evans <grknight@gentoo.org>2018-05-08 13:56:32 -0400
commit400a7eb881369ddda92d5d16b9a31179d44a6bfa (patch)
tree76756ff46b9610d9e4185c125d437ff996cb78d0 /dev-lang
parentsys-fs/lvm2-2.02.17{1,2,3}: Fix static build (diff)
downloadgentoo-400a7eb881369ddda92d5d16b9a31179d44a6bfa.tar.gz
gentoo-400a7eb881369ddda92d5d16b9a31179d44a6bfa.tar.bz2
gentoo-400a7eb881369ddda92d5d16b9a31179d44a6bfa.zip
dev-lang/php: Fix freetype patch to make sure functions are available
Bug: https://bugs.gentoo.org/654794 Package-Manager: Portage-2.3.36, Repoman-2.3.9
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/php/files/php-freetype-2.9.1.patch6
1 files changed, 4 insertions, 2 deletions
diff --git a/dev-lang/php/files/php-freetype-2.9.1.patch b/dev-lang/php/files/php-freetype-2.9.1.patch
index 3ddf8d1154d..02dfd9ce3cd 100644
--- a/dev-lang/php/files/php-freetype-2.9.1.patch
+++ b/dev-lang/php/files/php-freetype-2.9.1.patch
@@ -1,6 +1,6 @@
--- 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,35 @@
+@@ -186,21 +186,36 @@
AC_DEFUN([PHP_GD_FREETYPE2],[
if test "$PHP_FREETYPE_DIR" != "no"; then
@@ -17,6 +17,7 @@
+ 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
@@ -49,7 +50,7 @@
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,78 @@
+@@ -34348,21 +34348,79 @@
if test "$PHP_FREETYPE_DIR" != "no"; then
@@ -107,6 +108,7 @@
+ 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; }