From owner-svn-ports-all@FreeBSD.ORG Thu Dec 25 10:49:48 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 215D2842; Thu, 25 Dec 2014 10:49:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E76F01339; Thu, 25 Dec 2014 10:49:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBPAnlIx031797; Thu, 25 Dec 2014 10:49:47 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBPAnlAG031795; Thu, 25 Dec 2014 10:49:47 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201412251049.sBPAnlAG031795@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 25 Dec 2014 10:49:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375530 - in head/lang/ofc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Dec 2014 10:49:48 -0000 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@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;