<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a35aa1c3a6a01c9232eb881fc5e320eef15cde59">https://github.com/macports/macports-ports/commit/a35aa1c3a6a01c9232eb881fc5e320eef15cde59</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a35aa1c3a6a01c9232eb881fc5e320eef15cde59
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Jun 9 20:15:15 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> abiword-x11: update version 2.8.6->3.0.2
</span>---
editors/abiword-x11/Portfile | 21 ++--
editors/abiword-x11/files/patch-configure.diff | 2 +-
editors/abiword-x11/files/patch-glib-2.32.diff | 21 ----
.../abiword-x11/files/patch-jpeg_read_header.diff | 4 +-
editors/abiword-x11/files/patch-libpng-1.5.diff | 139 ---------------------
.../abiword-x11/files/patch-src-Makefile.in.diff | 29 -----
6 files changed, 16 insertions(+), 200 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/abiword-x11/Portfile b/editors/abiword-x11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4749626..0bb528f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/abiword-x11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/abiword-x11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span>
name abiword-x11
set dname abiword
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.8.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license GPL-2+
description A word processor with gnome support.
long_description ${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,30 +16,35 @@ homepage https://www.abisource.com/
</span> master_sites https://www.abisource.com/downloads/${dname}/${version}/source \
http://www.nl.abisource.com/downloads/${dname}/${version}/source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 caabab25d197f9553ea12376de36fc7f5a771a58 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9218827
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fde551492b0cffa7d522082906f374490bd47f5c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11154333
</span>
distname ${dname}-${version}
patchfiles patch-configure.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-glib-2.32.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libpng-1.5.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-Makefile.in.diff \
</span> patch-jpeg_read_header.diff
depends_build port:pkgconfig
depends_lib port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libical \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:evolution-data-server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:goffice \
</span> port:libgnomeui \
port:libgsf \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxslt \
</span> port:fribidi \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:redland \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:rasqal \
</span> port:wv \
port:enchant \
port:libpng \
port:librsvg
configure.args --disable-default-plugins \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-champlain=no \
</span> --enable-clipart=yes \
--enable-templates=yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/abiword-x11/files/patch-configure.diff b/editors/abiword-x11/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 26cf9f0..8aacd80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/abiword-x11/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/abiword-x11/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.orig 2010-09-23 10:03:49.000000000 -0700
+++ configure 2010-09-23 10:04:57.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15745,10 +15745,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17453,10 +17453,10 @@
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for platform and toolkit" >&5
$as_echo_n "checking for platform and toolkit... " >&6; }
case ${host_os} in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/abiword-x11/files/patch-glib-2.32.diff b/editors/abiword-x11/files/patch-glib-2.32.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f4e1604..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/abiword-x11/files/patch-glib-2.32.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- goffice-bits/goffice/app/goffice-app.h.orig 2007-01-16 17:17:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ goffice-bits/goffice/app/goffice-app.h 2012-07-27 16:05:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef GOFFICE_APP_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GOFFICE_APP_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <glib/gmacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <glib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_BEGIN_DECLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/af/util/xp/ut_go_file.h.orig 2009-08-27 08:27:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/af/util/xp/ut_go_file.h 2012-07-27 16:05:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <glib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gsf/gsf.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <glib/gerror.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_BEGIN_DECLS
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/abiword-x11/files/patch-jpeg_read_header.diff b/editors/abiword-x11/files/patch-jpeg_read_header.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index efd85fc..57a3e05 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/abiword-x11/files/patch-jpeg_read_header.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/abiword-x11/files/patch-jpeg_read_header.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@
</span> src->pub.next_input_byte = src->sourceBuf->getPointer (src->pos);
src->pub.bytes_in_buffer = src->sourceBuf->getLength ();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (boolean)true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 1; // boolean is a libjpeg type that is an int.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (boolean)1; // boolean is a libjpeg type that is an int.
</span> }
/*
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/abiword-x11/files/patch-libpng-1.5.diff b/editors/abiword-x11/files/patch-libpng-1.5.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e1faee8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/abiword-x11/files/patch-libpng-1.5.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,139 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://build.opensuse.org/package/view_file?file=abiword-2.8.6-libpng15.patch&package=mingw64-abiword&project=windows%3Amingw%3Awin64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/af/util/xp/ut_png.cpp 2008-02-24 04:33:07.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/af/util/xp/ut_png.cpp 2011-02-24 11:53:18.954524499 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,7 +71,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * the normal method of doing things with libpng). REQUIRED unless you
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * set up your own error handlers in the png_create_read_struct() earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(png_ptr->jmpbuf))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(png_ptr)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Free all of the memory associated with the png_ptr and info_ptr */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2009-07-01 06:02:04.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2011-02-24 11:53:19.039523946 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -185,7 +185,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** needed for the stejmp context */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(m_pPNG->jmpbuf))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(m_pPNG)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DELETEP(m_pPngBB);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -446,7 +446,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * the normal method of doing things with libpng). REQUIRED unless you
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * set up your own error handlers in the png_create_read_struct() earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(m_pPNG->jmpbuf))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(m_pPNG)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Free all of the memory associated with the png_ptr and info_ptr */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- plugins/bmp/xp/ie_impGraphic_BMP.cpp 2009-06-25 04:02:06.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp 2011-03-01 20:09:04.810810063 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,7 +191,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Clean Up Memory Used */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FREEP(m_pPNGInfo->palette);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// FREEP(m_pPNGInfo->palette);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DELETEP(pBB);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -313,7 +313,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * the normal method of doing things with libpng). REQUIRED unless you
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * set up your own error handlers in the png_create_read_struct() earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(m_pPNG->jmpbuf))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(m_pPNG)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Free all of the memory associated with the png_ptr and info_ptr */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -332,7 +332,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Reset error handling for libpng */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(m_pPNG->jmpbuf))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(m_pPNG)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return UT_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -372,7 +372,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Reset error handling for libpng */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(m_pPNG->jmpbuf))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(m_pPNG)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return UT_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- plugins/garble/xp/abiword-garble-png.cpp 2009-09-05 15:34:44.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plugins/garble/xp/abiword-garble-png.cpp 2011-03-01 19:39:57.591809416 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,7 +79,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_strip_alpha( png_ptr );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_interlace_handling( png_ptr );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_bgr( png_ptr );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rowbytes = info_ptr->rowbytes;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rowbytes = png_get_rowbytes(png_ptr, info_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/af/gr/win/gr_Win32Image.cpp 2009-07-08 17:33:53.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/af/gr/win/gr_Win32Image.cpp 2011-03-01 18:01:21.651747071 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,7 +148,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- info_ptr = png_create_info_struct(png_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // libpng will longjmp back to here if a fatal error occurs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(png_ptr->jmpbuf))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(png_ptr)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If we get here, we had a problem reading the file */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -547,7 +547,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * the normal method of doing things with libpng). REQUIRED unless you
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * set up your own error handlers in the png_create_read_struct() earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(png_ptr->jmpbuf))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(png_ptr)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Free all of the memory associated with the png_ptr and info_ptr */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/wp/impexp/win/ie_impGraphic_Win32Native.cpp 2009-07-07 16:50:18.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/wp/impexp/win/ie_impGraphic_Win32Native.cpp 2011-03-01 19:04:51.469746321 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -405,7 +405,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Clean Up Memory Used */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FREEP(m_pPNGInfo->palette);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// FREEP(m_pPNGInfo->palette);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return UT_OK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -501,7 +501,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * the normal method of doing things with libpng). REQUIRED unless you
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * set up your own error handlers in the png_create_read_struct() earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(m_pPNG->jmpbuf))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(m_pPNG)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Free all of the memory associated with the png_ptr and info_ptr */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -520,7 +520,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UT_Error IE_ImpGraphic_Win32Native::Convert_BMP_Palette(UT_ByteBuf* pBB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Reset error handling for libpng */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(m_pPNG->jmpbuf))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(m_pPNG)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return UT_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -560,7 +560,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UT_Error IE_ImpGraphic_Win32Native::Convert_BMP(UT_ByteBuf* pBB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Reset error handling for libpng */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(m_pPNG->jmpbuf))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(m_pPNG)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return UT_ERROR;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/abiword-x11/files/patch-src-Makefile.in.diff b/editors/abiword-x11/files/patch-src-Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0135c80..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/abiword-x11/files/patch-src-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in.orig 2010-06-13 16:17:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2012-07-27 16:56:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -503,7 +503,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(WP_CPPFLAGS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) --no-undefined -avoid-version \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) -no-undefined -avoid-version \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -export-dynamic $(am__append_6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libabiword_2_8_la_LIBADD = $(opt_libs) plugins/libplugins.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- text/fmt/xp/libxp.la text/ptbl/xp/libxp.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -538,7 +538,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @TOOLKIT_COCOA_TRUE@AbiWord_LDFLAGS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @TOOLKIT_COCOA_TRUE@ $(DEPS_LIBS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@TOOLKIT_COCOA_TRUE@ --no-undefined \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@TOOLKIT_COCOA_TRUE@ -no-undefined \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @TOOLKIT_COCOA_TRUE@ -avoid-version \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @TOOLKIT_COCOA_TRUE@ -export-dynamic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @TOOLKIT_COCOA_TRUE@ -headerpad_max_install_names
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -554,7 +554,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @TOOLKIT_COCOA_FALSE@abiword_LDFLAGS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @TOOLKIT_COCOA_FALSE@ $(platform_ldflags) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@TOOLKIT_COCOA_FALSE@ --no-undefined \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@TOOLKIT_COCOA_FALSE@ -no-undefined \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @TOOLKIT_COCOA_FALSE@ -avoid-version \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @TOOLKIT_COCOA_FALSE@ -export-dynamic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>