Date: Tue, 20 Nov 2018 16:56:57 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485437 - in head: games/openclaw games/openspades graphics/ImageMagick6 graphics/ImageMagick6/files graphics/ImageMagick7 graphics/ImageMagick7/files graphics/openfx-arena Message-ID: <201811201656.wAKGuvG5094805@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Tue Nov 20 16:56:57 2018 New Revision: 485437 URL: https://svnweb.freebsd.org/changeset/ports/485437 Log: * Fix a bug in the icon coder * Fix a bug in configure that resulted in a string being inserted in the Libs.private field of the pkg-config files. Remove broken from 3 ports that where broken by the above bugs. Reported by: jbeich@ Obtained from: upstream Added: head/graphics/ImageMagick6/files/patch-coders_icon.c (contents, props changed) head/graphics/ImageMagick6/files/patch-configure (contents, props changed) head/graphics/ImageMagick7/files/patch-coders_icon.c (contents, props changed) head/graphics/ImageMagick7/files/patch-configure (contents, props changed) Modified: head/games/openclaw/Makefile head/games/openspades/Makefile head/graphics/ImageMagick6/Makefile head/graphics/ImageMagick7/Makefile head/graphics/openfx-arena/Makefile Modified: head/games/openclaw/Makefile ============================================================================== --- head/games/openclaw/Makefile Tue Nov 20 16:30:25 2018 (r485436) +++ head/games/openclaw/Makefile Tue Nov 20 16:56:57 2018 (r485437) @@ -14,8 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libtinyxml.so:textproc/tinyxml -BROKEN= fails to build - USES= cmake:outsource compiler:c++11-lib pkgconfig localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= pjasicek Modified: head/games/openspades/Makefile ============================================================================== --- head/games/openspades/Makefile Tue Nov 20 16:30:25 2018 (r485436) +++ head/games/openspades/Makefile Tue Nov 20 16:56:57 2018 (r485437) @@ -15,8 +15,6 @@ COMMENT= Compatible client of Ace of Spades LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to package - BUILD_DEPENDS= convert:graphics/ImageMagick6 # for building icons LIB_DEPENDS= libcurl.so:ftp/curl Modified: head/graphics/ImageMagick6/Makefile ============================================================================== --- head/graphics/ImageMagick6/Makefile Tue Nov 20 16:30:25 2018 (r485436) +++ head/graphics/ImageMagick6/Makefile Tue Nov 20 16:56:57 2018 (r485437) @@ -2,6 +2,7 @@ PORTNAME= ImageMagick DISTVERSION= 6.9.10-14 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ Added: head/graphics/ImageMagick6/files/patch-coders_icon.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ImageMagick6/files/patch-coders_icon.c Tue Nov 20 16:56:57 2018 (r485437) @@ -0,0 +1,24 @@ +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, Added: head/graphics/ImageMagick6/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ImageMagick6/files/patch-configure Tue Nov 20 16:56:57 2018 (r485437) @@ -0,0 +1,11 @@ +--- 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" + + + Modified: head/graphics/ImageMagick7/Makefile ============================================================================== --- head/graphics/ImageMagick7/Makefile Tue Nov 20 16:30:25 2018 (r485436) +++ head/graphics/ImageMagick7/Makefile Tue Nov 20 16:56:57 2018 (r485437) @@ -2,7 +2,7 @@ PORTNAME= ImageMagick DISTVERSION= 7.0.8-14 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ http://www.imagemagick.org/download/legacy/ \ Added: head/graphics/ImageMagick7/files/patch-coders_icon.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ImageMagick7/files/patch-coders_icon.c Tue Nov 20 16:56:57 2018 (r485437) @@ -0,0 +1,24 @@ +From 08761138f4b3ee4d174ee4297983839c55382349 Mon Sep 17 00:00:00 2001 +From: Cristy <urban-warrior@imagemagick.org> +Date: Sun, 18 Nov 2018 17:39:53 -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 fa35021cd5..e32c7392f8 100644 +--- coders/icon.c ++++ coders/icon.c +@@ -367,8 +367,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, Added: head/graphics/ImageMagick7/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ImageMagick7/files/patch-configure Tue Nov 20 16:56:57 2018 (r485437) @@ -0,0 +1,11 @@ +--- configure.orig 2018-11-20 17:30:38.038076000 +0100 ++++ configure 2018-11-20 17:30:45.393294000 +0100 +@@ -36948,7 +36948,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" + + + Modified: head/graphics/openfx-arena/Makefile ============================================================================== --- head/graphics/openfx-arena/Makefile Tue Nov 20 16:30:25 2018 (r485436) +++ head/graphics/openfx-arena/Makefile Tue Nov 20 16:56:57 2018 (r485437) @@ -11,7 +11,6 @@ COMMENT= Extra OpenFX plugins for Natron LICENSE= GPLv2 -BROKEN= fails to build ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= opencl>=0:devel/opencl LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811201656.wAKGuvG5094805>