diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-12-25 10:49:46 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-12-25 10:49:46 +0000 |
| commit | ce1be232cfcdc92b6800ea5fad152714b07c0829 (patch) | |
| tree | aac9981ae5acbb1d501e565d3a355f36cc6856a7 | |
| parent | Properly support png 1.5 (diff) | |
Properly support png 1.5
| -rw-r--r-- | lang/ofc/Makefile | 2 | ||||
| -rw-r--r-- | lang/ofc/files/patch-ofc_DPNGImage.m (renamed from lang/ofc/files/patch-DPNGImage.m) | 29 |
2 files changed, 16 insertions, 15 deletions
diff --git a/lang/ofc/Makefile b/lang/ofc/Makefile index be80b1d75db8..1b705f8e7ff5 100644 --- a/lang/ofc/Makefile +++ b/lang/ofc/Makefile @@ -11,7 +11,7 @@ MAINTAINER= vanilla@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 diff --git a/lang/ofc/files/patch-DPNGImage.m b/lang/ofc/files/patch-ofc_DPNGImage.m index 87a3171f4380..c7844c774eed 100644 --- a/lang/ofc/files/patch-DPNGImage.m +++ b/lang/ofc/files/patch-ofc_DPNGImage.m @@ -1,14 +1,6 @@ ---- ofc/DPNGImage.m.orig 2008-08-20 19:16:29.000000000 +0200 -+++ ofc/DPNGImage.m 2012-05-09 13:07:56.000000000 +0200 -@@ -30,6 +30,7 @@ - - #ifdef HAVE_DPNGIMAGE - #include "png.h" -+#include "pngpriv.h" - #endif - - -@@ -346,7 +347,7 @@ +--- 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) { @@ -17,7 +9,16 @@ { WARNING(DW_UNKNOWN_WARNING, "Error reading PNG file"); ok = NO; -@@ -485,7 +486,7 @@ +@@ -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) { @@ -26,7 +27,7 @@ { WARNING(DW_UNKNOWN_WARNING, "Error writing PNG file"); ok = NO; -@@ -553,7 +554,7 @@ +@@ -553,7 +553,7 @@ static void _warning(png_structp png, pn pixels = _width; @@ -35,7 +36,7 @@ { WARNING(DW_UNKNOWN_WARNING, "Error reading PNG file"); pixels = 0; -@@ -599,7 +600,7 @@ +@@ -599,7 +599,7 @@ static void _warning(png_structp png, pn png_structp png = (png_structp) _png; |