diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-03-02 21:07:17 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2011-03-02 21:07:17 (GMT) |
| commit | d287965fd36eec8532c8518253f8b7f97fc75fd6 (patch) | |
| tree | 728c2a1e1653affc33192f2c984dee3b9f49f65d | |
| parent | 9a27cc215065cfb98b5694ac409adf77bcf4ddee (diff) | |
| download | mxe-d287965fd36eec8532c8518253f8b7f97fc75fd6.zip mxe-d287965fd36eec8532c8518253f8b7f97fc75fd6.tar.gz mxe-d287965fd36eec8532c8518253f8b7f97fc75fd6.tar.bz2 | |
package gdk-pixbuf: libpng 1.5 compatibility
| -rw-r--r-- | src/gdk-pixbuf-1-fixes.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/src/gdk-pixbuf-1-fixes.patch b/src/gdk-pixbuf-1-fixes.patch index 5d63368..a7c8e26 100644 --- a/src/gdk-pixbuf-1-fixes.patch +++ b/src/gdk-pixbuf-1-fixes.patch @@ -31,3 +31,70 @@ index aa4964f..c925934 100644 -- 1.7.1 +From e6a5b2472a4a5d554b587dfcb798b95035caa6fd Mon Sep 17 00:00:00 2001 +From: Maarten Bosmans <mkbosmans@gmail.com> +Date: Mon, 24 Jan 2011 10:39:22 +0000 +Subject: Use png_jmpbuf macro + +This makes the png loader compatible with libpng 1.5 +--- +diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c +index 79c81fd..76f3304 100644 +--- a/gdk-pixbuf/io-png.c ++++ b/gdk-pixbuf/io-png.c +@@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr, + error_msg); + } + +- longjmp (png_save_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf(png_save_ptr), 1); + } + + static void +@@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + g_free (rows); + + if (pixbuf) +@@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func, + return NULL; + } + +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + if (lc->png_info_ptr) + png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); + g_free(lc); +@@ -531,7 +531,7 @@ gdk_pixbuf__png_image_load_increment(gpointer context, + lc->error = error; + + /* Invokes our callbacks as needed */ +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + lc->error = NULL; + return FALSE; + } else { +@@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr, + error_msg); + } + +- longjmp (png_read_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf(png_read_ptr), 1); + } + + static void +@@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf *pixbuf, + success = FALSE; + goto cleanup; + } +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + success = FALSE; + goto cleanup; + } +-- +cgit v0.8.3.4 |