CVS commit: pkgsrc/graphics/ImageMagick

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Jul 15 06:12:17 UTC 2024

Modified Files:
        pkgsrc/graphics/ImageMagick: Makefile Makefile.common PLIST PLIST.doc
            distinfo
        pkgsrc/graphics/ImageMagick/patches: patch-ghostscript-private.h

Log Message:
ImageMagick: Update to 7.1.1.35


To generate a diff of this commit:
cvs rdiff -u -r1.339 -r1.340 pkgsrc/graphics/ImageMagick/Makefile
cvs rdiff -u -r1.280 -r1.281 pkgsrc/graphics/ImageMagick/Makefile.common
cvs rdiff -u -r1.121 -r1.122 pkgsrc/graphics/ImageMagick/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/ImageMagick/PLIST.doc
cvs rdiff -u -r1.301 -r1.302 pkgsrc/graphics/ImageMagick/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/ImageMagick/patches/patch-ghostscript-private.h

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.339 pkgsrc/graphics/ImageMagick/Makefile:1.340
--- pkgsrc/graphics/ImageMagick/Makefile:1.339  Thu Jul 11 19:45:12 2024
+++ pkgsrc/graphics/ImageMagick/Makefile        Mon Jul 15 06:12:17 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.339 2024/07/11 19:45:12 wiz Exp $
+# $NetBSD: Makefile,v 1.340 2024/07/15 06:12:17 triaxx Exp $
 
-PKGREVISION= 4
 .include "Makefile.common"
 
 PKGNAME=       ImageMagick-${DISTVERSION}

Index: pkgsrc/graphics/ImageMagick/Makefile.common
diff -u pkgsrc/graphics/ImageMagick/Makefile.common:1.280 pkgsrc/graphics/ImageMagick/Makefile.common:1.281
--- pkgsrc/graphics/ImageMagick/Makefile.common:1.280   Sun Mar  3 12:46:28 2024
+++ pkgsrc/graphics/ImageMagick/Makefile.common Mon Jul 15 06:12:17 2024
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.280 2024/03/03 12:46:28 wiz Exp $
+# $NetBSD: Makefile.common,v 1.281 2024/07/15 06:12:17 triaxx Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 #
 # Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
 
 IM_MAJOR_VER=          7.1.1
-IM_MINOR_VER=          29
+IM_MINOR_VER=          35
 IM_MAJOR_LIB_VER=      7
 
-.if (${IM_MINOR_VER} != NONE)
+.if ${IM_MINOR_VER} != NONE
 DISTSUFFIX=    ${IM_MAJOR_VER}-${IM_MINOR_VER}
 .else
 DISTSUFFIX=    ${IM_MAJOR_VER}

Index: pkgsrc/graphics/ImageMagick/PLIST
diff -u pkgsrc/graphics/ImageMagick/PLIST:1.121 pkgsrc/graphics/ImageMagick/PLIST:1.122
--- pkgsrc/graphics/ImageMagick/PLIST:1.121     Wed Nov 15 12:08:52 2023
+++ pkgsrc/graphics/ImageMagick/PLIST   Mon Jul 15 06:12:17 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.121 2023/11/15 12:08:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.122 2024/07/15 06:12:17 triaxx Exp $
 bin/Magick++-config
 bin/MagickCore-config
 bin/MagickWand-config
@@ -134,7 +134,6 @@ include/ImageMagick-7/MagickWand/animate
 include/ImageMagick-7/MagickWand/compare.h
 include/ImageMagick-7/MagickWand/composite.h
 include/ImageMagick-7/MagickWand/conjure.h
-include/ImageMagick-7/MagickWand/convert.h
 include/ImageMagick-7/MagickWand/deprecate.h
 include/ImageMagick-7/MagickWand/display.h
 include/ImageMagick-7/MagickWand/drawing-wand.h

Index: pkgsrc/graphics/ImageMagick/PLIST.doc
diff -u pkgsrc/graphics/ImageMagick/PLIST.doc:1.8 pkgsrc/graphics/ImageMagick/PLIST.doc:1.9
--- pkgsrc/graphics/ImageMagick/PLIST.doc:1.8   Tue Nov 14 19:01:34 2023
+++ pkgsrc/graphics/ImageMagick/PLIST.doc       Mon Jul 15 06:12:17 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.doc,v 1.8 2023/11/14 19:01:34 nia Exp $
+@comment $NetBSD: PLIST.doc,v 1.9 2024/07/15 06:12:17 triaxx Exp $
 man/man1/ImageMagick.1
 man/man1/Magick++-config.1
 man/man1/MagickCore-config.1
