| 1 |
commit: 400a7eb881369ddda92d5d16b9a31179d44a6bfa |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 8 17:56:32 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 8 17:56:32 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400a7eb8 |
| 7 |
|
| 8 |
dev-lang/php: Fix freetype patch to make sure functions are available |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/654794 |
| 11 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
| 12 |
|
| 13 |
dev-lang/php/files/php-freetype-2.9.1.patch | 6 ++++-- |
| 14 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-lang/php/files/php-freetype-2.9.1.patch b/dev-lang/php/files/php-freetype-2.9.1.patch |
| 17 |
index 3ddf8d1154d..02dfd9ce3cd 100644 |
| 18 |
--- a/dev-lang/php/files/php-freetype-2.9.1.patch |
| 19 |
+++ b/dev-lang/php/files/php-freetype-2.9.1.patch |
| 20 |
@@ -1,6 +1,6 @@ |
| 21 |
--- a/ext/gd/config.m4 2018-04-24 11:09:54.000000000 -0400 |
| 22 |
+++ b/ext/gd/config.m4 2018-05-04 15:18:49.867283889 -0400 |
| 23 |
-@@ -186,21 +186,35 @@ |
| 24 |
+@@ -186,21 +186,36 @@ |
| 25 |
AC_DEFUN([PHP_GD_FREETYPE2],[ |
| 26 |
if test "$PHP_FREETYPE_DIR" != "no"; then |
| 27 |
|
| 28 |
@@ -17,6 +17,7 @@ |
| 29 |
+ FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2` |
| 30 |
+ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` |
| 31 |
+ FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2` |
| 32 |
++ FREETYPE2_DIR="found" |
| 33 |
+ |
| 34 |
+ AC_MSG_RESULT(from pkgconfig: version $FREETYPE2_VERSION found) |
| 35 |
+ else |
| 36 |
@@ -49,7 +50,7 @@ |
| 37 |
AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) |
| 38 |
--- a/configure 2018-04-24 11:10:05.000000000 -0400 |
| 39 |
+++ b/configure 2018-05-04 15:18:45.626367913 -0400 |
| 40 |
-@@ -34348,21 +34348,78 @@ |
| 41 |
+@@ -34348,21 +34348,79 @@ |
| 42 |
|
| 43 |
if test "$PHP_FREETYPE_DIR" != "no"; then |
| 44 |
|
| 45 |
@@ -107,6 +108,7 @@ |
| 46 |
+ FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2` |
| 47 |
+ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` |
| 48 |
+ FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2` |
| 49 |
++ FREETYPE2_DIR="found" |
| 50 |
+ |
| 51 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgconfig: version $FREETYPE2_VERSION found" >&5 |
| 52 |
+$as_echo "from pkgconfig: version $FREETYPE2_VERSION found" >&6; } |
Archives