From 2a4efdc631886feef6428950afc4ff85eb7fd9c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my?= Date: Thu, 22 Jun 2017 02:01:45 +0200 Subject: [PATCH 1/2] add php-imagick dependencies this could clash with the core imagemagick installation because it adds itself to the path! It has to be in the path that the extension works correctly --- php7.1-imagick.json | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/php7.1-imagick.json b/php7.1-imagick.json index cc99d64..ff1d395 100644 --- a/php7.1-imagick.json +++ b/php7.1-imagick.json @@ -4,14 +4,30 @@ "license": "http://www.php.net/license/3_01.txt", "architecture": { "64bit": { - "url": "http://windows.php.net/downloads/pecl/releases/imagick/3.4.3/php_imagick-3.4.3-7.1-ts-vc14-x64.zip", - "hash": "35ee1bba25f2901affa24a22e60abcaae466327fd7f2c00e32ddeeec1a5910a4" + "url": [ + "http://windows.php.net/downloads/pecl/releases/imagick/3.4.3/php_imagick-3.4.3-7.1-ts-vc14-x64.zip", + "http://windows.php.net/downloads/pecl/deps/ImageMagick-6.9.3-7-vc14-x64.zip" + ], + "hash": [ + "35ee1bba25f2901affa24a22e60abcaae466327fd7f2c00e32ddeeec1a5910a4", + "25f115a5aec336d3039add9b0819d459787763ce86e0dd4804ac1bddee431f10" + ] }, "32bit": { - "url": "http://windows.php.net/downloads/pecl/releases/imagick/3.4.3/php_imagick-3.4.3-7.1-ts-vc14-x86.zip", - "hash": "306e12c77dd9bf71b198f252d6c52914aa055a13d7a22e76567e9e4bd56373f6" + "url": [ + "http://windows.php.net/downloads/pecl/releases/imagick/3.4.3/php_imagick-3.4.3-7.1-ts-vc14-x86.zip", + "http://windows.php.net/downloads/pecl/deps/ImageMagick-6.9.3-7-vc14-x86.zip" + ], + "hash": [ + "306e12c77dd9bf71b198f252d6c52914aa055a13d7a22e76567e9e4bd56373f6", + "8d46ee896c2d13a4829dcfff5a8da9ac6bdd55c4da4d039ac726a0e211f46a16" + ] } }, + "env_add_path": "bin", + "env_set": { + "MAGICK_HOME": "$dir/bin" + }, "checkver": "imagick/([\\d.]+)/windows", "autoupdate": { "architecture": { From 80094c479b314e7f9183551bcaf4de94300366b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my?= Date: Thu, 20 Jul 2017 23:18:49 +0200 Subject: [PATCH 2/2] update php-imagick dependency --- php7.1-imagick.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/php7.1-imagick.json b/php7.1-imagick.json index ff1d395..14a6d3a 100644 --- a/php7.1-imagick.json +++ b/php7.1-imagick.json @@ -25,9 +25,6 @@ } }, "env_add_path": "bin", - "env_set": { - "MAGICK_HOME": "$dir/bin" - }, "checkver": "imagick/([\\d.]+)/windows", "autoupdate": { "architecture": { @@ -39,7 +36,12 @@ } } }, - "post_install": "iex(gc $bucketsdir\\$bucket\\bin\\postinstall.ps1 -Raw)", + "post_install": " + iex(gc $bucketsdir\\$bucket\\bin\\postinstall.ps1 -Raw) + + Write-Host \"Remove .exe files to prevent confusion with imagemagick\" + Remove-Item $dir\\bin\\*.exe + ", "uninstaller": { "file": "uninstall.ps1" }