CVS commit: pkgsrc/graphics/ImageMagick6

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Dec 31 20:40:32 UTC 2023

Modified Files:
        pkgsrc/graphics/ImageMagick6: Makefile Makefile.common PLIST distinfo
Added Files:
        pkgsrc/graphics/ImageMagick6/patches: patch-magick_blob.c
Removed Files:
        pkgsrc/graphics/ImageMagick6/patches: patch-config_policy.xml

Log Message:
ImageMagick6: update to 6.9.13.2

No published change log found. We are also carrying an upstream patch to
fix a general image generation regression on (at least) NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/graphics/ImageMagick6/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/ImageMagick6/Makefile.common
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/ImageMagick6/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/ImageMagick6/distinfo
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/graphics/ImageMagick6/patches/patch-config_policy.xml
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/ImageMagick6/patches/patch-magick_blob.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/ImageMagick6/Makefile
diff -u pkgsrc/graphics/ImageMagick6/Makefile:1.65 pkgsrc/graphics/ImageMagick6/Makefile:1.66
--- pkgsrc/graphics/ImageMagick6/Makefile:1.65  Wed Nov 15 20:00:37 2023
+++ pkgsrc/graphics/ImageMagick6/Makefile       Sun Dec 31 20:40:31 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.65 2023/11/15 20:00:37 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2023/12/31 20:40:31 gutteridge Exp $
 
-PKGREVISION= 6
 .include "Makefile.common"
 
 PKGNAME=       ImageMagick6-${DISTVERSION}
@@ -10,7 +9,7 @@ COMMENT=       Package for display and interac
 
 CONFLICTS=     geomview<1.8.1nb2  # used to have a program named 'animate'
 
-USE_LANGUAGES=         c c++ c99
+USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake pkg-config:run
 CONFIGURE_ARGS+=       --disable-assert
 CONFIGURE_ARGS+=       --with-xml=yes
@@ -50,6 +49,7 @@ SUBST_NOOP_OK.pkgcfg= yes
 # "Requires:" line.
 
 USE_CC_FEATURES+=      c99
+FORCE_C_STD=           c99
 
 TEST_TARGET=           check
 

Index: pkgsrc/graphics/ImageMagick6/Makefile.common
diff -u pkgsrc/graphics/ImageMagick6/Makefile.common:1.17 pkgsrc/graphics/ImageMagick6/Makefile.common:1.18
--- pkgsrc/graphics/ImageMagick6/Makefile.common:1.17   Sat Jul 22 10:09:06 2023
+++ pkgsrc/graphics/ImageMagick6/Makefile.common        Sun Dec 31 20:40:31 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.17 2023/07/22 10:09:06 adam Exp $
+# $NetBSD: Makefile.common,v 1.18 2023/12/31 20:40:31 gutteridge Exp $
 
-IM_MAJOR_VER=          6.9.12
-IM_MINOR_VER=          91
+IM_MAJOR_VER=          6.9.13
+IM_MINOR_VER=          2
 IM_MAJOR_LIB_VER=      6
 
 .if (${IM_MINOR_VER} != NONE)

Index: pkgsrc/graphics/ImageMagick6/PLIST
diff -u pkgsrc/graphics/ImageMagick6/PLIST:1.9 pkgsrc/graphics/ImageMagick6/PLIST:1.10
--- pkgsrc/graphics/ImageMagick6/PLIST:1.9      Sat Jul 22 10:09:06 2023
+++ pkgsrc/graphics/ImageMagick6/PLIST  Sun Dec 31 20:40:31 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2023/07/22 10:09:06 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2023/12/31 20:40:31 gutteridge Exp $
 bin/Magick++-config6
 bin/Magick-config6
 bin/MagickCore-config6
@@ -151,7 +151,7 @@ include/ImageMagick-6/wand/pixel-iterato
 include/ImageMagick-6/wand/pixel-wand.h
 include/ImageMagick-6/wand/stream.h
 include/ImageMagick-6/wand/wand-view.h
