diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.21.recipe b/media-gfx/imagemagick/imagemagick-7.1.1.34.recipe similarity index 98% rename from media-gfx/imagemagick/imagemagick-7.1.1.21.recipe rename to media-gfx/imagemagick/imagemagick-7.1.1.34.recipe index 140115f69..f83b04020 100644 --- a/media-gfx/imagemagick/imagemagick-7.1.1.21.recipe +++ b/media-gfx/imagemagick/imagemagick-7.1.1.34.recipe @@ -14,7 +14,7 @@ imageMagickVersion="${portVersion%.*}-${portVersion##*.}" SOURCE_URI="https://www.imagemagick.org/download/releases/ImageMagick-$imageMagickVersion.tar.xz https://mirror.sobukus.de/files/src/imagemagick/ImageMagick-$imageMagickVersion.tar.xz https://github.com/ImageMagick/ImageMagick/archive/$imageMagickVersion.tar.gz" -CHECKSUM_SHA256="1e44faec8bf603e8c894a7c039fb1b4bb83dc0c429c79c74577e73ceefe4a238" +CHECKSUM_SHA256="abab52de4b8f0356c05ddee3d3398c147fd9f6c099760f2cb15f3b8168a776c7" SOURCE_DIR="ImageMagick-$imageMagickVersion" PATCHES="imagemagick-$portVersion.patchset" diff --git a/media-gfx/imagemagick/patches/imagemagick-7.1.1.21.patchset b/media-gfx/imagemagick/patches/imagemagick-7.1.1.34.patchset similarity index 88% rename from media-gfx/imagemagick/patches/imagemagick-7.1.1.21.patchset rename to media-gfx/imagemagick/patches/imagemagick-7.1.1.34.patchset index 3601d55e8..70f6a00e9 100644 --- a/media-gfx/imagemagick/patches/imagemagick-7.1.1.21.patchset +++ b/media-gfx/imagemagick/patches/imagemagick-7.1.1.34.patchset @@ -1,4 +1,4 @@ -From 1618b533cc3fcf73ad07658a8e1df4f154639504 Mon Sep 17 00:00:00 2001 +From 7762355c4ecc48701c1b1ab59c6f9c13a6f57ada Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 27 Dec 2017 18:43:52 +0100 Subject: Don't reset LIBRARY_PATH. @@ -27,10 +27,10 @@ index 4b5dc06..4e66b38 100644 #ifndef MAGICKCORE_SHAREARCH_RELATIVE_PATH diff --git a/configure.ac b/configure.ac -index d581d48..ea092fa 100644 +index dc52f77..85c7abf 100644 --- a/configure.ac +++ b/configure.ac -@@ -3106,15 +3106,15 @@ AC_DEFINE_UNQUOTED([EXECUTABLE_PATH],["$DEFINE_EXECUTABLE_PATH"],[Directory wher +@@ -3139,15 +3139,15 @@ AC_DEFINE_UNQUOTED([EXECUTABLE_PATH],["$DEFINE_EXECUTABLE_PATH"],[Directory wher AC_SUBST([EXECUTABLE_PATH]) # Path to ImageMagick lib @@ -51,7 +51,7 @@ index d581d48..ea092fa 100644 # # path to local binaries -@@ -3131,7 +3131,7 @@ AC_SUBST([LIB_BIN_DIR]) +@@ -3164,7 +3164,7 @@ AC_SUBST([LIB_BIN_DIR]) LIB_BIN_DIR_RELATIVE_PATH=$LIB_BIN_DIR AC_SUBST([LIB_BIN_DIR_RELATIVE_PATH]) @@ -60,7 +60,7 @@ index d581d48..ea092fa 100644 AC_SUBST([LIB_BIN_DIR_PATH]) # -@@ -3151,7 +3151,7 @@ AC_SUBST([MODULES_DIRNAME]) +@@ -3184,7 +3184,7 @@ AC_SUBST([MODULES_DIRNAME]) MODULES_RELATIVE_PATH="${MODULES_DIRNAME}" AC_SUBST([MODULES_RELATIVE_PATH]) @@ -69,7 +69,7 @@ index d581d48..ea092fa 100644 AC_SUBST([MODULES_PATH]) # -@@ -3244,7 +3244,7 @@ AC_SUBST([SHAREARCH_DIRNAME]) +@@ -3277,7 +3277,7 @@ AC_SUBST([SHAREARCH_DIRNAME]) SHAREARCH_RELATIVE_PATH="${SHAREARCH_DIRNAME}" AC_SUBST([SHAREARCH_RELATIVE_PATH]) @@ -79,10 +79,10 @@ index d581d48..ea092fa 100644 # -- -2.42.0 +2.45.2 -From cfbe268c8af8c99ec4f918683df2a0492073d066 Mon Sep 17 00:00:00 2001 +From 9f4779ca6c4f24daed780c156c98a1ec79c0e4e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= Date: Sat, 3 Jun 2023 13:17:44 +0200 Subject: set DOC_DIR from configure argument @@ -90,7 +90,7 @@ Subject: set DOC_DIR from configure argument A subdirectory is added to the final docDir diff --git a/configure.ac b/configure.ac -index ea092fa..139b843 100644 +index 85c7abf..7314a7a 100644 --- a/configure.ac +++ b/configure.ac @@ -207,7 +207,7 @@ eval "eval LIBEXEC_DIR=$libexecdir" @@ -103,5 +103,5 @@ index ea092fa..139b843 100644 eval "eval SYSCONF_DIR=$sysconfdir" AC_SUBST([SYSCONF_DIR]) -- -2.42.0 +2.45.2