From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#7908: png-1.5 fix for emacs-23.2 and HEAD Date: Sat, 29 Jan 2011 21:02:09 +0200 Message-ID: <831v3vh6tq.fsf@gnu.org> References: <20110124125437.GS16230@danbala.tuwien.ac.at> <83d3nmyz76.fsf@gnu.org> <20110124215940.GH16230@danbala.tuwien.ac.at> <838vy9zlpa.fsf@gnu.org> <87ei80em65.fsf@stupidchicken.com> <83ei7vhl2y.fsf@gnu.org> <837hdnheid.fsf@gnu.org> <87ipx7y35f.fsf@stupidchicken.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1296329129 4364 80.91.229.12 (29 Jan 2011 19:25:29 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 29 Jan 2011 19:25:29 +0000 (UTC) Cc: 7908@debbugs.gnu.org, tk@giga.or.at To: Chong Yidong Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jan 29 20:25:24 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PjGQF-0001ls-9R for geb-bug-gnu-emacs@m.gmane.org; Sat, 29 Jan 2011 20:25:23 +0100 Original-Received: from localhost ([127.0.0.1]:42663 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PjGQE-0006V4-KL for geb-bug-gnu-emacs@m.gmane.org; Sat, 29 Jan 2011 14:25:22 -0500 Original-Received: from [140.186.70.92] (port=48079 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PjGQ9-0006Uo-6a for bug-gnu-emacs@gnu.org; Sat, 29 Jan 2011 14:25:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PjGQ7-0001Pk-SC for bug-gnu-emacs@gnu.org; Sat, 29 Jan 2011 14:25:17 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PjGQ7-0001Pg-QX for bug-gnu-emacs@gnu.org; Sat, 29 Jan 2011 14:25:15 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PjFvt-0002oh-Pc; Sat, 29 Jan 2011 13:54:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 29 Jan 2011 18:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 7908 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 7908-submit@debbugs.gnu.org id=B7908.129632722210801 (code B ref 7908); Sat, 29 Jan 2011 18:54:01 +0000 Original-Received: (at 7908) by debbugs.gnu.org; 29 Jan 2011 18:53:42 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PjFvZ-0002o8-4s for submit@debbugs.gnu.org; Sat, 29 Jan 2011 13:53:41 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PjFvW-0002nw-8t for 7908@debbugs.gnu.org; Sat, 29 Jan 2011 13:53:39 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0LFS00100STSTQ00@a-mtaout21.012.net.il> for 7908@debbugs.gnu.org; Sat, 29 Jan 2011 21:01:39 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.46.39]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LFS0019WSUPMR40@a-mtaout21.012.net.il>; Sat, 29 Jan 2011 21:01:39 +0200 (IST) In-reply-to: <87ipx7y35f.fsf@stupidchicken.com> X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sat, 29 Jan 2011 13:54:01 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:43738 Archived-At: > From: Chong Yidong > Cc: tk@giga.or.at, 7908@debbugs.gnu.org > Date: Sat, 29 Jan 2011 13:29:32 -0500 > > Eli Zaretskii writes: > > > Sorry, I used an old patch. But with this line corrected, the > > compilation still fails with the same error message. > > > > (I'm using libpng 1.4.x here, but I modified the #ifdef conditionals > > to make the new code in effect on 1.4.x. Maybe that's the reason for > > the difference?) > > Yeah, it makes a big difference. png_set_longjmp_fn is new to > libpng-1.5, it's the new non-backward compatible way to access the png > jmpbuf. But I do see png_set_longjmp_fn in png.h from libpng 1.4.3: #ifdef PNG_SETJMP_SUPPORTED /* This function returns the jmp_buf built in to *png_ptr. It must be * supplied with an appropriate 'longjmp' function to use on that jmp_buf * unless the default error function is overridden in which case NULL is * acceptable. The size of the jmp_buf is checked against the actual size * allocated by the library - the call will return NULL on a mismatch * indicating an ABI mismatch. */ extern PNG_EXPORT(jmp_buf*, png_set_longjmp_fn) PNGARG((png_structp png_ptr, png_longjmp_ptr longjmp_fn, size_t jmp_buf_size)); # define png_jmpbuf(png_ptr) \ (*png_set_longjmp_fn((png_ptr), longjmp, sizeof (jmp_buf))) #else # define png_jmpbuf(png_ptr) \ (LIBPNG_WAS_COMPILED_WITH__PNG_NO_SETJMP) #endif Could it be that image.c compiles for you on GNU/Linux because DEF_IMGLIB_FN and LOAD_IMGLIB_FN are not compiled except on Windows? > If it's too much trouble for you to install libpng 1.5 on Windows, I > think I'll go ahead and commit the patch. There's no Windows port of libpng 1.5 yet, but I will at least try compiling with the headers from there. > The way the conditionals are now written, compilation with libpng > 1.4 is unaffected, so it should be very safe. Yes, but if we want Emacs 23.3 to be stable until Emacs 24.1 is released, we better make it compatible with libpng 1.4.x. So I'd prefer that you wait until we understand this issue, if not resolve it. Thanks.