diff options
| author | Iliya Ivanov | 2018-11-26 10:52:32 +0200 |
|---|---|---|
| committer | Iliya Ivanov | 2018-11-26 10:52:32 +0200 |
| commit | 9ea8905cc0e55c6cdef757b9a561460d5759d109 (patch) | |
| tree | e965003b78e0d0edc56452c45200ccaee32443e5 /apache.patch | |
| parent | 86cfc644f509ce9c2f7944c625bb0172c4443506 (diff) | |
| download | aur-9ea8905cc0e55c6cdef757b9a561460d5759d109.tar.gz | |
Update to php 7.2.12 + fix enchant and freetype-config deps
Diffstat (limited to 'apache.patch')
| -rw-r--r-- | apache.patch | 54 |
1 files changed, 53 insertions, 1 deletions
diff --git a/apache.patch b/apache.patch index 81b2cd8f7538..9c4584983133 100644 --- a/apache.patch +++ b/apache.patch @@ -10,7 +10,7 @@ fi --- configure.orig +++ configure -@@ -7018,7 +7018,6 @@ +@@ -7019,7 +7019,6 @@ fi else @@ -18,3 +18,55 @@ if test -n "$APACHE_THREADED_MPM"; then enable_maintainer_zts=yes +@@ -30232,6 +30231,9 @@ + if test -f $i/include/enchant/enchant.h; then + ENCHANT_DIR=$i + ENCHANT_INCDIR=$i/include/enchant ++ elif test -f $i/include/enchant-2/enchant.h; then ++ ENCHANT_DIR=$i ++ ENCHANT_INCDIR=$i/include/enchant-2 + elif test -f $i/include/enchant.h; then + ENCHANT_DIR=$i + ENCHANT_INCDIR=$i/include +@@ -34362,15 +34364,16 @@ + if test "$PHP_FREETYPE_DIR" != "no"; then + + 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" ++ ++ if test -d "$i/include/freetype2"; then ++ FREETYPE2_DIR=$i/include/freetype2 ++ FREETYPE2_CONFIG="pkg-config freetype2" + break + fi + done + + if test -z "$FREETYPE2_DIR"; then +- as_fn_error $? "freetype-config not found." "$LINENO" 5 ++ as_fn_error $? "freetype2 not found." "$LINENO" 5 + fi + + FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` +@@ -36033,15 +36036,16 @@ + if test "$PHP_FREETYPE_DIR" != "no"; then + + 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" ++ ++ if test -d "$i/include/freetype2"; then ++ FREETYPE2_DIR=$i/include/freetype2 ++ FREETYPE2_CONFIG="pkg-config freetype2" + break + fi + done + + if test -z "$FREETYPE2_DIR"; then +- as_fn_error $? "freetype-config not found." "$LINENO" 5 ++ as_fn_error $? "freetype2 not found." "$LINENO" 5 + fi + + FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` |