cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix a bug in the icon coder

Browse Source 
* 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
This commit is contained in:
Koop Mast 2018-11-20 16:56:57 +00:00
parent 6c68e91ddc
commit c76f570dba
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=485437
9 changed files with 72 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
games/openclaw/Makefile
View File

@ -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

2
games/openspades/Makefile
View File

@ -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

1
graphics/ImageMagick6/Makefile
View File

@ -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/ \

24
graphics/ImageMagick6/files/patch-coders_icon.c Normal file
View File

@ -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,

11
graphics/ImageMagick6/files/patch-configure Normal file
View File

@ -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"

2
graphics/ImageMagick7/Makefile
View File

@ -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/ \

24
graphics/ImageMagick7/files/patch-coders_icon.c Normal file
View File

@ -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,

11
graphics/ImageMagick7/files/patch-configure Normal file
View File

@ -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"

1
graphics/openfx-arena/Makefile
View File

@ -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 \