Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2013-12-24 20:01:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2013-12-19 12:51:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2013-12-24 20:01:25.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 20 12:03:41 UTC 2013 - [email protected] + +- Added php5-freetype2_include_dir.patch: Fixes check of freetype2 + headers, as freetype2 2.5.1 changed the header location + +------------------------------------------------------------------- New: ---- php5-freetype2_include_dir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.V04bEu/_old 2013-12-24 20:01:27.000000000 +0100 +++ /var/tmp/diff_new_pack.V04bEu/_new 2013-12-24 20:01:27.000000000 +0100 @@ -177,6 +177,8 @@ Patch20: php5-per-mod-log.patch Patch21: php5-apache24-updates.patch Patch22: php-5.5.6-CVE-2013-6712.patch +# PATCH-FIX-UPSTREAM php5-freetype2_include_dir.patch -- fix freetype2 include check +Patch23: php5-freetype2_include_dir.patch Url: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: PHP5 Core Files @@ -1326,6 +1328,7 @@ %patch20 -p1 %patch21 -p1 %patch22 +%patch23 -p1 # Safety check for API version change. vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h` if test "x${vapi}" != "x%{apiver}"; then ++++++ php5-freetype2_include_dir.patch ++++++ --- php-5.5.7.orig/ext/gd/config.m4 +++ php-5.5.7/ext/gd/config.m4 @@ -185,7 +185,7 @@ AC_DEFUN([PHP_GD_FREETYPE2],[ 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/freetype.h" || test -f "$i/include/freetype2/freetype.h"; then FREETYPE2_DIR=$i FREETYPE2_INC_DIR=$i/include/freetype2 break -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
