From: Elan Ruusamäe <glen@delfi.ee>
Date: Tue, 17 Dec 2013 19:48:54 +0000 (+0200)
Subject: Revert "- fix building with freetype 2.5.1"
X-Git-Tag: auto/th/php-5.3.28-2~2
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=76431d9d9695e8fb0463225d852f3e4b1fd620a5;p=packages%2Fphp.git

Revert "- fix building with freetype 2.5.1"

This reverts commit 732e12c7b58c8fc55b23df3e47081601f13d795e.
---

diff --git a/php-freetype.patch b/php-freetype.patch
deleted file mode 100644
index 8253d62..0000000
--- a/php-freetype.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
diff --git a/php.spec b/php.spec
index 7acb9eb..faddb4b 100644
--- a/php.spec
+++ b/php.spec
@@ -210,7 +210,6 @@ 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}
@@ -1974,7 +1973,6 @@ 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