@@ -17,7 +17,6 @@ man/man1/mogrify.1
 man/man1/montage.1
 man/man1/stream.1
 share/doc/ImageMagick-7/LICENSE
-share/doc/ImageMagick-7/NEWS.txt
 share/doc/ImageMagick-7/images/ImageMagick.ico
 share/doc/ImageMagick-7/images/affine.png
 share/doc/ImageMagick-7/images/annotate.png
@@ -252,6 +251,7 @@ share/doc/ImageMagick-7/www/api/version.
 share/doc/ImageMagick-7/www/api/vision.html
 share/doc/ImageMagick-7/www/api/wand-view.html
 share/doc/ImageMagick-7/www/architecture.html
+share/doc/ImageMagick-7/www/assets/color-modes.js
 share/doc/ImageMagick-7/www/assets/magick.css
 share/doc/ImageMagick-7/www/assets/magick.js
 share/doc/ImageMagick-7/www/changelog.html
@@ -312,6 +312,7 @@ share/doc/ImageMagick-7/www/opencl.html
 share/doc/ImageMagick-7/www/openmp.html
 share/doc/ImageMagick-7/www/perl-magick.html
 share/doc/ImageMagick-7/www/porting.html
+share/doc/ImageMagick-7/www/privacy-policy.html
 share/doc/ImageMagick-7/www/quantize.html
 share/doc/ImageMagick-7/www/resources.html
 share/doc/ImageMagick-7/www/search.html

Index: pkgsrc/graphics/ImageMagick/distinfo
diff -u pkgsrc/graphics/ImageMagick/distinfo:1.301 pkgsrc/graphics/ImageMagick/distinfo:1.302
--- pkgsrc/graphics/ImageMagick/distinfo:1.301  Sun Mar  3 12:46:28 2024
+++ pkgsrc/graphics/ImageMagick/distinfo        Mon Jul 15 06:12:17 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.301 2024/03/03 12:46:28 wiz Exp $
+$NetBSD: distinfo,v 1.302 2024/07/15 06:12:17 triaxx Exp $
 
-BLAKE2s (ImageMagick-7.1.1-29.tar.xz) = 7e50d6c73985b1013e1c735f17a0bce0a3a6622eb0606d53e9f39e2d895bc954
-SHA512 (ImageMagick-7.1.1-29.tar.xz) = ed250188fae8225e8d32a2f4ed12d6fb3e0891fbb3ccf77c2bc027d28918c10e628c9eec0c8b83e530fe4387d2123e1b0eb576604d3b5ad6436f3cf4d1938cef
-Size (ImageMagick-7.1.1-29.tar.xz) = 10612124 bytes
-SHA1 (patch-ghostscript-private.h) = 98d88220cf8814f2e4841c382de5e2e9e0ae9287
+BLAKE2s (ImageMagick-7.1.1-35.tar.xz) = bd86778b47acbf16b6105d05b9af8d071222e50891f35e8b20ce08ef8f6d8840
+SHA512 (ImageMagick-7.1.1-35.tar.xz) = d53b5ddba8bc8fca5dc3e88bc1765d84859a03aeb9b46e90633f7ca829f5881a61bc1b81a9950268b6dc4dc7ef4f28ea661b21b3fd29f3199db3c4947e989ec2
+Size (ImageMagick-7.1.1-35.tar.xz) = 10773740 bytes
+SHA1 (patch-ghostscript-private.h) = ab25d5b565c11b98bf623f9f8afd0fedae9bf1fa

Index: pkgsrc/graphics/ImageMagick/patches/patch-ghostscript-private.h
diff -u pkgsrc/graphics/ImageMagick/patches/patch-ghostscript-private.h:1.1 pkgsrc/graphics/ImageMagick/patches/patch-ghostscript-private.h:1.2
--- pkgsrc/graphics/ImageMagick/patches/patch-ghostscript-private.h:1.1 Mon Jun 20 20:49:26 2022
+++ pkgsrc/graphics/ImageMagick/patches/patch-ghostscript-private.h     Mon Jul 15 06:12:17 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-ghostscript-private.h,v 1.1 2022/06/20 20:49:26 dholland Exp $
+$NetBSD: patch-ghostscript-private.h,v 1.2 2024/07/15 06:12:17 triaxx Exp $
 
 Add a workaround to allow building with ghostscript-gpl.
 
 --- coders/ghostscript-private.h~      2022-06-05 10:26:38.000000000 +0000
 +++ coders/ghostscript-private.h
-@@ -76,6 +76,15 @@ static inline MagickBooleanType ExecuteG
+@@ -77,6 +77,15 @@ static inline MagickBooleanType ExecuteG
    return(MagickFalse);
  }