diff options
author | Eugene Lamskoy | 2022-01-21 14:06:58 +0200 |
---|---|---|
committer | Eugene Lamskoy | 2022-01-25 11:20:38 +0200 |
commit | a95a89d23bfc9f95ebf2e5f57353a3c782181ce7 (patch) | |
tree | 39912f758f6e03bc5cc7637f13505920ff2da063 /freetype.patch | |
parent | 4389339e89f4a2f04ae272e2f578b6e5e551274d (diff) | |
download | aur-a95a89d23bfc9f95ebf2e5f57353a3c782181ce7.tar.gz |
PHP 7.3.33 pkgrel=6. Completely new features. More modularization. Patches from debian. Etc
Diffstat (limited to 'freetype.patch')
-rw-r--r-- | freetype.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/freetype.patch b/freetype.patch deleted file mode 100644 index f88695d65e2f..000000000000 --- a/freetype.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -u -r php-7.2.5/ext/gd/config.m4 php-7.2.5-freetype/ext/gd/config.m4 ---- php-7.2.5/ext/gd/config.m4 2018-04-24 17:09:54.000000000 +0200 -+++ php-7.2.5-freetype/ext/gd/config.m4 2018-05-09 14:49:03.647108948 +0200 -@@ -186,6 +186,9 @@ - AC_DEFUN([PHP_GD_FREETYPE2],[ - if test "$PHP_FREETYPE_DIR" != "no"; then - -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ -+ AC_MSG_CHECKING([for freetype]) - for i in $PHP_FREETYPE_DIR /usr/local /usr; do - if test -f "$i/bin/freetype-config"; then - FREETYPE2_DIR=$i -@@ -194,13 +197,20 @@ - fi - done - -- if test -z "$FREETYPE2_DIR"; then -+ if test -n "$FREETYPE2_CONFIG"; then -+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` -+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` -+ AC_MSG_RESULT([found in $FREETYPE2_DIR]) -+ elif test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists freetype2; then -+ FREETYPE2_DIR=pkg-config -+ FREETYPE2_CFLAGS=`$PKG_CONFIG freetype2 --cflags` -+ FREETYPE2_LIBS=`$PKG_CONFIG freetype2 --libs` -+ AC_MSG_RESULT([found by pkg-config]) -+ else -+ AC_MSG_RESULT([not found]) - AC_MSG_ERROR([freetype-config not found.]) - 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,[ ]) |