From 4ae130da4d1d40f7cafbb585eae26dfad35cc7a0 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Sat, 19 Jun 2021 20:30:43 +0200 Subject: [PATCH] Remove no more needed patches for imagick with PHP 8+ Test: imagick --- install-php-extensions | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/install-php-extensions b/install-php-extensions index a032b5d..603bf55 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -1682,26 +1682,6 @@ installRemoteModule() { fi fi ;; - imagick) - if test $PHP_MAJMIN_VERSION -ge 800; then - if test -z "$installRemoteModule_version"; then - installRemoteModule_version=132a11fd26675db9eb9f0e9a3e2887c161875206 - fi - if test "${installRemoteModule_version%.*}" = "$installRemoteModule_version"; then - installRemoteModule_displayVersion="$installRemoteModule_version" - else - installRemoteModule_displayVersion="git--master-$installRemoteModule_version" - fi - installRemoteModule_src="$(getPackageSource https://codeload.github.com/Imagick/imagick/tar.gz/$installRemoteModule_version)" - cd -- "$installRemoteModule_src" - sed -Ei "s/^([ \t]*#define[ \t]+PHP_IMAGICK_VERSION[ \t]+\")@PACKAGE_VERSION@(\")/\1git--master-$installRemoteModule_displayVersion\2/" php_imagick.h - phpize - ./configure - make -j$(getProcessorCount) - make install - installRemoteModule_manuallyInstalled=1 - fi - ;; inotify) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -2284,9 +2264,6 @@ configureInstaller() { if test "$PHP_MODULE_TO_INSTALL" = 'amqp' && test $PHP_MAJMIN_VERSION -ge 800; then continue fi - if test "$PHP_MODULE_TO_INSTALL" = 'imagick' && test $PHP_MAJMIN_VERSION -ge 800; then - continue - fi if ! stringInList "$PHP_MODULE_TO_INSTALL" "$BUNDLED_MODULES"; then if test $PHP_MAJMIN_VERSION -lt 800; then pecl channel-update pecl.php.net || true