Control: tag -1 patch pending Julien Cristau <jcris...@debian.org> (2013-12-08): > Source: php5 > Version: 5.5.6+dfsg-1 > Severity: serious > Justification: fails to build from source (but built successfully in the past) > > freetype headers moved around in 2.5.1, making php5 FTBFS: > > configure: error: freetype.h not found.
The attached patch fixes this; NMU uploaded to DELAYED/2 to help with the ICU transition (#729531). I can reschedule it if you maintainers are OK with it. Mraw, KiBi.
diff -Nru php5-5.5.6+dfsg/debian/changelog php5-5.5.6+dfsg/debian/changelog --- php5-5.5.6+dfsg/debian/changelog 2013-11-21 10:00:10.000000000 +0100 +++ php5-5.5.6+dfsg/debian/changelog 2013-12-12 00:46:08.000000000 +0100 @@ -1,3 +1,13 @@ +php5 (5.5.6+dfsg-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Compensate for freetype's headers location change in 2.5.1-1 (from + /usr/include/freetype2/freetype to /usr/include/freetype2), with + patch: compensate-for-freetype-headers-location-change + (Closes: #731698) + + -- Cyril Brulebois <k...@debian.org> Thu, 12 Dec 2013 00:19:21 +0100 + php5 (5.5.6+dfsg-1) unstable; urgency=low [ Lior Kaplan ] diff -Nru php5-5.5.6+dfsg/debian/patches/compensate-for-freetype-headers-location-change php5-5.5.6+dfsg/debian/patches/compensate-for-freetype-headers-location-change --- php5-5.5.6+dfsg/debian/patches/compensate-for-freetype-headers-location-change 1970-01-01 01:00:00.000000000 +0100 +++ php5-5.5.6+dfsg/debian/patches/compensate-for-freetype-headers-location-change 2013-12-12 00:46:08.000000000 +0100 @@ -0,0 +1,19 @@ +Description: Compensate for freetype's headers location change in 2.5.1-1 + Until 2.4.9-1.1, headers were under /usr/include/freetype2/freetype + After 2.5.1-1, they're found under /usr/include/freetype2 instead. +Author: Cyril Brulebois <k...@debian.org> + +--- +Bug-Debian: http://bugs.debian.org/731698 + +--- a/ext/gd/config.m4 ++++ b/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.h"; then + FREETYPE2_DIR=$i + FREETYPE2_INC_DIR=$i/include/freetype2 + break diff -Nru php5-5.5.6+dfsg/debian/patches/series php5-5.5.6+dfsg/debian/patches/series --- php5-5.5.6+dfsg/debian/patches/series 2013-11-21 10:00:10.000000000 +0100 +++ php5-5.5.6+dfsg/debian/patches/series 2013-12-12 00:46:08.000000000 +0100 @@ -35,3 +35,4 @@ php-5.4.0-dlopen.patch php-fpm-m68k.patch expose_all_built_and_installed_apis.patch +compensate-for-freetype-headers-location-change
signature.asc
Description: Digital signature
