Fix patch. Apparently people don't know how to test their changes before
author"Steven J. Hill" <sjhill@realitydiluted.com>
Wed, 5 Mar 2008 13:35:23 +0000 (13:35 -0000)
committer"Steven J. Hill" <sjhill@realitydiluted.com>
Wed, 5 Mar 2008 13:35:23 +0000 (13:35 -0000)
cheking them in.

package/libpng/libpng-remove-setjmp-error.patch

index 19df516d28546b1a9ba1de3fc32e7e960ba14cf2..6d0d8f7f2f0edfe20f61a98768ea19c6546a49e9 100644 (file)
@@ -1,7 +1,7 @@
-diff -ur libpng-1.2.16/pngconf.h libpng-1.2.16-patched/pngconf.h
---- libpng-1.2.16/pngconf.h    2007-01-31 07:22:33.000000000 -0600
-+++ libpng-1.2.16-patched/pngconf.h    2008-02-27 17:40:23.707516659 -0600
-@@ -310,13 +310,6 @@
+diff -ur libpng-1.2.25/pngconf.h libpng-1.2.25-patched/pngconf.h
+--- libpng-1.2.25/pngconf.h    2008-02-18 16:31:05.000000000 -0600
++++ libpng-1.2.25-patched/pngconf.h    2008-03-05 07:30:22.900478085 -0600
+@@ -319,13 +319,6 @@
  #      define PNG_SAVE_BSD_SOURCE
  #      undef _BSD_SOURCE
  #    endif
@@ -9,7 +9,7 @@ diff -ur libpng-1.2.16/pngconf.h libpng-1.2.16-patched/pngconf.h
 -     /* If you encounter a compiler error here, see the explanation
 -      * near the end of INSTALL.
 -      */
--         __png.h__ already includes setjmp.h;
+-         __pngconf.h__ already includes setjmp.h;
 -         __dont__ include it again.;
 -#    endif
  #  endif /* __linux__ */