diff options
Diffstat (limited to 'graphics/php73-gd/files')
| -rw-r--r-- | graphics/php73-gd/files/patch-config.m4 | 63 | ||||
| -rw-r--r-- | graphics/php73-gd/files/patch-gd.c | 83 |
2 files changed, 0 insertions, 146 deletions
diff --git a/graphics/php73-gd/files/patch-config.m4 b/graphics/php73-gd/files/patch-config.m4 deleted file mode 100644 index 993898bcc5f9..000000000000 --- a/graphics/php73-gd/files/patch-config.m4 +++ /dev/null @@ -1,63 +0,0 @@ ---- config.m4.orig 2020-11-24 11:10:57 UTC -+++ config.m4 -@@ -184,6 +184,9 @@ AC_DEFUN([PHP_GD_XPM],[ - 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 -@@ -192,13 +195,20 @@ AC_DEFUN([PHP_GD_FREETYPE2],[ - 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,[ ]) -@@ -285,6 +295,7 @@ dnl enable the support in bundled GD library - - if test -n "$GD_XPM_DIR"; then - AC_DEFINE(HAVE_GD_XPM, 1, [ ]) -+ AC_DEFINE(HAVE_XPM, 1, [ ]) - GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM" - fi - -@@ -347,7 +358,7 @@ if test "$PHP_GD" != "no"; then - - if test "$GD_MODULE_TYPE" = "builtin"; then - PHP_ADD_BUILD_DIR($ext_builddir/libgd) -- GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" -+ GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS" - GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" - - PHP_TEST_BUILD(foobar, [], [ -@@ -355,7 +366,7 @@ if test "$PHP_GD" != "no"; then - ], [ $GD_SHARED_LIBADD ], [char foobar () {}]) - else - GD_HEADER_DIRS="ext/gd/" -- GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS" -+ GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS" - PHP_ADD_INCLUDE($GD_INCLUDE) - PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [ - AC_MSG_ERROR([GD build test failed. Please check the config.log for details.]) diff --git a/graphics/php73-gd/files/patch-gd.c b/graphics/php73-gd/files/patch-gd.c deleted file mode 100644 index 0c9302041d2a..000000000000 --- a/graphics/php73-gd/files/patch-gd.c +++ /dev/null @@ -1,83 +0,0 @@ ---- gd.c.orig 2018-09-25 09:07:58 UTC -+++ gd.c -@@ -51,7 +51,7 @@ - # include <Wingdi.h> - #endif - --#ifdef HAVE_GD_XPM -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - # include <X11/xpm.h> - #endif - -@@ -75,7 +75,7 @@ static int le_gd, le_gd_font; - # endif - #endif - --#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) - # include "X11/xpm.h" - #endif - -@@ -322,7 +322,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatef - ZEND_ARG_INFO(0, filename) - ZEND_END_ARG_INFO() - --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0) - ZEND_ARG_INFO(0, filename) - ZEND_END_ARG_INFO() -@@ -931,7 +931,7 @@ static const zend_function_entry gd_func - #endif - PHP_FE(imagecreatefromwbmp, arginfo_imagecreatefromwbmp) - PHP_FE(imagecreatefromxbm, arginfo_imagecreatefromxbm) --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - PHP_FE(imagecreatefromxpm, arginfo_imagecreatefromxpm) - #endif - PHP_FE(imagecreatefromgd, arginfo_imagecreatefromgd) -@@ -1296,7 +1296,7 @@ PHP_MINFO_FUNCTION(gd) - php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString()); - #endif - php_info_print_table_row(2, "WBMP Support", "enabled"); --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - php_info_print_table_row(2, "XPM Support", "enabled"); - { - char tmp[12]; -@@ -1351,7 +1351,7 @@ PHP_FUNCTION(gd_info) - add_assoc_bool(return_value, "PNG Support", 0); - #endif - add_assoc_bool(return_value, "WBMP Support", 1); --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - add_assoc_bool(return_value, "XPM Support", 1); - #else - add_assoc_bool(return_value, "XPM Support", 0); -@@ -2178,7 +2178,7 @@ PHP_FUNCTION(imagetypes) - ret |= PHP_IMG_PNG; - #endif - ret |= PHP_IMG_WBMP; --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - ret |= PHP_IMG_XPM; - #endif - #ifdef HAVE_GD_WEBP -@@ -2446,7 +2446,7 @@ static void _php_image_create_from(INTER - case PHP_GDIMG_TYPE_GD2PART: - im = (*func_p)(fp, srcx, srcy, width, height); - break; --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - case PHP_GDIMG_TYPE_XPM: - im = gdImageCreateFromXpm(file); - break; -@@ -2528,7 +2528,7 @@ PHP_FUNCTION(imagecreatefromxbm) - } - /* }}} */ - --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - /* {{{ proto resource imagecreatefromxpm(string filename) - Create a new image from XPM file or URL */ - PHP_FUNCTION(imagecreatefromxpm) |