[ace-of-penguins] 68/141: debian/patches/45-libpng15: new

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository ace-of-penguins.

commit 2986773336d549facefec8d9e0c0331c0583c5cc
Author: Jari Aalto <jari.aalto at cante.net>
Date:   Mon Feb 6 10:42:05 2012 +0200

    debian/patches/45-libpng15: new
    
    Signed-off-by: Jari Aalto <jari.aalto at cante.net>
---
 debian/patches/45-libpng15 | 29 +++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 2 files changed, 30 insertions(+)

diff --git a/debian/patches/45-libpng15 b/debian/patches/45-libpng15
new file mode 100644
index 0000000..0dba6f6
--- /dev/null
+++ b/debian/patches/45-libpng15
@@ -0,0 +1,29 @@
+--- a/lib/make-imglib.c
++++ b/lib/make-imglib.c
+@@ -86,7 +86,7 @@
+     png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
+     info_ptr = png_create_info_struct (png_ptr);
+ 
+-    if (setjmp (png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf((png_ptr)))) {
+       fclose (f);
+       continue;
+     }
+--- a/lib/xwin.c
++++ b/lib/xwin.c
+@@ -825,13 +825,13 @@
+   png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
+   info_ptr = png_create_info_struct (png_ptr);
+ 
+-  if (setjmp (png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf((png_ptr)))) {
+     fprintf(stderr, "Invalid PNG image!\n");
+     return;
+   }
+ 
+   file_bytes = src->file_data;
+-  png_set_read_fn (png_ptr, (voidp)&file_bytes, (png_rw_ptr)png_reader);
++  png_set_read_fn (png_ptr, (png_voidp)&file_bytes, (png_rw_ptr)png_reader);
+ 
+   png_read_info (png_ptr, info_ptr);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f1a3302..797cf7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 20-lib--make-imglib.c-closedir.patch
 30-spider.c-implicit-pointer-conversion.patch
 40-include.patch
+45-libpng15

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ace-of-penguins.git