-lib/ImageMagick-6.9.12/config-Q16/configure.xml
+lib/ImageMagick-6.9.13/config-Q16/configure.xml
 lib/libMagick++-6.Q16.la
 lib/libMagickCore-6.Q16.la
 lib/libMagickWand-6.Q16.la

Index: pkgsrc/graphics/ImageMagick6/distinfo
diff -u pkgsrc/graphics/ImageMagick6/distinfo:1.15 pkgsrc/graphics/ImageMagick6/distinfo:1.16
--- pkgsrc/graphics/ImageMagick6/distinfo:1.15  Sat Jul 22 10:09:06 2023
+++ pkgsrc/graphics/ImageMagick6/distinfo       Sun Dec 31 20:40:31 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2023/07/22 10:09:06 adam Exp $
+$NetBSD: distinfo,v 1.16 2023/12/31 20:40:31 gutteridge Exp $
 
-BLAKE2s (ImageMagick-6.9.12-91.tar.xz) = 81b8c33afdb9035b3af55f15fbca3c4c65f6ccce6a7f254511fb5406e51477fb
-SHA512 (ImageMagick-6.9.12-91.tar.xz) = d3160aaaeae67d6ae8a3897dc67b7c937fa02fc91190f4b9d35aa5317931fbb2009ab6f493b1c8054f9ec694f9fb56fadd7bbb98ada5898e9dd88c1b4015d180
-Size (ImageMagick-6.9.12-91.tar.xz) = 9258248 bytes
+BLAKE2s (ImageMagick-6.9.13-2.tar.xz) = 4f91023d076210de16425e9a60b4c4ad43da23567640258dd7b2bc1b3f76417c
+SHA512 (ImageMagick-6.9.13-2.tar.xz) = d693983eda6fba6b5e1d5d5bb4dc814dffd6a064c0464dded86c5f780ce52bef737d1bc870fae4c5bd039c419585fb374a0c4fbd19d94153d319eb8e3d5595b3
+Size (ImageMagick-6.9.13-2.tar.xz) = 9611768 bytes
 SHA1 (patch-Makefile.in) = 8360c4e0903bdbc73dd40f9a466f40996c53ce44
-SHA1 (patch-config_policy.xml) = 26da8b5f936d87ca8e8e3f23602b56ea584a8a89
+SHA1 (patch-magick_blob.c) = 6890910addb9dcd153ef44c449b101cc43470302

Added files:

Index: pkgsrc/graphics/ImageMagick6/patches/patch-magick_blob.c
diff -u /dev/null pkgsrc/graphics/ImageMagick6/patches/patch-magick_blob.c:1.1
--- /dev/null   Sun Dec 31 20:40:32 2023
+++ pkgsrc/graphics/ImageMagick6/patches/patch-magick_blob.c    Sun Dec 31 20:40:32 2023
@@ -0,0 +1,27 @@
+$NetBSD: patch-magick_blob.c,v 1.1 2023/12/31 20:40:32 gutteridge Exp $
+
+Fix regression that was causing image generation failures on NetBSD.
+https://github.com/ImageMagick/ImageMagick/issues/6984
+https://github.com/ImageMagick/ImageMagick6/commit/a1e5ff811aeb935f7adfa4740026c59dac2bb01f
+
+--- magick/blob.c.orig 2023-12-25 14:08:06.000000000 +0000
++++ magick/blob.c
+@@ -522,8 +522,7 @@ MagickExport MagickBooleanType CloseBlob
+   blob_info=image->blob;
+   if ((blob_info == (BlobInfo *) NULL) || (blob_info->type == UndefinedStream))
+     return(MagickTrue);
+-  if (SyncBlob(image) != 0)
+-    ThrowBlobException(blob_info);
++  (void) SyncBlob(image);
+   status=blob_info->status;
+   switch (blob_info->type)
+   {
+@@ -4735,6 +4734,8 @@ static int SyncBlob(const Image *image)
+   assert(image->blob != (BlobInfo *) NULL);
+   if (IsEventLogging() != MagickFalse)
+     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
++  if (EOFBlob(image) != 0)
++    return(0);
+   blob_info=image->blob;
+   status=0;
+   switch (blob_info->type)