From f22a99b16e482327d86b27158d85218b5a799f1a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Jun 2021 07:57:33 +0200 Subject: more fix --- upstream.patch | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/upstream.patch b/upstream.patch index 57ff3e6..e97c909 100644 --- a/upstream.patch +++ b/upstream.patch @@ -1272,3 +1272,118 @@ index 9c42fdf7..e3ef6ac0 100644 + ] } ] +From 02d366415ea6ff6cb03d108836668e8698174234 Mon Sep 17 00:00:00 2001 +From: Laurent Laville +Date: Mon, 28 Jun 2021 05:34:10 +0000 +Subject: [PATCH] last try to fix issue #79 about IM7 API on Imagick extension + +--- + data/reference/extension/imagick/3/const.json | 40 ++++++++++++------- + 1 file changed, 26 insertions(+), 14 deletions(-) + +diff --git a/data/reference/extension/imagick/3/const.json b/data/reference/extension/imagick/3/const.json +index e3ef6ac0..8083b2d8 100644 +--- a/data/reference/extension/imagick/3/const.json ++++ b/data/reference/extension/imagick/3/const.json +@@ -2307,7 +2307,13 @@ + "class_name": "Imagick", + "name": "COLORSPACE_REC601LUMA", + "ext_min": "3.4.0", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -3613,7 +3619,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">6.3.6 <7.0.0" ++ "constraint": ">6.3.6" + } + ] + }, +@@ -3625,7 +3631,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">6.3.6 <7.0.0" ++ "constraint": ">6.3.6" + } + ] + }, +@@ -3637,7 +3643,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">6.3.6 <7.0.0" ++ "constraint": ">6.3.6" + } + ] + }, +@@ -3895,7 +3901,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">=6.5.3 <7.0.0" ++ "constraint": ">=6.5.3" + } + ] + }, +@@ -3907,7 +3913,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">=6.5.3 <7.0.0" ++ "constraint": ">=6.5.3" + } + ] + }, +@@ -3919,7 +3925,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">=6.5.3 <7.0.0" ++ "constraint": ">=6.5.3" + } + ] + }, +@@ -3939,13 +3945,7 @@ + "class_name": "Imagick", + "name": "ALPHACHANNEL_REMOVE", + "ext_min": "3.2.0b2", +- "php_min": "5.1.3", +- "dependencies": [ +- { +- "name": "imagick", +- "constraint": "<7.0.0" +- } +- ] ++ "php_min": "5.1.3" + }, + { + "class_name": "Imagick", +@@ -5092,5 +5092,17 @@ + "constraint": ">=7.0.0" + } + ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "ALPHACHANNEL_DISCRETE", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] + } + ] -- cgit