[packages/php/PHP_5_5] - dropped, no longer needed
arekm
arekm at pld-linux.org
Thu Feb 13 12:35:21 CET 2014
commit 2f62be34f9e86d38ddc02677c3c0b2bad4defa6e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Feb 13 12:35:13 2014 +0100
- dropped, no longer needed
php-freetype.patch | 11 -----------
php.spec | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/php.spec b/php.spec
index f2ccb57..c669ddd 100644
--- 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
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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/2f62be34f9e86d38ddc02677c3c0b2bad4defa6e
More information about the pld-cvs-commit
mailing list