<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/db4f229dd24d6620cc1743e13b99126d2f271da1">https://github.com/macports/macports-ports/commit/db4f229dd24d6620cc1743e13b99126d2f271da1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit db4f229dd24d6620cc1743e13b99126d2f271da1
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Mon Apr 22 14:50:41 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> abiword-x11: update to 3.0.5, allow building on < 10.9
</span>---
editors/abiword-x11/Portfile | 54 ++++++++++++++++--------
editors/abiword-x11/files/patch-configure.diff | 10 ++---
editors/abiword-x11/files/patch-new-libxml2.diff | 10 +++++
3 files changed, 51 insertions(+), 23 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 8cf992a5f64..eb4007f984f 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;'>@@ -2,6 +2,7 @@
</span>
PortSystem 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gitlab 1.0
</span> PortGroup gobject_introspection 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,33 +11,37 @@ legacysupport.newest_darwin_requires_legacy 15
</span>
name abiword-x11
set dname abiword
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.instance https://gitlab.gnome.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup World AbiWord 3.0.5 release-
</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}
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
categories editors textproc gnome
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.abisource.com/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://www.abisource.com/downloads/${dname}/${version}/source \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.nl.abisource.com/downloads/${dname}/${version}/source
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cd7eaf6c89b44f094c70b1700158b3ef2844c5a4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11064305
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${dname}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3f12d41a9f29dfc7e735bb7201af5bf5be0d292f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 88c6fb62b8823a93161cc9b260eecfb83bf764d8bf3ed7ccc365e2097619b3b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7851899
</span>
patchfiles patch-configure.diff \
patch-abs.diff \
c++11.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.com/inkscape/inbox/-/issues/9885
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-new-libxml2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ./autogen.sh
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:desktop-file-utils \
</span> port:enchant \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:evolution-data-server \
</span> port:goffice \
path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
path:lib/pkgconfig/icu-uc.pc:icu \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,13 +72,26 @@ configure.args --disable-default-plugins \
</span> --enable-clipart=yes \
--enable-templates=yes \
--with-boost=[boost::install_area] \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-champlain=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-champlain=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-evolution-data-server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant evolution description "Enable Evolution data server" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:evolution-data-server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-evolution-data-server \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-evolution-data-server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Do not make it the default on older OS, for now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/69798
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {(${os.platform} eq "darwin" && ${os.major} > 12) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || ${os.platform} ne "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +evolution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-activate {
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://www.abisource.com/downloads/${dname}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ">(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)/<"
</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 a21a0dacfa1..438cddc4945 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,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2010-09-23 10:03:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2010-09-23 10:04:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17456,10 +17456,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for platform and toolkit" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "checking for platform and toolkit... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac 2021-07-03 23:46:07.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2024-04-22 03:05:02.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,10 +148,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TOOLKIT_IS_GTK2="no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for platform and toolkit])
</span> case ${host_os} in
- *darwin*)
- PLATFORM="unix"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/abiword-x11/files/patch-new-libxml2.diff b/editors/abiword-x11/files/patch-new-libxml2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d7ec035e04e
</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-new-libxml2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/af/util/xp/ut_stringbuf.cpp 2021-07-03 23:46:07.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/af/util/xp/ut_stringbuf.cpp 2024-04-22 04:14:19.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <algorithm>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <libxml/xmlmemory.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libxml/uri.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib.h>
</span></pre><pre style='margin:0'>
</pre>