Index: Makefile =================================================================== --- Makefile (revision 524458) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= abiword -PORTVERSION= 3.0.1 -PORTREVISION= 16 +PORTVERSION= 3.0.4 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/ DIST_SUBDIR= AbiWord @@ -19,12 +18,23 @@ libpng.so:graphics/png \ libwv.so:textproc/wv \ libfribidi.so:converters/fribidi \ - libgoffice-0.10.so:devel/goffice + libgoffice-0.10.so:devel/goffice \ + libdbus-1.so:devel/dbus \ + libgpg-error.so:security/libgpg-error \ + libgcrypt.so:security/libgcrypt \ + libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig \ + librasqal.so:textproc/rasqal \ + librdf.so:textproc/redland \ + libraptor2.so:textproc/raptor2 \ + libical.so:devel/libical \ + libwmf.so:graphics/libwmf 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 +USES= compiler:c++17-lang desktop-file-utils gmake gnome iconv jpeg \ + libtool pathfix pkgconfig readline +USE_GNOME= libxml2 cairo gtk30 librsvg2 libxslt +USE_XORG+= x11 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -148,9 +158,6 @@ .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: Index: distinfo =================================================================== --- distinfo (revision 524458) +++ distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (AbiWord/abiword-3.0.1.tar.gz) = e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6 -SIZE (AbiWord/abiword-3.0.1.tar.gz) = 11144990 +TIMESTAMP = 1580095743 +SHA256 (AbiWord/abiword-3.0.4.tar.gz) = e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7 +SIZE (AbiWord/abiword-3.0.4.tar.gz) = 11064305 Index: files/patch-abiword.desktop =================================================================== --- files/patch-abiword.desktop (revision 524458) +++ files/patch-abiword.desktop (working copy) @@ -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 2019-04-03 21:21:51 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 Index: files/patch-c++11 =================================================================== --- files/patch-c++11 (revision 524458) +++ files/patch-c++11 (nonexistent) @@ -1,100 +0,0 @@ -xap_Dialog.cpp:270:17: error: cast from pointer to smaller type 'char' loses information - *pWindowName = (char) NULL; - ^~~~~~~~~~~ -ap_UnixApp.cpp:866:29: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] - if(0 == strcmp (suffix, "."G_MODULE_SUFFIX)) - ^ -ie_exp_XSL-FO.cpp:1454:13: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] - buf += " "x"=\""; \ - ^ -ie_exp_LaTeX.cpp:1332:43: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] -#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true; - ^ -RealmProtocol.cpp:16:2: error: constant expression evaluates to -1 which cannot be narrowed to type 'uint32_t' (aka 'unsigned int') [-Wc++11-narrowing] - RPV1_PACKET_VARIABLE, /* user joined */ - ^~~~~~~~~~~~~~~~~~~~ -RealmProtocol.cpp:10:30: note: expanded from macro 'RPV1_PACKET_VARIABLE' -#define RPV1_PACKET_VARIABLE -1 - ^~ -RealmProtocol.cpp:16:2: note: insert an explicit cast to silence this issue - RPV1_PACKET_VARIABLE, /* user joined */ - ^~~~~~~~~~~~~~~~~~~~ - static_cast( ) -RealmProtocol.cpp:10:30: note: expanded from macro 'RPV1_PACKET_VARIABLE' -#define RPV1_PACKET_VARIABLE -1 - ^~ -soa_soup.cpp:166:11: error: no viable conversion from returned value of type 'soa::GenericPtr' (aka 'shared_ptr') to function return type 'bool' - return soa::GenericPtr(); - ^~~~~~~~~~~~~~~~~ - -https://github.com/AbiWord/abiword/commit/a83e6f50dbd5 -https://github.com/AbiWord/abiword/commit/5623a94c756c - ---- plugins/collab/backends/service/xp/RealmProtocol.cpp.orig 2009-05-27 05:41:59 UTC -+++ plugins/collab/backends/service/xp/RealmProtocol.cpp -@@ -6,8 +6,8 @@ namespace protocolv1 { - - #define MAX_PACKET_DATA_SIZE 64*1024*1024 - --#define RPV1_PACKET_NONEXISTENT -2 --#define RPV1_PACKET_VARIABLE -1 -+#define RPV1_PACKET_NONEXISTENT uint32_t(-2) -+#define RPV1_PACKET_VARIABLE uint32_t(-1) - - static uint32_t body_size[6] = { - RPV1_PACKET_NONEXISTENT, /* 0: reserved */ ---- plugins/collab/backends/service/xp/soa_soup.cpp.orig 2009-09-29 13:58:11 UTC -+++ plugins/collab/backends/service/xp/soa_soup.cpp -@@ -163,7 +163,7 @@ namespace soup_soa { - - static bool _invoke(const std::string& /*url*/, const soa::method_invocation& /*mi*/, SoaSoupSession& sess, std::string& result) { - if (!sess.m_session || !sess.m_msg ) -- return soa::GenericPtr(); -+ return false; - - guint status = soup_session_send_message (sess.m_session, sess.m_msg); - if (!(SOUP_STATUS_IS_SUCCESSFUL (status) || ---- plugins/latex/xp/ie_exp_LaTeX.cpp.orig 2013-04-07 13:53:03 UTC -+++ plugins/latex/xp/ie_exp_LaTeX.cpp -@@ -1329,7 +1329,7 @@ void s_LaTeX_Listener::_outputData(const UT_UCSChar * - m_pie->write(sBuf.c_str(),sBuf.size()); - } - --#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true; -+#define SUB(a,who) case a: subst = "\\(\\" who"\\)"; return true; - #define SUBd(a,who) case a: subst = who; return true; - static bool _convertLettersToSymbols(char c, const char *& subst) - { ---- plugins/xslfo/xp/ie_exp_XSL-FO.cpp.orig 2013-04-07 13:53:03 UTC -+++ plugins/xslfo/xp/ie_exp_XSL-FO.cpp -@@ -1451,7 +1451,7 @@ void s_XSL_FO_Listener::_openSection(PT_AttrPropIndex - { \ - UT_UTF8String esc = szValue; \ - esc.escapeXML(); \ -- buf += " "x"=\""; \ -+ buf += " " x"=\""; \ - buf += esc.utf8_str(); \ - buf += "\""; \ - } ---- src/af/xap/xp/xap_Dialog.cpp.orig 2013-04-07 13:53:03 UTC -+++ src/af/xap/xp/xap_Dialog.cpp -@@ -267,7 +267,7 @@ XAP_Dialog_Modeless::BuildWindowName(char * pWindowNam - // This function constructs and returns the window name of a modeless dialog by - // concatenating the active frame with the dialog name - -- *pWindowName = (char) NULL; -+ *pWindowName = '\0'; - UT_UTF8String wn = UT_UTF8String(pDialogName); - - XAP_Frame* pFrame = getActiveFrame(); ---- src/wp/ap/gtk/ap_UnixApp.cpp.orig 2013-04-07 13:53:03 UTC -+++ src/wp/ap/gtk/ap_UnixApp.cpp -@@ -863,7 +863,7 @@ static bool is_so (const char *file) { - if (len < (strlen(G_MODULE_SUFFIX) + 2)) // this is ".so" and at least one char for the filename - return false; - const char *suffix = file+(len-3); -- if(0 == strcmp (suffix, "."G_MODULE_SUFFIX)) -+ if(0 == strcmp (suffix, "." G_MODULE_SUFFIX)) - return true; - return false; - } Property changes on: files/patch-c++11 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-configure =================================================================== --- files/patch-configure (revision 524458) +++ files/patch-configure (working copy) @@ -1,15 +1,15 @@ ---- 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 2020-01-27 15:58:12 UTC ++++ configure +@@ -22697,7 +22697,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_pkgs="$gsf_req libwpg-0.3" wpg_deps="no" if test "$enable_wpg" != ""; then -@@ -24341,8 +24341,8 @@ +@@ -25939,8 +25939,8 @@ fi @@ -20,7 +20,7 @@ wordperfect_deps="no" WORDPERFECT_CFLAGS= -@@ -24385,7 +24385,7 @@ +@@ -25983,7 +25983,7 @@ if test -n "$PKG_CONFIG" && \ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then Index: files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp =================================================================== --- files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp (revision 524458) +++ files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp (working copy) @@ -1,24 +0,0 @@ ---- plugins/collab/backends/service/xp/tls_tunnel.cpp.orig 2014-11-04 01:12:14 UTC -+++ plugins/collab/backends/service/xp/tls_tunnel.cpp -@@ -306,8 +306,6 @@ void Proxy::tunnel_(transport_ptr_t tran - disconnect_(transport_ptr, session_ptr, local_socket_ptr, remote_socket_ptr); - } - --static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 }; --static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 }; - - // FIXME: this clientproxy can only handle 1 SSL connection at the same time - ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port, -@@ -399,9 +397,9 @@ session_ptr_t ClientProxy::setup_tls_ses - - // setup session - return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t()); -- return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t()); -- return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t()); -- return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t()); -+ return_val_if_neg(gnutls_priority_set_direct(*session_ptr,"NORMAL" -+ ":-CIPHER-ALL:+AES-256-CBC:+AES-128-CBC:+3DES-CBC:+ARCFOUR-128" -+ ":-KX-ALL:+ANON-DH:+RSA:+DHE-DSS:+DHE-RSA",NULL), session_ptr_t()); - return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t()); - - // setup transport Index: files/patch-plugins_collab_backends_sipsimple_xp_SIPSimpleBuddy.h =================================================================== --- files/patch-plugins_collab_backends_sipsimple_xp_SIPSimpleBuddy.h (revision 524458) +++ files/patch-plugins_collab_backends_sipsimple_xp_SIPSimpleBuddy.h (nonexistent) @@ -1,15 +0,0 @@ ---- plugins/collab/backends/sipsimple/xp/SIPSimpleBuddy.h.orig 2015-04-04 04:57:15 UTC -+++ plugins/collab/backends/sipsimple/xp/SIPSimpleBuddy.h -@@ -52,10 +52,10 @@ public: - - virtual const DocTreeItem* getDocTreeItems() const - { -- const vector& docHandles = getDocHandles(); -+ const std::vector& docHandles = getDocHandles(); - DocTreeItem* first = 0; - DocTreeItem* prev = 0; -- for (vector::const_iterator pos = docHandles.begin(); pos != docHandles.end(); pos++) -+ for (std::vector::const_iterator pos = docHandles.begin(); pos != docHandles.end(); pos++) - { - DocTreeItem* item = new DocTreeItem(); - item->m_type = DOCTREEITEM_TYPE_DOCUMENT; Property changes on: files/patch-plugins_collab_backends_sipsimple_xp_SIPSimpleBuddy.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_af_util_xp_ut_iconv.cpp =================================================================== --- files/patch-src_af_util_xp_ut_iconv.cpp (revision 524458) +++ files/patch-src_af_util_xp_ut_iconv.cpp (nonexistent) @@ -1,15 +0,0 @@ ---- src/af/util/xp/ut_iconv.cpp.orig 2009-06-25 02:52:27.000000000 +0200 -+++ src/af/util/xp/ut_iconv.cpp 2009-10-27 22:43:07.000000000 +0100 -@@ -264,10 +264,10 @@ const char * ucs4Internal () - // we special-case the win32 build, otherwise spelling and other stuff - // just doesn't work - return "UCS-4LE"; --#elif defined(_LIBICONV_H) -+#elif defined(_LIBICONV_H) || defined(__FreeBSD__) - // libiconv seems to prefer UCS-4-INTERNAL to UCS-4BE and UCS-4LE - return "UCS-4-INTERNAL"; --#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) -+#elif defined(__OpenBSD__) || defined(__NetBSD__) - // we special case the BSDs since spelling just doesn't work - return "UCS4"; - #else Property changes on: files/patch-src_af_util_xp_ut_iconv.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp =================================================================== --- files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp (revision 524458) +++ files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp (nonexistent) @@ -1,26 +0,0 @@ ---- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig 2015-03-31 15:14:42 UTC -+++ src/text/ptbl/xp/pd_DocumentRDF.cpp -@@ -570,6 +570,11 @@ bool PD_URI::operator==(const std::strin - return m_value == b; - } - -+bool PD_URI::operator<(const PD_URI& b) const -+{ -+ return m_value < b.m_value; -+} -+ - PD_URI - PD_URI::prefixedToURI( PD_RDFModelHandle model ) const - { -@@ -611,11 +616,6 @@ bool PD_URI::write( std::ostream& ss ) c - return true; - } - --bool operator<( PD_URI a, PD_URI b) --{ -- return a.toString() < b.toString(); --} -- - bool operator<( std::pair< PD_URI, PD_URI > a, PD_URI b) - { - return a.first.toString() < b.toString(); Property changes on: files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_text_ptbl_xp_pd__DocumentRDF.h =================================================================== --- files/patch-src_text_ptbl_xp_pd__DocumentRDF.h (revision 524458) +++ files/patch-src_text_ptbl_xp_pd__DocumentRDF.h (nonexistent) @@ -1,10 +0,0 @@ ---- src/text/ptbl/xp/pd_DocumentRDF.h.orig 2015-03-31 15:15:00 UTC -+++ src/text/ptbl/xp/pd_DocumentRDF.h -@@ -68,6 +68,7 @@ class ABI_EXPORT PD_URI - bool isValid() const; - bool operator==(const PD_URI& b) const; - bool operator==(const std::string& b) const; -+ bool operator<(const PD_URI& b) const; - - virtual bool read( std::istream& ss ); - virtual bool write( std::ostream& ss ) const; Property changes on: files/patch-src_text_ptbl_xp_pd__DocumentRDF.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 524458) +++ pkg-plist (working copy) @@ -391,4 +391,5 @@ share/icons/hicolor/48x48/apps/abiword.png share/icons/hicolor/512x512/apps/abiword.png share/icons/hicolor/scalable/apps/abiword.svg +share/appdata/abiword.appdata.xml %%COLTELEPATHY%%share/telepathy/clients/AbiCollab.client