diff options
Diffstat (limited to 'graphics/php72-gd')
-rw-r--r-- | graphics/php72-gd/Makefile | 13 | ||||
-rw-r--r-- | graphics/php72-gd/files/patch-config.m4 | 28 | ||||
-rw-r--r-- | graphics/php72-gd/files/patch-gd.c | 83 |
3 files changed, 0 insertions, 124 deletions
diff --git a/graphics/php72-gd/Makefile b/graphics/php72-gd/Makefile deleted file mode 100644 index eb7cb936da40..000000000000 --- a/graphics/php72-gd/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php72 - -PKGNAMESUFFIX= -gd - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" - -LIB_DEPENDS+= libgd.so:graphics/gd diff --git a/graphics/php72-gd/files/patch-config.m4 b/graphics/php72-gd/files/patch-config.m4 deleted file mode 100644 index 8cf625ac3dc6..000000000000 --- a/graphics/php72-gd/files/patch-config.m4 +++ /dev/null @@ -1,28 +0,0 @@ ---- config.m4.orig 2018-07-17 05:35:52 UTC -+++ config.m4 -@@ -287,6 +287,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 - -@@ -349,7 +350,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, [], [ -@@ -357,7 +358,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/php72-gd/files/patch-gd.c b/graphics/php72-gd/files/patch-gd.c deleted file mode 100644 index a5f55338cefb..000000000000 --- a/graphics/php72-gd/files/patch-gd.c +++ /dev/null @@ -1,83 +0,0 @@ ---- gd.c.orig 2018-07-17 05:35:52 UTC -+++ gd.c -@@ -53,7 +53,7 @@ - # include <Wingdi.h> - #endif - --#ifdef HAVE_GD_XPM -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - # include <X11/xpm.h> - #endif - -@@ -77,7 +77,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 - -@@ -325,7 +325,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxbm, 0) - 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() -@@ -934,7 +934,7 @@ const zend_function_entry gd_functions[] = { - #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) -@@ -1299,7 +1299,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]; -@@ -1354,7 +1354,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); -@@ -2184,7 +2184,7 @@ PHP_FUNCTION(imagetypes) - ret |= 4; - #endif - ret |= 8; --#if defined(HAVE_GD_XPM) -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - ret |= 16; - #endif - #ifdef HAVE_GD_WEBP -@@ -2443,7 +2443,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_P - 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; -@@ -2525,7 +2525,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) |