git.squeep.com Git - portage-squeep/blob - dev-lang/php/files/php-freetype-2.9.1.patch

   1 --- a/ext/gd/config.m4  2018-04-24 11:09:54.000000000 -0400
   2 +++ b/ext/gd/config.m4  2018-05-04 15:18:49.867283889 -0400
   3 @@ -186,21 +186,36 @@
   4  AC_DEFUN([PHP_GD_FREETYPE2],[
   5    if test "$PHP_FREETYPE_DIR" != "no"; then
   6
   7 -    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
   8 -      if test -f "$i/bin/freetype-config"; then
   9 -        FREETYPE2_DIR=$i
  10 -        FREETYPE2_CONFIG="$i/bin/freetype-config"
  11 -        break
  12 +    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
  13 +    AC_MSG_CHECKING(for freetype2)
  14 +
  15 +    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
  16 +
  17 +      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
  18 +      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
  19 +      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
  20 +      FREETYPE2_DIR="found"
  21 +
  22 +      AC_MSG_RESULT(from pkgconfig: version $FREETYPE2_VERSION found)
  23 +    else
  24 +
  25 +      for i in $PHP_FREETYPE_DIR /usr/local /usr; do
  26 +        if test -f "$i/bin/freetype-config"; then
  27 +          FREETYPE2_DIR=$i
  28 +          FREETYPE2_CONFIG="$i/bin/freetype-config"
  29 +          break
  30 +        fi
  31 +      done
  32 +
  33 +      if test -z "$FREETYPE2_DIR"; then
  34 +        AC_MSG_ERROR([freetype-config not found.])
  35        fi
  36 -    done
  37
  38 -    if test -z "$FREETYPE2_DIR"; then
  39 -      AC_MSG_ERROR([freetype-config not found.])
  40 +      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
  41 +      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
  42 +      AC_MSG_RESULT(found via freetype-config)
  43      fi
  44
  45 -    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
  46 -    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
  47 -
  48      PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
  49      PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
  50      AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
  51 --- a/configure 2018-04-24 11:10:05.000000000 -0400
  52 +++ b/configure 2018-05-04 15:18:45.626367913 -0400
  53 @@ -34348,21 +34348,79 @@
  54
  55    if test "$PHP_FREETYPE_DIR" != "no"; then
  56
  57 -    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
  58 -      if test -f "$i/bin/freetype-config"; then
  59 -        FREETYPE2_DIR=$i
  60 -        FREETYPE2_CONFIG="$i/bin/freetype-config"
  61 -        break
  62 +    # Extract the first word of "pkg-config", so it can be a program name with args.
  63 +set dummy pkg-config; ac_word=$2
  64 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  65 +$as_echo_n "checking for $ac_word... " >&6; }
  66 +if ${ac_cv_path_PKG_CONFIG+:} false; then :
  67 +  $as_echo_n "(cached) " >&6
  68 +else
  69 +  case $PKG_CONFIG in
  70 +  [\\/]* | ?:[\\/]*)
  71 +  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
  72 +  ;;
  73 +  *)
  74 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  75 +for as_dir in $PATH
  76 +do
  77 +  IFS=$as_save_IFS
  78 +  test -z "$as_dir" && as_dir=.
  79 +    for ac_exec_ext in '' $ac_executable_extensions; do
  80 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  81 +    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
  82 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  83 +    break 2
  84 +  fi
  85 +done
  86 +  done
  87 +IFS=$as_save_IFS
  88 +
  89 +  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
  90 +  ;;
  91 +esac
  92 +fi
  93 +PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  94 +if test -n "$PKG_CONFIG"; then
  95 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
  96 +$as_echo "$PKG_CONFIG" >&6; }
  97 +else
  98 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  99 +$as_echo "no" >&6; }
 100 +fi
 101 +
 102 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
 103 +$as_echo_n "checking for freetype2... " >&6; }
 104 +
 105 +
 106 +    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
 107 +
 108 +      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
 109 +      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
 110 +      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
 111 +      FREETYPE2_DIR="found"
 112 +
 113 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgconfig: version $FREETYPE2_VERSION found" >&5
 114 +$as_echo "from pkgconfig: version $FREETYPE2_VERSION found" >&6; }
 115 +    else
 116 +
 117 +      for i in $PHP_FREETYPE_DIR /usr/local /usr; do
 118 +        if test -f "$i/bin/freetype-config"; then
 119 +          FREETYPE2_DIR=$i
 120 +          FREETYPE2_CONFIG="$i/bin/freetype-config"
 121 +          break
 122 +        fi
 123 +      done
 124 +
 125 +      if test -z "$FREETYPE2_DIR"; then
 126 +        as_fn_error $? "freetype-config not found." "$LINENO" 5
 127        fi
 128 -    done
 129
 130 -    if test -z "$FREETYPE2_DIR"; then
 131 -      as_fn_error $? "freetype-config not found." "$LINENO" 5
 132 +      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
 133 +      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
 134 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found via freetype-config" >&5
 135 +$as_echo "found via freetype-config" >&6; }
 136      fi
 137
 138 -    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
 139 -    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
 140 -
 141
 142    for ac_i in $FREETYPE2_CFLAGS; do
 143      case $ac_i in
 144 @@ -36019,21 +36076,78 @@
 145
 146    if test "$PHP_FREETYPE_DIR" != "no"; then
 147
 148 -    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
 149 -      if test -f "$i/bin/freetype-config"; then
 150 -        FREETYPE2_DIR=$i
 151 -        FREETYPE2_CONFIG="$i/bin/freetype-config"
 152 -        break
 153 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
 154 +$as_echo_n "checking for freetype2... " >&6; }
 155 +    # Extract the first word of "pkg-config", so it can be a program name with args.
 156 +set dummy pkg-config; ac_word=$2
 157 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 158 +$as_echo_n "checking for $ac_word... " >&6; }
 159 +if ${ac_cv_path_PKG_CONFIG+:} false; then :
 160 +  $as_echo_n "(cached) " >&6
 161 +else
 162 +  case $PKG_CONFIG in
 163 +  [\\/]* | ?:[\\/]*)
 164 +  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
 165 +  ;;
 166 +  *)
 167 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 168 +for as_dir in $PATH
 169 +do
 170 +  IFS=$as_save_IFS
 171 +  test -z "$as_dir" && as_dir=.
 172 +    for ac_exec_ext in '' $ac_executable_extensions; do
 173 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 174 +    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 175 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 176 +    break 2
 177 +  fi
 178 +done
 179 +  done
 180 +IFS=$as_save_IFS
 181 +
 182 +  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
 183 +  ;;
 184 +esac
 185 +fi
 186 +PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 187 +if test -n "$PKG_CONFIG"; then
 188 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
 189 +$as_echo "$PKG_CONFIG" >&6; }
 190 +else
 191 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 192 +$as_echo "no" >&6; }
 193 +fi
 194 +
 195 +
 196 +
 197 +    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
 198 +
 199 +      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
 200 +      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
 201 +      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
 202 +
 203 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgconfig: version $FREETYPE_VERSON found" >&5
 204 +$as_echo "from pkgconfig: version $FREETYPE_VERSON found" >&6; }
 205 +    else
 206 +
 207 +      for i in $PHP_FREETYPE_DIR /usr/local /usr; do
 208 +        if test -f "$i/bin/freetype-config"; then
 209 +          FREETYPE2_DIR=$i
 210 +          FREETYPE2_CONFIG="$i/bin/freetype-config"
 211 +          break
 212 +        fi
 213 +      done
 214 +
 215 +      if test -z "$FREETYPE2_DIR"; then
 216 +        as_fn_error $? "freetype-config not found." "$LINENO" 5
 217        fi
 218 -    done
 219
 220 -    if test -z "$FREETYPE2_DIR"; then
 221 -      as_fn_error $? "freetype-config not found." "$LINENO" 5
 222 +      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
 223 +      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
 224 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found via freetype-config" >&5
 225 +$as_echo "found via freetype-config" >&6; }
 226      fi
 227
 228 -    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
 229 -    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
 230 -
 231
 232    for ac_i in $FREETYPE2_CFLAGS; do
 233      case $ac_i in