From owner-dev-commits-ports-main@freebsd.org Thu Sep 2 03:45:57 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E4D8B6774C3; Thu, 2 Sep 2021 03:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H0RfX2yqhz3NCt; Thu, 2 Sep 2021 03:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1566B12085; Thu, 2 Sep 2021 03:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1823jusr094112; Thu, 2 Sep 2021 03:45:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1823ju1U094111; Thu, 2 Sep 2021 03:45:56 GMT (envelope-from git) Date: Thu, 2 Sep 2021 03:45:56 GMT Message-Id: <202109020345.1823ju1U094111@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 45b70ea8d548 - main - editors/abiword: Update to 3.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45b70ea8d54825281b4e1a6ab851aa46464aad92 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Sep 2021 03:45:58 -0000 The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=45b70ea8d54825281b4e1a6ab851aa46464aad92 commit 45b70ea8d54825281b4e1a6ab851aa46464aad92 Author: Neel Chauhan AuthorDate: 2021-09-02 03:45:27 +0000 Commit: Neel Chauhan CommitDate: 2021-09-02 03:45:39 +0000 editors/abiword: Update to 3.0.5 --- editors/abiword/Makefile | 3 +- editors/abiword/distinfo | 6 ++-- editors/abiword/files/patch-abiword.desktop | 6 ++-- editors/abiword/files/patch-configure | 21 ++++--------- ...-699705dc1c91f41ea11eed4facb2d3756d899eec.patch | 36 ---------------------- 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 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 -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 -