[97302] trunk/dports/graphics/plotutils

[Ryan Schmidt]

On Sep 3, 2012, at 02:50, Joshua Root wrote:

>> Revision: 97302
>>          https://trac.macports.org/changeset/97302
>> Author:   ryandesign at macports.org
>> Date:     2012-09-02 21:32:15 -0700 (Sun, 02 Sep 2012)
>> Log Message:
>> -----------
>> plotutils: fix build with libpng 1.5, thanks to gentoo
>> 
>> Modified Paths:
>> --------------
>>    trunk/dports/graphics/plotutils/Portfile
>> 
>> Added Paths:
>> -----------
>>    trunk/dports/graphics/plotutils/files/patch-libpng-1.5.diff
>> 
>> Added: trunk/dports/graphics/plotutils/files/patch-libpng-1.5.diff
>> ===================================================================
>> --- trunk/dports/graphics/plotutils/files/patch-libpng-1.5.diff	                        (rev 0)
>> +++ trunk/dports/graphics/plotutils/files/patch-libpng-1.5.diff	2012-09-03 04:32:15 UTC (rev 97302)
>> @@ -0,0 +1,31 @@
>> +fix building with libpng-1.5
>> +
>> +--- libplot/z_write.c
>> ++++ libplot/z_write.c
>> +@@ -164,7 +164,7 @@
>> +     }
>> + 
>> +   /* cleanup after libpng errors (error handler does a longjmp) */
>> +-  if (setjmp (png_ptr->jmpbuf))
>> ++  if (png_jmpbuf (png_ptr))
> 
> Is it really correct to remove the setjmp call and just check if the
> jmpbuf is non-null? That seems like a pretty significant change to what
> this code is doing, not just a fix to avoid the deprecated API...

I did not read the patch that closely, but now that point point it out I would agree with you. I'll fix this momentarily.