diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 8aa8dfd0f91e..f8780f6c6cf9 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -3,6 +3,7 @@ PORTNAME= abiword PORTVERSION= 3.0.4 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/ DIST_SUBDIR= AbiWord diff --git a/editors/abiword/files/patch-configure b/editors/abiword/files/patch-configure index eace97120bb9..08c2c49b959d 100644 --- a/editors/abiword/files/patch-configure +++ b/editors/abiword/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2014-12-23 06:13:20.000000000 +0100 -+++ configure 2016-01-26 21:22:33.585049000 +0100 -@@ -23915,7 +23915,7 @@ +--- configure.orig 2019-11-27 02:22:30.000000000 +0100 ++++ configure 2020-12-13 23:23:09.835350000 +0100 +@@ -22697,7 +22697,7 @@ @@ -9,7 +9,25 @@ wpg_deps="no" if test "$enable_wpg" != ""; then -@@ -24341,8 +24341,8 @@ +@@ -23424,7 +23424,7 @@ + COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_SUGAR" + fi + if test "$enable_collab_backend_service" = "yes"; then +- COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_SERVICE -DSOUP24" ++ COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_SERVICE -DSOUP24 -DASIO_ENABLE_BOOST" + COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_SERVICE" + fi + if test "$enable_collab_backend_sipsimple" = "yes"; then +@@ -23448,7 +23448,7 @@ + test "$enable_collab" = "auto" && PLUGINS="$PLUGINS collab" + + COLLAB_CFLAGS="$COLLAB_CFLAGS "'${PLUGIN_CFLAGS}' +-COLLAB_LIBS="$COLLAB_LIBS "'${PLUGIN_LIBS}' ++COLLAB_LIBS='${PLUGIN_LIBS}'" $COLLAB_LIBS " + + fi # plugin conditional + +@@ -25939,8 +25939,8 @@ @@ -20,7 +38,7 @@ wordperfect_deps="no" WORDPERFECT_CFLAGS= -@@ -24385,7 +24385,7 @@ +@@ -25983,7 +25983,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then diff --git a/editors/abiword/files/patch-git-699705dc1c91f41ea11eed4facb2d3756d899eec.patch b/editors/abiword/files/patch-git-699705dc1c91f41ea11eed4facb2d3756d899eec.patch new file mode 100644 index 000000000000..dd8bbe4b56d3 --- /dev/null +++ b/editors/abiword/files/patch-git-699705dc1c91f41ea11eed4facb2d3756d899eec.patch @@ -0,0 +1,36 @@ +From 699705dc1c91f41ea11eed4facb2d3756d899eec Mon Sep 17 00:00:00 2001 +From: Julian Sikorski +Date: Sat, 14 Mar 2020 14:06:34 +0100 +Subject: [PATCH] Issue #3 - Define ASIO_ENABLE_BOOST when building collab + plugin +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is needed for asio-1.14.0 or later as it defaults to +ASIO_STANDALONE if C++11 or later is detected: +https://github.com/chriskohlhoff/asio/commit/265e75cdbba739b1b1e3a46b283eaee3b9c60fe8 + +https://gitlab.gnome.org/World/AbiWord/issues/3 + +Signed-off-by: Hubert Figuière +--- + plugins/collab/plugin.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/collab/plugin.m4 b/plugins/collab/plugin.m4 +index 7cfe3a138..a8a32c074 100644 +--- plugins/collab/plugin.m4 ++++ plugins/collab/plugin.m4 +@@ -201,7 +201,7 @@ if test "$enable_collab_backend_sugar" = "yes"; then + COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_SUGAR" + fi + if test "$enable_collab_backend_service" = "yes"; then +- COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_SERVICE -DSOUP24" ++ COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_SERVICE -DSOUP24 -DASIO_ENABLE_BOOST" + COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_SERVICE" + fi + if test "$enable_collab_backend_sipsimple" = "yes"; then +-- +GitLab +