From MAILER-DAEMON Thu Jan 27 10:41:37 2011 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1PiTyb-0007cy-KF for mharc-bug-plotutils@gnu.org; Thu, 27 Jan 2011 10:41:37 -0500 Received: from [140.186.70.92] (port=39047 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PhNkT-0004EP-I3 for bug-plotutils@gnu.org; Mon, 24 Jan 2011 09:50:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PhNkS-00065J-EG for bug-plotutils@gnu.org; Mon, 24 Jan 2011 09:50:29 -0500 Received: from danbala.ifoer.tuwien.ac.at ([128.130.168.64]:57577 helo=danbala.tuwien.ac.at) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PhNkS-00064s-5w for bug-plotutils@gnu.org; Mon, 24 Jan 2011 09:50:28 -0500 Received: by danbala.tuwien.ac.at (Postfix, from userid 116) id 17A2A391C99; Mon, 24 Jan 2011 15:50:26 +0100 (CET) Date: Mon, 24 Jan 2011 15:50:26 +0100 From: Thomas Klausner To: bug-plotutils@gnu.org Message-ID: <20110124145026.GW16230@danbala.tuwien.ac.at> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="oGy11dVowAZA6eXT" Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Mailman-Approved-At: Thu, 27 Jan 2011 10:41:35 -0500 Subject: [Bug-plotutils] png-1.5 build fix X-BeenThere: bug-plotutils@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for the GNU plotting utilities, including the libplot graphics export library." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2011 14:50:30 -0000 --oGy11dVowAZA6eXT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline png-1.5 hides structure members from public view. For this reason, some code doesn't compile any more. The attached patch against plotutils-2.6 fixes the problem. I didn't find SVN or similar to check if the problem is still there. Also, the home page at http://www.gnu.org/software/plotutils/ mentions that 2.4.1 is the newest version and the linked manual is for 2.2. Cheers, Thomas --oGy11dVowAZA6eXT Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-aa $NetBSD: patch-aa,v 1.6 2011/01/14 11:30:36 wiz Exp $ Fix build with png-1.5. --- libplot/z_write.c.orig 2008-07-16 00:54:10.000000000 +0000 +++ libplot/z_write.c @@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter * } /* cleanup after libpng errors (error handler does a longjmp) */ - if (setjmp (png_ptr->jmpbuf)) + if (setjmp (png_jmpbuf (png_ptr))) { png_destroy_write_struct (&png_ptr, (png_info **)NULL); return -1; @@ -444,7 +444,11 @@ _our_error_fn_stdio (png_struct *png_ptr #endif } +#if (PNG_LIBPNG_VER < 10500) longjmp (png_ptr->jmpbuf, 1); +#else + png_longjmp (png_ptr, 1); +#endif } static void @@ -515,7 +519,11 @@ _our_error_fn_stream (png_struct *png_pt #endif } +#if (PNG_LIBPNG_VER < 10500) longjmp (png_ptr->jmpbuf, 1); +#else + png_longjmp (png_ptr, 1); +#endif } static void --oGy11dVowAZA6eXT--