Bug 14486 - libpng fails to compile with animated png patch after stable update
: libpng fails to compile with animated png patch after stable update
Status: CLOSED FIXED
Product: Codex
Classification: Unclassified
Component: graphics-libs
: stable grimoire
: x86 Linux
: P2 normal
Assigned To: Grimoire Bug List
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2008-04-24 10:21 UTC by Jaeic Lee
Modified: 2008-05-13 18:53 UTC (History)
3 users (show)

See Also:
gsherwood: fixed_in_lesser_branch+
eric: integrate_to_stable_grimoire+
eric: integrate_to_stable‑rc_grimoire+


Attachments
pngrutil.c.rej (828 bytes, application/octet-stream)
2008-04-24 10:22 UTC, Jaeic Lee
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Jaeic Lee 2008-04-24 10:21:24 UTC
after updating to stable, sorcery prompted me to update libpng.
However, because of animated png patch which doesn't apply well with new version
of libpng, the casting fails.

Here is the casting log:
Found source file /var/spool/sorcery/libpng-1.2.27beta01.tar.bz2 for spell
libpng in /var/spool/sorcery
Waiting for any  Solo casts to complete... 
Waiting for any other casts of  libpng  to complete... done.
staging disabled
Building libpng 
hash checking source file libpng-1.2.27beta01.tar.bz2...
Algorithm used: sha512
Algorithm checks out
Checking spell level WORKS_FOR_ME
Spell level is an allowed level
hash verification succeeded
Unpacking source file libpng-1.2.27beta01.tar.bz2 for spell libpng.
patching file pngread.c
Hunk #1 succeeded at 405 (offset 6 lines).
Hunk #3 succeeded at 538 (offset 6 lines).
Hunk #5 succeeded at 798 (offset 6 lines).
Hunk #7 succeeded at 1112 (offset 6 lines).
patching file png.c
patching file pngget.c
patching file png.h
Hunk #1 succeeded at 956 (offset 9 lines).
Hunk #3 succeeded at 1112 (offset 9 lines).
Hunk #5 succeeded at 1809 (offset 12 lines).
Hunk #7 succeeded at 2511 (offset 12 lines).
Hunk #9 succeeded at 3012 (offset 12 lines).
Hunk #11 succeeded at 3315 (offset 12 lines).
Hunk #13 succeeded at 3606 (offset 12 lines).
patching file pngtrans.c
patching file pngconf.h
patching file pngwrite.c
Hunk #1 succeeded at 263 (offset 2 lines).
Hunk #3 succeeded at 1537 (offset 16 lines).
patching file pngset.c
Hunk #2 succeeded at 1029 (offset 15 lines).
patching file pngpread.c
Hunk #3 succeeded at 399 (offset 2 lines).
Hunk #5 succeeded at 796 (offset 2 lines).
Hunk #7 succeeded at 1774 (offset 15 lines).
patching file pngrutil.c
Hunk #2 succeeded at 2174 (offset -6 lines).
Hunk #3 FAILED at 3299.
Hunk #4 succeeded at 3360 (offset 30 lines).
1 out of 4 hunks FAILED -- saving rejects to file pngrutil.c.rej
patching file pngwutil.c
Hunk #1 succeeded at 498 (offset 2 lines).
Hunk #2 succeeded at 622 (offset 9 lines).
Hunk #3 succeeded at 660 (offset 2 lines).
Hunk #4 succeeded at 700 (offset 9 lines).
Hunk #5 succeeded at 1753 (offset 2 lines).
Hunk #6 succeeded at 2891 (offset 9 lines).
patching file pngrtran.c
Hunk #1 succeeded at 1293 (offset 15 lines).

Spells that encountered problems:
---------------------------------
libpng
Comment 1 Jaeic Lee 2008-04-24 10:22:05 UTC
Created attachment 7001 [details]
pngrutil.c.rej

this file is the one that are rejected in patching.
Comment 2 Jaka Kranjc 2008-04-25 09:23:07 UTC
*** Bug 14463 has been marked as a duplicate of this bug. ***
Comment 3 p3pilot 2008-05-03 08:04:49 UTC
Currently in test is 1.2.9beta03.  The patch seems to apply here and builds
fine.  So we can with stay with this beta software or go back to 1.2.7 which has
the security fix in it and the patch applies against it.  It has a broken
Makefile.am though.  In order fix that we need:

sed -i 's:$(ECHO):echo:' Makefile.am  &&
NOCONFIGURE=yes ./autogen.sh  &&

in the PRE_BUILD before the patch.

What does every one think?  I haven't tried the fix or the patch against 1.2.8.
Comment 4 Eric Sandall 2008-05-03 10:32:40 UTC
I'd prefer to use a stable release rather than something marked "beta". If by
"beta" they mean "release candidate" then that's fine.
Comment 5 p3pilot 2008-05-03 11:03:22 UTC
Based on that line of reasoning then and looking at http://libpng.sourceforge.net/

I would recommend that we go with version 1.2.28 along with the fix that I
mentioned.  The animated png patch still applies and it builds with that fix.

If that is acceptable I will commit the changes I have locally.
Comment 6 Eric Sandall 2008-05-03 11:09:56 UTC
Sounds good to me, thanks George. :)
Comment 7 p3pilot 2008-05-03 11:22:15 UTC
Fixed in test with

commit 29ed436fd4f1ac12a85e75dde633101b64805966
Comment 8 p3pilot 2008-05-03 12:23:35 UTC
Also need to add

commit 0e28552565251056456364b76943ad9c53a8fa35

Sorry.  With autogen.sh, need to have extra depends
Comment 9 Eric Sandall 2008-05-03 12:41:07 UTC
Approved 29ed436fd4f1ac12a85e75dde633101b64805966 and
0e28552565251056456364b76943ad9c53a8fa35 for stable-0.20 and stable-rc-0.21.
Comment 10 Eric Sandall 2008-05-13 18:05:10 UTC
Integrated to stable-0.20 with commits d68e38f6f5c3d6c51942fe1b21e49a9d6172463b
(1.28) and 39c8e89c3a833195f732a10cbd97fd67924e9c40 (autogen.sh fix)
Integrated to stable-rc with commits db4b1cfec7a1d87e5a7df3da1d652eec3a8d5ca7
(1.28) and 30ca0889cad11e70434780ff2beb8f099dfa479c (autogen.sh fix)
Comment 11 Eric Sandall 2008-05-13 18:53:10 UTC
In stable and stable-rc tarballs.