Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2018-05-13 15:55:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7" Sun May 13 15:55:19 2018 rev:40 rq:606080 version:7.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/php7/php7.changes 2018-05-07 14:50:25.092144209 +0200 +++ /work/SRC/openSUSE:Factory/.php7.new/php7.changes 2018-05-13 15:55:24.671466186 +0200 @@ -1,0 +2,18 @@ +Thu May 10 06:12:13 UTC 2018 - [email protected] + +- better workaround for [bsc#1089487]: build mod_phpN.so + instead of libphpN.so + +------------------------------------------------------------------- +Wed May 9 10:42:18 UTC 2018 - [email protected] + +- rename freetype-pkgconfig.patch to php7-freetype-pkgconfig.patch + to align with the rest of patch names + +------------------------------------------------------------------- +Mon May 7 10:25:58 UTC 2018 - [email protected] + +- Add freetype-pkgconfig.patch to fix build with new Freetype: + use pkg-config to find Freetype libraries + +------------------------------------------------------------------- New: ---- php7-freetype-pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ --- /var/tmp/diff_new_pack.80gEmO/_old 2018-05-13 15:55:26.395403277 +0200 +++ /var/tmp/diff_new_pack.80gEmO/_new 2018-05-13 15:55:26.399403131 +0200 @@ -38,8 +38,6 @@ %define build_argon2 1 %endif %bcond_with make_test -# bsc#1089487 -%define __provides_exclude_from ^/usr/lib64/apache2/.*.so$ Name: php7 Version: 7.2.5 Release: 0 @@ -70,6 +68,8 @@ Patch8: php7-systemd-unit.patch Patch9: php7-depdb-path.patch Patch10: php7-embed.patch +# https://build.opensuse.org/request/show/605072 +Patch11: php7-freetype-pkgconfig.patch ## Bugfix patches # following patch is to fix configure tests for crypt; the aim is to have php # built against glibc's crypt; problem is, that our glibc doesn't support extended @@ -1002,6 +1002,7 @@ %patch7 -p1 %patch8 -p1 %patch10 -p1 +%patch11 -p1 %patch12 -p1 %patch14 %patch15 @@ -1026,20 +1027,18 @@ # aclocal workaround - to be improved cat `aclocal --print-ac-dir`/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >>aclocal.m4 -# Force use of system libtool: +# force use of system libtool: libtoolize --force --copy cat `aclocal --print-ac-dir`/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >build/libtool.m4 -# Regenerate configure scripts (patches change config.m4's) -touch configure.in -# we build three SAPI +# build directories for individual SAPIs mkdir -p build-apache2 mkdir -p build-fpm mkdir -p build-embed mkdir -p build-fastcgi mkdir -p build-cli -#get parsers regenerated +# get parsers regenerated for parser in `find -type f -name "*.re"`;do rm -v ${parser%.*}.c done @@ -1123,6 +1122,11 @@ # We have still have harcoded RPATH in some modules sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=LIBTOOL_IS_BROKED|g' libtool + # build mod_phpN.so instead of libphpN.so + # rename does not suffice, see bsc#1089487 + if [ $sapi == apache2 ]; then + sed -i 's/libphp/mod_php/' Makefile + fi make %{?_smp_mflags} PHP_PEAR_PHP_BIN=%{_bindir}/php} popd } @@ -1295,7 +1299,6 @@ # do the actual installation Install apache2 -mv %{buildroot}%{apache_libexecdir}/libphp7.so %{buildroot}%{apache_libexecdir}/mod_php7.so Install fastcgi Install cli Install fpm ++++++ php7-freetype-pkgconfig.patch ++++++ Index: php-7.2.5/ext/gd/config.m4 =================================================================== --- php-7.2.5.orig/ext/gd/config.m4 +++ php-7.2.5/ext/gd/config.m4 @@ -184,30 +184,17 @@ AC_DEFUN([PHP_GD_XPM],[ ]) AC_DEFUN([PHP_GD_FREETYPE2],[ - if test "$PHP_FREETYPE_DIR" != "no"; then + FREETYPE2_CFLAGS=`pkg-config --cflags freetype2` + FREETYPE2_LIBS=`pkg-config --libs freetype2` - for i in $PHP_FREETYPE_DIR /usr/local /usr; do - if test -f "$i/bin/freetype-config"; then - FREETYPE2_DIR=$i - FREETYPE2_CONFIG="$i/bin/freetype-config" - break - fi - done - - if test -z "$FREETYPE2_DIR"; then - AC_MSG_ERROR([freetype-config not found.]) + if test -z "$FREETYPE2_LIBS"; then + AC_MSG_ERROR([freetype2 is not available.]) fi - FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` - FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` - PHP_EVAL_INCLINE($FREETYPE2_CFLAGS) PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD) AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) AC_DEFINE(ENABLE_GD_TTF,1,[ ]) - else - AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>]) - fi ]) AC_DEFUN([PHP_GD_JISX0208],[
