Index: head/graphics/pecl-imagick/Makefile =================================================================== --- head/graphics/pecl-imagick/Makefile (revision 553244) +++ head/graphics/pecl-imagick/Makefile (revision 553245) @@ -1,24 +1,25 @@ # Created by: Andrey Slusar # $FreeBSD$ PORTNAME= imagick PORTVERSION= 3.4.4 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= mm@FreeBSD.org COMMENT?= PHP wrapper to the ImageMagick/GraphicsMagick library version 6 LICENSE= PHP301 USES= php:pecl pkgconfig localbase CONFLICTS_INSTALL?= ${PKGNAMEPREFIX}${PORTNAME}-im7-[0-9]* OPTIONS_DEFINE= X11 X11_LIB_DEPENDS?= libMagickWand-6.so:graphics/ImageMagick6 X11_LIB_DEPENDS_OFF?= libMagickWand-6.so:graphics/ImageMagick6-nox11 CONFIGURE_ARGS= --with-imagick=${LOCALBASE} .include Index: head/graphics/pecl-imagick/files/patch-imagick__class.c =================================================================== --- head/graphics/pecl-imagick/files/patch-imagick__class.c (nonexistent) +++ head/graphics/pecl-imagick/files/patch-imagick__class.c (revision 553245) @@ -0,0 +1,12 @@ +--- imagick_class.c.orig 2020-10-25 08:02:54 UTC ++++ imagick_class.c +@@ -12006,7 +12006,9 @@ PHP_METHOD(imagick, setprogressmonitor) + + callback = (php_imagick_callback *) emalloc(sizeof(php_imagick_callback)); + ++#if PHP_VERSION_ID < 80000 + TSRMLS_SET_CTX(callback->thread_ctx); ++#endif + //We can't free the previous callback as we can't guarantee that + //ImageMagick won't use it at some point. There is no 'unbind' function + //for previously set 'MagickSetImageProgressMonitor' Property changes on: head/graphics/pecl-imagick/files/patch-imagick__class.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/pecl-imagick/files/patch-imagick__helpers.c =================================================================== --- head/graphics/pecl-imagick/files/patch-imagick__helpers.c (nonexistent) +++ head/graphics/pecl-imagick/files/patch-imagick__helpers.c (revision 553245) @@ -0,0 +1,12 @@ +--- imagick_helpers.c.orig 2020-10-25 08:02:44 UTC ++++ imagick_helpers.c +@@ -113,7 +113,9 @@ MagickBooleanType php_imagick_progress_monitor_callabl + #endif + fci.param_count = 2; + fci.params = zargs; ++#if PHP_VERSION_ID < 80000 + fci.no_separation = 0; ++#endif + #if PHP_VERSION_ID < 70100 + fci.symbol_table = NULL; + #endif Property changes on: head/graphics/pecl-imagick/files/patch-imagick__helpers.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/pecl-imagick/files/patch-php__imagick.h =================================================================== --- head/graphics/pecl-imagick/files/patch-php__imagick.h (nonexistent) +++ head/graphics/pecl-imagick/files/patch-php__imagick.h (revision 553245) @@ -0,0 +1,23 @@ +--- php_imagick.h.orig 2019-05-02 15:26:00 UTC ++++ php_imagick.h +@@ -47,5 +47,20 @@ + extern zend_module_entry imagick_module_entry; + #define phpext_imagick_ptr &imagick_module_entry + ++#if PHP_VERSION_ID >= 80000 ++#ifndef TSRMLS_C ++#define TSRMLS_C ++#endif ++#ifndef TSRMLS_CC ++#define TSRMLS_CC ++#endif ++#ifndef TSRMLS_D ++#define TSRMLS_D ++#endif ++#ifndef TSRMLS_DC ++#define TSRMLS_DC ++#endif ++#endif ++ + #endif /* PHP_IMAGICK_H */ + Property changes on: head/graphics/pecl-imagick/files/patch-php__imagick.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/pecl-imagick/files/patch-php__imagick__defs.h =================================================================== --- head/graphics/pecl-imagick/files/patch-php__imagick__defs.h (nonexistent) +++ head/graphics/pecl-imagick/files/patch-php__imagick__defs.h (revision 553245) @@ -0,0 +1,13 @@ +--- php_imagick_defs.h.orig 2020-10-25 08:13:09 UTC ++++ php_imagick_defs.h +@@ -20,6 +20,10 @@ + #ifndef PHP_IMAGICK_DEFS_H /* PHP_IMAGICK_DEFS_H */ + # define PHP_IMAGICK_DEFS_H + ++#ifndef HAVE_LOCALE_H ++#define HAVE_LOCALE_H ++#endif ++ + /* Include magic wand header */ + #if defined (IM_MAGICKWAND_HEADER_STYLE_SEVEN) + # include Property changes on: head/graphics/pecl-imagick/files/patch-php__imagick__defs.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property