From MAILER-DAEMON Fri Jul 12 12:10:35 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UxfvX-00005P-MP
	for mharc-bug-plotutils@gnu.org; Fri, 12 Jul 2013 12:10:35 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39047)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1UxfvU-00005H-6j
	for bug-plotutils@gnu.org; Fri, 12 Jul 2013 12:10:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1UxfvT-0007vz-19
	for bug-plotutils@gnu.org; Fri, 12 Jul 2013 12:10:32 -0400
Received: from hera.aquilenet.fr ([141.255.128.1]:37316)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1UxfvS-0007ti-Pt
	for bug-plotutils@gnu.org; Fri, 12 Jul 2013 12:10:30 -0400
Received: from localhost (localhost [127.0.0.1])
	by hera.aquilenet.fr (Postfix) with ESMTP id D333F101C
	for <bug-plotutils@gnu.org>; Fri, 12 Jul 2013 18:05:26 +0200 (CEST)
Received: from hera.aquilenet.fr ([127.0.0.1])
	by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 28TwL02dyCcA for <bug-plotutils@gnu.org>;
	Fri, 12 Jul 2013 18:05:26 +0200 (CEST)
Received: from pluto (unknown [193.50.110.154])
	by hera.aquilenet.fr (Postfix) with ESMTPSA id A1FA6C0C
	for <bug-plotutils@gnu.org>; Fri, 12 Jul 2013 18:05:26 +0200 (CEST)
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
To: bug-plotutils@gnu.org
X-URL: http://www.fdn.fr/~lcourtes/
X-Revolutionary-Date: 24 Messidor an 221 de la =?utf-8?Q?R=C3=A9volution?=
X-PGP-Key-ID: 0xEA52ECF4
X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc
X-PGP-Fingerprint: 83C4 F8E5 10A3 3B4C 5BEA  D15D 77DD 95E2 EA52 ECF4
X-OS: x86_64-unknown-linux-gnu
Date: Fri, 12 Jul 2013 18:05:26 +0200
Message-ID: <87a9lrahmh.fsf@gnu.org>
User-Agent: Gnus/5.130007 (Ma Gnus v0.7) Emacs/24.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy]
X-Received-From: 141.255.128.1
Subject: [Bug-plotutils] [PATCH] Allow compilation with newer libpng
X-BeenThere: bug-plotutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Bug reports for the GNU plotting utilities,
	including the libplot graphics export library."
	<bug-plotutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-plotutils>,
	<mailto:bug-plotutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-plotutils>
List-Post: <mailto:bug-plotutils@gnu.org>
List-Help: <mailto:bug-plotutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-plotutils>,
	<mailto:bug-plotutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jul 2013 16:10:34 -0000

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Hello,

An upgrade from libpng 1.5.14 to 1.5.17 in Guix broke Plotutils.
This is fixed by the attached patch.

Thanks,
Ludo=E2=80=99.


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline; filename=plotutils-libpng-jmpbuf.patch
Content-Description: the patch

Use the `png_jmpbuf' accessor, as recommended since libpng 1.4.0:
http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt .

--- plotutils-2.6/libplot/z_write.c	2013-07-12 17:19:12.000000000 +0200
+++ plotutils-2.6/libplot/z_write.c	2013-07-12 17:19:07.000000000 +0200
@@ -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,7 @@ _our_error_fn_stdio (png_struct *png_ptr
 #endif
     }
 
-  longjmp (png_ptr->jmpbuf, 1);
+  longjmp (png_jmpbuf (png_ptr), 1);
 }
 
 static void 

--=-=-=--


