diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-08-07 08:59:48 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-08-07 08:59:48 +0000 |
| commit | 065ad8c7e618f517f18b2741e6381748b0210ea6 (patch) | |
| tree | 79ae17838d629536f826c672ac0e72c799104578 /app-office/abiword/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-065ad8c7e618f517f18b2741e6381748b0210ea6.tar.gz gentoo-2-065ad8c7e618f517f18b2741e6381748b0210ea6.tar.bz2 gentoo-2-065ad8c7e618f517f18b2741e6381748b0210ea6.zip | |
Fix building with libpng15 wrt #356287 by Hanno Boeck
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'app-office/abiword/files')
| -rw-r--r-- | app-office/abiword/files/abiword-2.8.6-libpng15.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/app-office/abiword/files/abiword-2.8.6-libpng15.patch b/app-office/abiword/files/abiword-2.8.6-libpng15.patch new file mode 100644 index 000000000000..b9853e80a4fd --- /dev/null +++ b/app-office/abiword/files/abiword-2.8.6-libpng15.patch @@ -0,0 +1,33 @@ +http://bugzilla.abisource.com/show_bug.cgi?id=13008 + +--- src/af/util/xp/ut_png.cpp ++++ src/af/util/xp/ut_png.cpp +@@ -71,7 +71,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(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL)); +--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp ++++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp +@@ -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); |