diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 7bfe6dd53aee..2b39d4cce581 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,170 +1,169 @@ # 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 MAINTAINER= gnome@FreeBSD.org COMMENT= Open-source, cross-platform WYSIWYG word processor LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libpopt.so:devel/popt \ libpng.so:graphics/png \ libwv.so:textproc/wv \ libfribidi.so:converters/fribidi \ libgoffice-0.10.so:devel/goffice RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu USES= compiler:c++11-lang desktop-file-utils gmake gnome iconv jpeg \ libtool pathfix pkgconfig USE_GNOME= libxml2 gtk30 librsvg2 libxslt GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --without-gnomevfs --enable-plugins="${ABIWORD_PLUGINS}" \ --enable-shared="yes" --enable-static="no" USE_LDCONFIG= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip PLIST_SUB+= ABIVERSION=3.0 OPTIONS_DEFINE= CLIPART DEBUG MATHVIEW NLS PSION \ TEMPLATES WP OPTIONS_DEFAULT=CLIPART COLSERVICE COLSUGAR COLTCP SPELLCHECK TEMPLATES OPTIONS_SUB= yes OPTIONS_GROUP= DICT COLLAB OPTIONS_GROUP_DICT= GRAMMAR SPELLCHECK OPTIONS_GROUP_COLLAB= COLFAKE COLSERVICE COLSIP COLSUGAR COLTCP COLTELEPATHY COLXMPP CLIPART_DESC= Include clipart COLLAB_DESC= Collaboration backend COLFAKE_DESC= Fake collaboration for debugging purposes only COLSERVICE_DESC= Collaborate with AbiCollab.net webservice COLSIP_DESC= Collaborate with the SIP/SIMPLE backend COLSUGAR_DESC= Collaborate with the Sugar/OLPC environment COLTCP_DESC= Collaborate with direct TCP peer to peer connections COLTELEPATHY_DESC= Collaborate with the Telepathy backend (experimental) COLXMPP_DESC= Collaborate with the Jabber/XMPP backend DICT_DESC= Spelling and grammar checking GRAMMAR_DESC= Grammar checking plugin MATHVIEW_DESC= MathML render plugin PSION_DESC= Psion 5(MX) files convertion plugin SPELLCHECK_DESC= Spell checking support TEMPLATES_DESC= Include additional templates WP_DESC= WordPerfect img/doc import/export plugin # check configure for ALL_PLUGINS for complete list ABIWORD_PLUGINS= garble loadbindings opml xslfo bmp iscii sdw babelfish \ paint command latex pdf wikipedia hrtext openxml \ goffice wmf kword mif wml s5 freetranslation gdict mht \ applix t602 docbook google eml hancom presentation \ clarisworks pdb urldict openwriter mswrite gimp \ passepartout eml # opendocument enabled by default, rsvg plugin isn't needed on unix. # Plugins we don't support: # gda CLIPART_CONFIGURE_ENABLE= clipart COLFAKE_CONFIGURE_ENABLE= collab-backend-fake COLSERVICE_CONFIGURE_ENABLE= collab-backend-service COLSERVICE_BUILD_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio COLSERVICE_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libgnutls.so:security/gnutls COLSERVICE_RUN_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio COLSIP_CONFIGURE_ENABLE= collab-backend-sip COLSUGAR_CONFIGURE_ENABLE= collab-backend-sugar COLSUGAR_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib COLTCP_CONFIGURE_ENABLE= collab-backend-tcp COLTCP_BUILD_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio COLTCP_RUN_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio COLTELEPATHY_CONFIGURE_ENABLE= collab-backend-telepathy COLTELEPATHY_LIB_DEPENDS= libtelepathy-glib.so:net-im/telepathy-glib COLXMPP_CONFIGURE_ENABLE= collab-backend-xmpp COLXMPP_LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth DEBUG_CONFIGURE_ENABLE= debug GRAMMAR_LIB_DEPENDS= liblink-grammar.so:textproc/link-grammar GRAMMAR_IMPLIES= SPELLCHECK MATHVIEW_USES= bison MATHVIEW_LIB_DEPENDS= libmathview.so:x11-toolkits/gtkmathview NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls PSION_LIB_DEPENDS= libpsiconv.so:converters/psiconv SPELLCHECK_LIB_DEPENDS= libenchant.so:textproc/enchant SPELLCHECK_CONFIGURE_ENABLE= spell TEMPLATES_CONFIGURE_ENABLE= templates WP_USE= gnome=libgsf WP_LIB_DEPENDS= libwpg-0.3.so:graphics/libwpg03 \ libwpd-0.10.so:textproc/libwpd010 \ libwps-0.4.so:textproc/libwps .include .if ${PORT_OPTIONS:MCOL*} PLIST_SUB+= COLLAB="" ABIWORD_PLUGINS+= collab .else PLIST_SUB+= COLLAB="@comment " .endif .if ${PORT_OPTIONS:MGRAMMAR} ABIWORD_PLUGINS+= grammar .endif .if ${PORT_OPTIONS:MMATHVIEW} ABIWORD_PLUGINS+= mathview .endif .if ${PORT_OPTIONS:MPSION} ABIWORD_PLUGINS+= psion .endif .if ${PORT_OPTIONS:MWP} ABIWORD_PLUGINS+= wpg wordperfect .endif post-patch: @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ ${WRKSRC}/goffice-bits/goffice/app/goffice-app.h \ ${WRKSRC}/src/af/util/xp/ut_go_file.h # The following substitutions ensure that plugins are linked with libabiword # from the work or stage directory instead of a previously installed library. # In pseudo code: # s,PLUGIN_LIBS="$PLUGIN_LIBS -Lsrc -labiword", # PLUGIN_LIBS="src/libabiword.la $PLUGIN_LIBS", # s,foo_LIBS="$foo_LIBS $PLUGIN_LIBS", # foo_LIBS="$PLUGIN_LIBS $foo_LIBS", # The initial value of PLUGIN_LIBS may contain -L/usr/local/lib so it would # have to come after -Lsrc, but -Lsrc is not correct when libtool relinks # plugins during staging so use src/libabiword.la and let libtool figure out # what flags are needed. Secondly, switch around foo_LIBS and PLUGIN_LIBS # because foo_LIBS may contain -L/usr/local/lib. @${REINPLACE_CMD} \ -e "s,\$$PLUGIN_LIBS \"'-L\$${top_builddir}/src'\" -labiword-\$$ABIWORD_SERIES,\\\\\$${top_builddir}/src/libabiword-\$$ABIWORD_SERIES.la \$$PLUGIN_LIBS," \ -e "/_LIBS=/s,\"\\(.*\\)\"\\('\$${PLUGIN_LIBS}.*'\\),\\2\" \\1\"," \ -e 's|" == "|" = "|g' ${WRKSRC}/configure .include 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,11 +1,11 @@ ---- 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 -MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab; +MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab; Name=AbiWord GenericName=Word Processor Comment=Compose, edit, and view documents 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,49 +1,40 @@ ---- 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 -wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" +wpg_pkgs="libwpg-0.3 $gsf_req" 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}' -COLLAB_LIBS="$COLLAB_LIBS "'${PLUGIN_LIBS}' +COLLAB_LIBS='${PLUGIN_LIBS}'" $COLLAB_LIBS " fi # plugin conditional -@@ -25939,8 +25939,8 @@ +@@ -26311,8 +26311,8 @@ fi -wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" -wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' +wordperfect_pkgs="libwpd-0.10 $gsf_req" +wordperfect_wps_pkgs='libwps-0.4' 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 - wp_deps_pkgs="$wp_deps_pkgs $wordperfect_wps_pkgs" + wp_deps_pkgs="$wordperfect_wps_pkgs $wp_deps_pkgs" WPS_DEFINE=" -DHAVE_LIBWPS" fi 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 -