svn commit: r375530 - in head/lang/ofc: . files
Baptiste Daroussin
bapt at FreeBSD.org
Thu Dec 25 10:49:48 UTC 2014
Author: bapt
Date: Thu Dec 25 10:49:46 2014
New Revision: 375530
URL: https://svnweb.freebsd.org/changeset/ports/375530
QAT: https://qat.redports.org/buildarchive/r375530/
Log:
Properly support png 1.5
Added:
head/lang/ofc/files/patch-ofc_DPNGImage.m (contents, props changed)
Deleted:
head/lang/ofc/files/patch-DPNGImage.m
Modified:
head/lang/ofc/Makefile
Modified: head/lang/ofc/Makefile
==============================================================================
--- head/lang/ofc/Makefile Thu Dec 25 10:12:06 2014 (r375529)
+++ head/lang/ofc/Makefile Thu Dec 25 10:49:46 2014 (r375530)
@@ -11,7 +11,7 @@ MAINTAINER= vanilla at FreeBSD.org
COMMENT= The Objective-C Foundation Classes library
LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \
- libpng15.so:${PORTSDIR}/graphics/png \
+ libpng.so:${PORTSDIR}/graphics/png \
libjpeg.so:${PORTSDIR}/graphics/jpeg \
libfreetype.so:${PORTSDIR}/print/freetype2
Added: head/lang/ofc/files/patch-ofc_DPNGImage.m
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/ofc/files/patch-ofc_DPNGImage.m Thu Dec 25 10:49:46 2014 (r375530)
@@ -0,0 +1,47 @@
+--- ofc/DPNGImage.m.orig 2008-08-20 17:16:29 UTC
++++ ofc/DPNGImage.m
+@@ -346,7 +346,7 @@ static void _warning(png_structp png, pn
+
+ if (ok)
+ {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ WARNING(DW_UNKNOWN_WARNING, "Error reading PNG file");
+ ok = NO;
+@@ -406,7 +406,7 @@ static void _warning(png_structp png, pn
+
+ _width = (unsigned) width;
+ _height = (unsigned) height;
+- _bpp = info->channels;
++ _bpp = png_get_channels(png, info);
+ _images = 1;
+
+ _reading = YES;
+@@ -485,7 +485,7 @@ static void _warning(png_structp png, pn
+
+ if (ok)
+ {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ WARNING(DW_UNKNOWN_WARNING, "Error writing PNG file");
+ ok = NO;
+@@ -553,7 +553,7 @@ static void _warning(png_structp png, pn
+
+ pixels = _width;
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ WARNING(DW_UNKNOWN_WARNING, "Error reading PNG file");
+ pixels = 0;
+@@ -599,7 +599,7 @@ static void _warning(png_structp png, pn
+
+ png_structp png = (png_structp) _png;
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ WARNING(DW_UNKNOWN_WARNING, "Error writing PNG file");
+ ok = NO;
More information about the svn-ports-head
mailing list