[packages/php] - fix building with freetype 2.5.1

baggins baggins at pld-linux.org
Thu Dec 12 14:43:57 CET 2013


commit 732e12c7b58c8fc55b23df3e47081601f13d795e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Dec 12 14:43:44 2013 +0100

    - fix building with freetype 2.5.1

 php-freetype.patch | 11 +++++++++++
 php.spec           |  2 ++
 2 files changed, 13 insertions(+)
---
diff --git a/php.spec b/php.spec
index ed41829..0e34bb7 100644
--- a/php.spec
+++ b/php.spec
@@ -210,6 +210,7 @@ Patch66:	%{orgname}-db.patch
 Patch67:	php-litespeed.patch
 Patch68:	mysql-lib-ver-mismatch.patch
 Patch69:	fpm-conf-split.patch
+Patch70:	%{orgname}-freetype.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -1973,6 +1974,7 @@ gzip -dc %{SOURCE15} | tar xf - -C sapi/
 %patch67 -p1
 %patch68 -p1
 %patch69 -p1
+%patch70 -p1
 
 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
 
diff --git a/php-freetype.patch b/php-freetype.patch
new file mode 100644
index 0000000..8253d62
--- /dev/null
+++ b/php-freetype.patch
@@ -0,0 +1,11 @@
+--- php-5.3.27/ext/gd/config.m4~	2013-07-10 19:43:08.000000000 +0200
++++ php-5.3.27/ext/gd/config.m4	2013-12-12 14:38:29.753000608 +0100
+@@ -162,7 +162,7 @@
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/include/freetype2/freetype/freetype.h"; then
++      if test -f "$i/include/freetype2/freetype.h"; then
+         FREETYPE2_DIR=$i
+         FREETYPE2_INC_DIR=$i/include/freetype2
+         break
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/732e12c7b58c8fc55b23df3e47081601f13d795e



More information about the pld-cvs-commit mailing list