CVS commit: [pkgsrc-2023Q4] pkgsrc/graphics

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Jan  1 10:29:56 UTC 2024

Modified Files:
        pkgsrc/graphics/ImageMagick [pkgsrc-2023Q4]: Makefile distinfo
        pkgsrc/graphics/p5-PerlMagick [pkgsrc-2023Q4]: Makefile
Added Files:
        pkgsrc/graphics/ImageMagick/patches [pkgsrc-2023Q4]:
            patch-MagickCore_blob.c

Log Message:
Pullup ticket #6828 - requested by schmonz
graphics/ImageMagick: bugfix

Revisions pulled up:
- graphics/ImageMagick/Makefile                                 1.334
- graphics/ImageMagick/distinfo                                 1.296
- graphics/ImageMagick/patches/patch-MagickCore_blob.c          1.1
- graphics/p5-PerlMagick/Makefile                               1.201

---
   Module Name: pkgsrc
   Committed By:        schmonz
   Date:                Sat Dec 30 14:24:29 UTC 2023

   Modified Files:
        pkgsrc/graphics/ImageMagick: Makefile distinfo
        pkgsrc/graphics/p5-PerlMagick: Makefile
   Added Files:
        pkgsrc/graphics/ImageMagick/patches: patch-MagickCore_blob.c

   Log Message:
   {Image,p5-Perl}Magick: apply upstream fix for NetBSD test regressions.


To generate a diff of this commit:
cvs rdiff -u -r1.333 -r1.333.2.1 pkgsrc/graphics/ImageMagick/Makefile
cvs rdiff -u -r1.295 -r1.295.2.1 pkgsrc/graphics/ImageMagick/distinfo
cvs rdiff -u -r0 -r1.2.2.2 \
    pkgsrc/graphics/ImageMagick/patches/patch-MagickCore_blob.c
cvs rdiff -u -r1.200 -r1.200.2.1 pkgsrc/graphics/p5-PerlMagick/Makefile

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

Modified files:

Index: pkgsrc/graphics/ImageMagick/Makefile
diff -u pkgsrc/graphics/ImageMagick/Makefile:1.333 pkgsrc/graphics/ImageMagick/Makefile:1.333.2.1
--- pkgsrc/graphics/ImageMagick/Makefile:1.333  Mon Dec 11 10:25:35 2023
+++ pkgsrc/graphics/ImageMagick/Makefile        Mon Jan  1 10:29:55 2024
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.333 2023/12/11 10:25:35 wiz Exp $
+# $NetBSD: Makefile,v 1.333.2.1 2024/01/01 10:29:55 bsiegert Exp $
 
+PKGREVISION=   1
 .include "Makefile.common"
 
 PKGNAME=       ImageMagick-${DISTVERSION}

Index: pkgsrc/graphics/ImageMagick/distinfo
diff -u pkgsrc/graphics/ImageMagick/distinfo:1.295 pkgsrc/graphics/ImageMagick/distinfo:1.295.2.1
--- pkgsrc/graphics/ImageMagick/distinfo:1.295  Mon Dec 11 10:25:35 2023
+++ pkgsrc/graphics/ImageMagick/distinfo        Mon Jan  1 10:29:55 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.295 2023/12/11 10:25:35 wiz Exp $
+$NetBSD: distinfo,v 1.295.2.1 2024/01/01 10:29:55 bsiegert Exp $
 
 BLAKE2s (ImageMagick-7.1.1-23.tar.xz) = 60cec98ddb54cd8b46e188c9ccb0041af3b4d99fda25ded7c9529ae17d477a1e
 SHA512 (ImageMagick-7.1.1-23.tar.xz) = a6d88de2bbecfa53af565de7df89271c85e79c77ad34be5c3bd79254286a9477a71bf847219168e4fc0b9f354378569c7788b52c75d4daab0e692825d33eac08
 Size (ImageMagick-7.1.1-23.tar.xz) = 10562660 bytes
+SHA1 (patch-MagickCore_blob.c) = 276c2ad4159fcd8a10d63b6e8b5287ff391fa503
 SHA1 (patch-ghostscript-private.h) = 98d88220cf8814f2e4841c382de5e2e9e0ae9287

Index: pkgsrc/graphics/p5-PerlMagick/Makefile
diff -u pkgsrc/graphics/p5-PerlMagick/Makefile:1.200 pkgsrc/graphics/p5-PerlMagick/Makefile:1.200.2.1
--- pkgsrc/graphics/p5-PerlMagick/Makefile:1.200        Mon Dec 11 10:25:35 2023
+++ pkgsrc/graphics/p5-PerlMagick/Makefile      Mon Jan  1 10:29:56 2024
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.200 2023/12/11 10:25:35 wiz Exp $
+# $NetBSD: Makefile,v 1.200.2.1 2024/01/01 10:29:56 bsiegert Exp $
 
+PKGREVISION=   1
 .include "../../graphics/ImageMagick/Makefile.common"
 
 PKGNAME=       p5-PerlMagick-${DISTVERSION}

Added files:

Index: pkgsrc/graphics/ImageMagick/patches/patch-MagickCore_blob.c
diff -u /dev/null pkgsrc/graphics/ImageMagick/patches/patch-MagickCore_blob.c:1.2.2.2
--- /dev/null   Mon Jan  1 10:29:56 2024
+++ pkgsrc/graphics/ImageMagick/patches/patch-MagickCore_blob.c Mon Jan  1 10:29:56 2024
@@ -0,0 +1,25 @@
+$NetBSD: patch-MagickCore_blob.c,v 1.2.2.2 2024/01/01 10:29:56 bsiegert Exp $
+
+Apply upstream commit 30274e5 to fix test failures on NetBSD.
+
+--- MagickCore/blob.c.orig     2023-12-10 20:15:36.000000000 +0000
++++ MagickCore/blob.c
+@@ -618,8 +618,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)
+   {
+@@ -5518,6 +5517,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)