current/SOURCES/abiword-2.9.2-libpng15.patch

Author: fwang
Subject: Build fix: Make abiword build with libpng 1.5.x
Applied-Upstream: commit:30601
Forwarded: yes
Bug: http://bugzilla.abisource.com/show_bug.cgi?id=13008

--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.libpng        2011-11-25 16:23:42.374652677 +0800
+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp       2011-11-25 16:24:44.556061151 +0800
@@ -185,7 +185,7 @@
 /** needed for the stejmp context */
 UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
 {
-       if (setjmp(m_pPNG->jmpbuf))
+       if (setjmp(png_jmpbuf(m_pPNG)))
        {
                DELETEP(m_pPngBB);
                png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
@@ -446,7 +446,7 @@
         * the normal method of doing things with libpng).  REQUIRED unless you
         * set up your own error handlers in the png_create_read_struct() earlier.
         */
-       if (setjmp(m_pPNG->jmpbuf))
+       if (setjmp(png_jmpbuf(m_pPNG)))
        {
                /* Free all of the memory associated with the png_ptr and info_ptr */
                png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
1	Author: fwang
2	Subject: Build fix: Make abiword build with libpng 1.5.x
3	Applied-Upstream: commit:30601
4	Forwarded: yes
5	Bug: http://bugzilla.abisource.com/show_bug.cgi?id=13008
6
7	--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.libpng 2011-11-25 16:23:42.374652677 +0800
8	+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2011-11-25 16:24:44.556061151 +0800
9	@@ -185,7 +185,7 @@
10	/** needed for the stejmp context */
11	UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
12	{
13	- if (setjmp(m_pPNG->jmpbuf))
14	+ if (setjmp(png_jmpbuf(m_pPNG)))
15	{
16	DELETEP(m_pPngBB);
17	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
18	@@ -446,7 +446,7 @@
19	* the normal method of doing things with libpng). REQUIRED unless you
20	* set up your own error handlers in the png_create_read_struct() earlier.
21	*/
22	- if (setjmp(m_pPNG->jmpbuf))
23	+ if (setjmp(png_jmpbuf(m_pPNG)))
24	{
25	/* Free all of the memory associated with the png_ptr and info_ptr */
26	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);