- dropped, no longer needed

diff --git a/php-freetype.patch b/php-freetype.patch
deleted file mode 100644 (file)
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 f2ccb57b4520174a1bc35817d96127da49a2f245..c669ddd4e7c0ef8964d749a046b3d48ccba4b0b5 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -218,7 +218,7 @@ Patch63:    %{orgname}-mysql-nowarning.patch
 Patch65:       system-libzip.patch
 Patch66:       php-db.patch
 Patch67:       mysql-lib-ver-mismatch.patch
-Patch68:       php-freetype.patch
+
 Patch69:       fpm-conf-split.patch
 URL:           http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel >= 1.0.2.908-2}}
@@ -1956,7 +1956,7 @@ cp -p php.ini-production php.ini
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p1
 %patch67 -p1
-#%patch68 -p1
+
 %patch69 -p1
 
 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4