editors/abiword: Update to 3.0.5

5 files changed, 13 insertions, 59 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 7bfe6dd53aee..2b39d4cce581 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,8 +1,7 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	abiword
-PORTVERSION=	3.0.4
-PORTREVISION=	1
+PORTVERSION=	3.0.5
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
 DIST_SUBDIR=	AbiWord
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 65da0807ad60..96efd33e6943 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607614164
-SHA256 (AbiWord/abiword-3.0.4.tar.gz) = e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7
-SIZE (AbiWord/abiword-3.0.4.tar.gz) = 11064305
+TIMESTAMP = 1630554026
+SHA256 (AbiWord/abiword-3.0.5.tar.gz) = 1257247e9970508d6d1456d3e330cd1909c4b42b25e0f0a1bc32526d6f3a21b4
+SIZE (AbiWord/abiword-3.0.5.tar.gz) = 11084159
diff --git a/editors/abiword/files/patch-abiword.desktop b/editors/abiword/files/patch-abiword.desktop
index fe25175de8c8..c836791fcfe4 100644
--- a/editors/abiword/files/patch-abiword.desktop
+++ b/editors/abiword/files/patch-abiword.desktop
@@ -1,6 +1,6 @@
---- abiword.desktop.orig	2010-04-14 23:50:18.000000000 +0200
-+++ abiword.desktop	2010-05-22 09:08:45.000000000 +0200
-@@ -6,7 +6,7 @@
+--- abiword.desktop.orig	2021-07-03 15:46:07 UTC
++++ abiword.desktop
+@@ -6,7 +6,7 @@ Type=Application
  Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
  StartupNotify=true
  X-Desktop-File-Install-Version=0.9
diff --git a/editors/abiword/files/patch-configure b/editors/abiword/files/patch-configure
index 08c2c49b959d..294944d6ce3a 100644
--- a/editors/abiword/files/patch-configure
+++ b/editors/abiword/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2019-11-27 02:22:30.000000000 +0100
-+++ configure	2020-12-13 23:23:09.835350000 +0100
-@@ -22697,7 +22697,7 @@
+--- configure.orig	2021-07-03 15:48:11 UTC
++++ configure
+@@ -23069,7 +23069,7 @@ fi
  
  
  
@@ -9,16 +9,7 @@
  wpg_deps="no"
  
  if test "$enable_wpg" != ""; then
-@@ -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 @@
+@@ -23820,7 +23820,7 @@ fi
  test "$enable_collab" = "auto" && PLUGINS="$PLUGINS collab"
  
  COLLAB_CFLAGS="$COLLAB_CFLAGS "'${PLUGIN_CFLAGS}'
@@ -27,7 +18,7 @@
  
  fi # plugin conditional
  
-@@ -25939,8 +25939,8 @@
+@@ -26311,8 +26311,8 @@ fi
  
  
  
@@ -38,7 +29,7 @@
  wordperfect_deps="no"
  
  WORDPERFECT_CFLAGS=
-@@ -25983,7 +25983,7 @@
+@@ -26355,7 +26355,7 @@ if test -n "$PKG_CONFIG" && \
    $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
deleted file mode 100644
index dd8bbe4b56d3..000000000000
--- a/editors/abiword/files/patch-git-699705dc1c91f41ea11eed4facb2d3756d899eec.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 699705dc1c91f41ea11eed4facb2d3756d899eec Mon Sep 17 00:00:00 2001
-From: Julian Sikorski <belegdol@fedoraproject.org>
-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 <hub@figuiere.net>
----
- 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
-