aboutsummaryrefslogtreecommitdiffstats
path: root/main/abiword
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2011-05-13 22:45:14 -0500
committerWilliam Pitcock <nenolod@dereferenced.org>2011-05-13 22:45:14 -0500
commit5b86cfbe13b9ed3357aba48fb8b71ff57a8c260a (patch)
tree2a324968bbc9aaba0e541b1866fa4f766af60d6e /main/abiword
parent36de8321664709f0d42b55eb7e50b388669b5a3b (diff)
downloadaports-5b86cfbe13b9ed3357aba48fb8b71ff57a8c260a.tar.bz2
aports-5b86cfbe13b9ed3357aba48fb8b71ff57a8c260a.tar.xz
main/abiword: blah
Diffstat (limited to 'main/abiword')
-rw-r--r--main/abiword/abiword-png15.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/main/abiword/abiword-png15.patch b/main/abiword/abiword-png15.patch
new file mode 100644
index 0000000000..ead8bf348e
--- /dev/null
+++ b/main/abiword/abiword-png15.patch
@@ -0,0 +1,33 @@
+diff -Naur abiword-vanilla//src/af/util/xp/ut_png.cpp abiword-2.8.6//src/af/util/xp/ut_png.cpp
+--- abiword-vanilla//src/af/util/xp/ut_png.cpp 2008-02-24 04:33:07.000000000 +0100
++++ abiword-2.8.6//src/af/util/xp/ut_png.cpp 2011-02-24 11:53:18.954524499 +0100
+@@ -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));
+diff -Naur abiword-vanilla//src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp abiword-2.8.6//src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
+--- abiword-vanilla//src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2009-07-01 06:02:04.000000000 +0200
++++ abiword-2.8.6//src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2011-02-24 11:53:19.039523946 +0100
+@@ -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);