abiword-x11: update to 3.0.5, allow building on < 10.9

esafak · Apr 22, 2024 · db4f229 · db4f229
1 parent f11ba87
commit db4f229
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 23 deletions.
diff --git a/editors/abiword-x11/Portfile b/editors/abiword-x11/Portfile
@@ -2,6 +2,7 @@
 
 PortSystem          1.0
 PortGroup           boost 1.0
+PortGroup           gitlab 1.0
 PortGroup           gobject_introspection 1.0
 PortGroup           legacysupport 1.1
 
@@ -10,33 +11,37 @@ legacysupport.newest_darwin_requires_legacy 15
 
 name                abiword-x11
 set dname           abiword
-version             3.0.4
-revision            6
+gitlab.instance     https://gitlab.gnome.org
+gitlab.setup        World AbiWord 3.0.5 release-
+revision            0
 
 license             GPL-2+
 description         A word processor with Gnome support.
 long_description    ${description}
 maintainers         {@barracuda156 gmail.com:vital.had} openmaintainer
 categories          editors textproc gnome
-homepage            https://www.abisource.com/
-master_sites        https://www.abisource.com/downloads/${dname}/${version}/source \
-                    http://www.nl.abisource.com/downloads/${dname}/${version}/source
 
-checksums           rmd160  cd7eaf6c89b44f094c70b1700158b3ef2844c5a4 \
-                    sha256  e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7 \
-                    size    11064305
-
-distname            ${dname}-${version}
+checksums           rmd160  3f12d41a9f29dfc7e735bb7201af5bf5be0d292f \
+                    sha256  88c6fb62b8823a93161cc9b260eecfb83bf764d8bf3ed7ccc365e2097619b3b3 \
+                    size    7851899
 
 patchfiles          patch-configure.diff \
                     patch-abs.diff \
                     c++11.patch
 
-depends_build       port:pkgconfig
+# https://gitlab.com/inkscape/inbox/-/issues/9885
+patchfiles-append   patch-new-libxml2.diff
+
+configure.cmd      ./autogen.sh
 
-depends_lib         port:desktop-file-utils \
+depends_build-append \
+                    port:autoconf \
+                    port:automake \
+                    port:libtool \
+                    port:pkgconfig
+
+depends_lib-append  port:desktop-file-utils \
                     port:enchant \
-                    port:evolution-data-server \
                     port:goffice \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
                     path:lib/pkgconfig/icu-uc.pc:icu \
@@ -67,13 +72,26 @@ configure.args      --disable-default-plugins \
                     --enable-clipart=yes \
                     --enable-templates=yes \
                     --with-boost=[boost::install_area] \
-                    --with-champlain=no
+                    --with-champlain=no \
+                    --without-evolution-data-server
+
+variant evolution description "Enable Evolution data server" {
+    depends_lib-append \
+                    port:evolution-data-server
+    configure.args-replace \
+                    --without-evolution-data-server \
+                    --with-evolution-data-server
+}
+
+# Do not make it the default on older OS, for now.
+# https://trac.macports.org/ticket/69798
+if {(${os.platform} eq "darwin" && ${os.major} > 12) \
+    || ${os.platform} ne "darwin"} {
+    default_variants-append \
+                    +evolution
+}
 
 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"
 }
-
-livecheck.type      regex
-livecheck.url       https://www.abisource.com/downloads/${dname}/
-livecheck.regex     ">(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)/<"
diff --git a/editors/abiword-x11/files/patch-configure.diff b/editors/abiword-x11/files/patch-configure.diff
@@ -1,8 +1,8 @@
---- configure.orig	2010-09-23 10:03:49.000000000 -0700
-+++ configure	2010-09-23 10:04:57.000000000 -0700
-@@ -17456,10 +17456,10 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for platform and toolkit" >&5
- $as_echo_n "checking for platform and toolkit... " >&6; }
+--- configure.ac	2021-07-03 23:46:07.000000000 +0800
++++ configure.ac	2024-04-22 03:05:02.000000000 +0800
+@@ -148,10 +148,10 @@
+ TOOLKIT_IS_GTK2="no"
+ AC_MSG_CHECKING([for platform and toolkit])
  case ${host_os} in
 -  *darwin*)
 -    PLATFORM="unix"

diff --git a/editors/abiword-x11/files/patch-new-libxml2.diff b/editors/abiword-x11/files/patch-new-libxml2.diff
@@ -0,0 +1,10 @@
+--- src/af/util/xp/ut_stringbuf.cpp	2021-07-03 23:46:07.000000000 +0800
++++ src/af/util/xp/ut_stringbuf.cpp	2024-04-22 04:14:19.000000000 +0800
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <algorithm>
+
++#include <libxml/xmlmemory.h>
+ #include <libxml/uri.h>
+
+ #include <glib.h>