<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/a0d153fe397d0c2ae26423a78f442e8a950949d5">https://github.com/macports/macports-ports/commit/a0d153fe397d0c2ae26423a78f442e8a950949d5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a0d153fe397 abiword-x11: update version 3.0.2->3.0.4
</span>a0d153fe397 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a0d153fe397d0c2ae26423a78f442e8a950949d5
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Mar 24 23:18:08 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> abiword-x11: update version 3.0.2->3.0.4
</span>---
editors/abiword-x11/Portfile | 12 ++++-----
editors/abiword-x11/files/patch-abs.diff | 19 ++++++++++++++
editors/abiword-x11/files/patch-configure.diff | 2 +-
.../abiword-x11/files/patch-jpeg_read_header.diff | 29 ----------------------
4 files changed, 26 insertions(+), 36 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 8570c860f99..6894ebebcf2 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;'>@@ -6,8 +6,8 @@ PortGroup gobject_introspection 1.0
</span>
name abiword-x11
set dname abiword
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.4
</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;'>@@ -18,14 +18,14 @@ 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 fde551492b0cffa7d522082906f374490bd47f5c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11154333
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cd7eaf6c89b44f094c70b1700158b3ef2844c5a4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11064305
</span>
distname ${dname}-${version}
patchfiles patch-configure.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-jpeg_read_header.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-abs.diff \
</span> c++11.patch
depends_build port:pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/abiword-x11/files/patch-abs.diff b/editors/abiword-x11/files/patch-abs.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..65f648d4180
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/abiword-x11/files/patch-abs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/af/ev/gtk/ev_UnixMouse.cpp.orig 2019-11-26 18:22:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/af/ev/gtk/ev_UnixMouse.cpp 2021-03-24 20:43:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ev_EditEventMapper.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "xav_View.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gr_Graphics.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cmath>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EV_UnixMouse::EV_UnixMouse(EV_EditEventMapper * pEEM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : EV_Mouse(pEEM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -279,7 +280,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdouble delta_x, delta_y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delta_x = delta_y = 0.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (gdk_event_get_scroll_deltas((GdkEvent*)e, &delta_x, &delta_y)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (abs(delta_y) > abs(delta_x)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (std::abs(delta_y) > std::abs(delta_x)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // vertical
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dir = (delta_y > 0.0 ? GDK_SCROLL_DOWN : GDK_SCROLL_UP);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><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 8aacd802711..a21a0dacfa1 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;'>-@@ -17453,10 +17453,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17456,10 +17456,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-jpeg_read_header.diff b/editors/abiword-x11/files/patch-jpeg_read_header.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index df4af871158..00000000000
</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;'>+++ /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/af/util/xp/ut_jpeg.cpp.orig 2016-11-20 14:52:27.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/af/util/xp/ut_jpeg.cpp 2016-11-20 14:53:21.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -102,7 +102,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src->pub.next_input_byte = src->sourceBuf->getPointer (src->pos);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src->pub.bytes_in_buffer = src->sourceBuf->getLength ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return 1; // boolean is a libjpeg type that is an int.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (boolean)1; // boolean is a libjpeg type that is an int.
</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;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -161,7 +161,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* set the data source */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _JPEG_ByteBufSrc (&cinfo, pBB);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- jpeg_read_header(&cinfo, TRUE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ jpeg_read_header(&cinfo, (boolean)true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jpeg_start_decompress(&cinfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- iImageWidth = cinfo.output_width;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- iImageHeight = cinfo.output_height;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -189,7 +189,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* set the data source */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _JPEG_ByteBufSrc (&cinfo, pBB);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- jpeg_read_header(&cinfo, TRUE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ jpeg_read_header(&cinfo, (boolean)true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jpeg_start_decompress(&cinfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int row_stride = cinfo.output_width * cinfo.output_components;
</span></pre><pre style='margin:0'>
</pre>