diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2018-12-12 18:00:13 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2018-12-12 18:00:13 +0000 |
| commit | 6328eba1173ecdf090e931edae73ed7e9a84f96c (patch) | |
| tree | 94daf1e4c01eac3f86a15942dcbca134c933f58d | |
| parent | 05a7fc95fba8ce177d466f76580f8945256ab946 (diff) | |
| download | ports-6328eba1173ecdf090e931edae73ed7e9a84f96c.tar.gz ports-6328eba1173ecdf090e931edae73ed7e9a84f96c.zip | |
Notes
| -rw-r--r-- | graphics/ImageMagick6/Makefile | 3 | ||||
| -rw-r--r-- | graphics/ImageMagick6/distinfo | 6 | ||||
| -rw-r--r-- | graphics/ImageMagick6/files/patch-coders_icon.c | 24 | ||||
| -rw-r--r-- | graphics/ImageMagick6/files/patch-configure | 11 |
4 files changed, 4 insertions, 40 deletions
diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile index 4b79d720312b..7c0f4b4aa0c4 100644 --- a/graphics/ImageMagick6/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 6.9.10-14 -PORTREVISION= 2 +DISTVERSION= 6.9.10-16 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ diff --git a/graphics/ImageMagick6/distinfo b/graphics/ImageMagick6/distinfo index b0aff23dcfdb..712fa08c13a8 100644 --- a/graphics/ImageMagick6/distinfo +++ b/graphics/ImageMagick6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541454920 -SHA256 (ImageMagick-6.9.10-14.tar.xz) = d123d4ad4e5bf72c51a6f528a2dbbbd4bf4249f25b36045017c9c634db968e6d -SIZE (ImageMagick-6.9.10-14.tar.xz) = 8931552 +TIMESTAMP = 1544635602 +SHA256 (ImageMagick-6.9.10-16.tar.xz) = 3dd570fd1b770fbdf30015131ca1ad06606a340b04a348d4276d509493d98bfa +SIZE (ImageMagick-6.9.10-16.tar.xz) = 8929036 diff --git a/graphics/ImageMagick6/files/patch-coders_icon.c b/graphics/ImageMagick6/files/patch-coders_icon.c deleted file mode 100644 index 3b5c1f5dec4a..000000000000 --- a/graphics/ImageMagick6/files/patch-coders_icon.c +++ /dev/null @@ -1,24 +0,0 @@ -From e08e321e2a763325329e5c4748ef374ec9e3b76a Mon Sep 17 00:00:00 2001 -From: Cristy <urban-warrior@imagemagick.org> -Date: Sun, 18 Nov 2018 17:40:50 -0500 -Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1386 - ---- - coders/icon.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/coders/icon.c b/coders/icon.c -index 5f4657f6f..c9b748d77 100644 ---- coders/icon.c -+++ coders/icon.c -@@ -372,8 +372,8 @@ static Image *ReadICONImage(const ImageInfo *image_info, - png[13]=(unsigned char) (icon_info.planes >> 8); - png[14]=(unsigned char) icon_info.bits_per_pixel; - png[15]=(unsigned char) (icon_info.bits_per_pixel >> 8); -- count=ReadBlob(image,length,png+16); -- if (count != (ssize_t) length) -+ count=ReadBlob(image,length-16,png+16); -+ if (count != (ssize_t) (length-16)) - { - png=(unsigned char *) RelinquishMagickMemory(png); - ThrowReaderException(CorruptImageError, diff --git a/graphics/ImageMagick6/files/patch-configure b/graphics/ImageMagick6/files/patch-configure deleted file mode 100644 index 8487ba21adc6..000000000000 --- a/graphics/ImageMagick6/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2018-11-20 17:30:00.562966000 +0100 -+++ configure 2018-11-20 17:30:07.703770000 +0100 -@@ -36930,7 +36930,7 @@ - MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'` - MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'` - MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS" --MAGICK_LIBS="$MAGICK_DEP_LIBS MAGICK_EXTRA_DEP_LIBS" -+MAGICK_LIBS="$MAGICK_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS" - - - |