From 840f8003a15b41dc9962011114109e24aed07ce5 Mon Sep 17 00:00:00 2001 From: nia Date: Sat, 24 Nov 2018 19:14:09 +0000 Subject: editors/abiword: Update to 3.0.2 Changes: Fixes in the core (all platforms) Various build fixes: Bug 13697, bug 13650, bug 13726, Bug 13753, Bug 13569 Various crash fixes: Bug 13716, Bug 13752, Bug 13807, Bug 13766 Various memory leaks fixes. Bug 13709 - Fix import of very long paragraphs. Gtk Fixes specific to the Gtk+ version Bug 13533 - Fix printing of SVG images. Bug 13722 - Fix scrolling in the Insert Symbol dialog. Bug 13729 - Make the available languages list expandable. Bug 13731 - Fix text rendering after an SVG image Bug 13662 - Never change an image resolution on scaling. Bug 13734 - Do not execute radio buttons events when unchecked. Bug 13736 - Properly iterate through the plugin arguments Fix SVG icon.) Fixed bug in the font chooser. Bug 13773 - Fix the ruler and background page theming on Gtk3. Ruler knobs no longer do "3D" on Gtk3. Bug 13762 Bug 13787 - Fix the table widget drawing AbiWord works better on Wayland: Bug 13766, Bug 13767 Import/Export Fixes in the OpenDocument importer / exporter Bug 13707 - Fixed paragraph export to Open Document. Bug 13706 - If needed apply default style for headers. OpenDocument: Fix a buffer overrun Plugins Fixes in the collaboration plugin Fix various build issues. Bug 13712, Bug 13754 and Bug 13742 --- editors/abiword/patches/patch-plugin-configure.m4 | 12 +- ...ns_collab_backends_service_xp_RealmProtocol.cpp | 18 --- ...lugins_collab_backends_service_xp_soa__soup.cpp | 16 --- ...gins_collab_backends_service_xp_tls__tunnel.cpp | 26 ---- ...ins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp | 150 --------------------- .../patch-plugins_latex_xp_ie__exp__LaTeX.cpp | 16 --- .../patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp | 16 --- .../patch-src_text_ptbl_xp_pd__DocumentRDF.cpp | 34 +---- .../patch-src_text_ptbl_xp_pd__DocumentRDF.h | 15 --- 9 files changed, 9 insertions(+), 294 deletions(-) delete mode 100644 editors/abiword/patches/patch-plugins_collab_backends_service_xp_RealmProtocol.cpp delete mode 100644 editors/abiword/patches/patch-plugins_collab_backends_service_xp_soa__soup.cpp delete mode 100644 editors/abiword/patches/patch-plugins_collab_backends_service_xp_tls__tunnel.cpp delete mode 100644 editors/abiword/patches/patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp delete mode 100644 editors/abiword/patches/patch-plugins_latex_xp_ie__exp__LaTeX.cpp delete mode 100644 editors/abiword/patches/patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp delete mode 100644 editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.h (limited to 'editors/abiword/patches') diff --git a/editors/abiword/patches/patch-plugin-configure.m4 b/editors/abiword/patches/patch-plugin-configure.m4 index 9654dd3fc1f..e17954c733f 100644 --- a/editors/abiword/patches/patch-plugin-configure.m4 +++ b/editors/abiword/patches/patch-plugin-configure.m4 @@ -1,10 +1,10 @@ -$NetBSD: patch-plugin-configure.m4,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-plugin-configure.m4,v 1.2 2018/11/24 19:14:09 nia Exp $ * adapt wordperfect plugins to dependecies available in pkgsrc from abiword svn date 2014-12-27 ---- plugin-configure.m4.orig 2014-12-23 05:13:14.000000000 +0000 +--- plugin-configure.m4.orig 2016-10-21 00:42:58.000000000 +0000 +++ plugin-configure.m4 -@@ -1355,7 +1355,7 @@ AC_SUBST([BMP_CFLAGS]) - AC_SUBST([BMP_LIBS]) +@@ -72,7 +72,7 @@ AC_SUBST([GRAMMAR_CFLAGS]) + AC_SUBST([GRAMMAR_LIBS]) -wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" @@ -12,8 +12,8 @@ $NetBSD: patch-plugin-configure.m4,v 1.1 2015/09/13 21:32:13 nros Exp $ wpg_deps="no" if test "$enable_wpg" != ""; then -@@ -1469,8 +1469,8 @@ AC_SUBST([AIKSAURUS_CFLAGS]) - AC_SUBST([AIKSAURUS_LIBS]) +@@ -962,8 +962,8 @@ AC_SUBST([XSLFO_CFLAGS]) + AC_SUBST([XSLFO_LIBS]) -wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" diff --git a/editors/abiword/patches/patch-plugins_collab_backends_service_xp_RealmProtocol.cpp b/editors/abiword/patches/patch-plugins_collab_backends_service_xp_RealmProtocol.cpp deleted file mode 100644 index b864d847ebe..00000000000 --- a/editors/abiword/patches/patch-plugins_collab_backends_service_xp_RealmProtocol.cpp +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-plugins_collab_backends_service_xp_RealmProtocol.cpp,v 1.1 2018/06/30 12:43:29 maya Exp $ - -Bug 13754 - Fix build on gcc-6 (default to C++11) -https://github.com/AbiWord/abiword/commit/a83e6f50dbd5efa16fb39efe32b9de370f103130 - ---- plugins/collab/backends/service/xp/RealmProtocol.cpp.orig 2009-05-27 05:41:59.000000000 +0000 -+++ 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 */ diff --git a/editors/abiword/patches/patch-plugins_collab_backends_service_xp_soa__soup.cpp b/editors/abiword/patches/patch-plugins_collab_backends_service_xp_soa__soup.cpp deleted file mode 100644 index 45fd11228cf..00000000000 --- a/editors/abiword/patches/patch-plugins_collab_backends_service_xp_soa__soup.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-plugins_collab_backends_service_xp_soa__soup.cpp,v 1.1 2018/06/30 12:43:29 maya Exp $ - -Bug 13754 - Fix build on gcc-6 (default to C++11). -https://github.com/AbiWord/abiword/commit/a83e6f50dbd5efa16fb39efe32b9de370f103130 - ---- plugins/collab/backends/service/xp/soa_soup.cpp.orig 2009-09-29 13:58:11.000000000 +0000 -+++ 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) || diff --git a/editors/abiword/patches/patch-plugins_collab_backends_service_xp_tls__tunnel.cpp b/editors/abiword/patches/patch-plugins_collab_backends_service_xp_tls__tunnel.cpp deleted file mode 100644 index 222fd1a6068..00000000000 --- a/editors/abiword/patches/patch-plugins_collab_backends_service_xp_tls__tunnel.cpp +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-plugins_collab_backends_service_xp_tls__tunnel.cpp,v 1.1 2016/09/27 12:00:51 wiz Exp $ - -Fix build with gnutls-3.5. -http://www.abisource.com/viewvc/abiword/branches/ABI-3-0-0-STABLE/plugins/collab/backends/service/xp/tls_tunnel.cpp?r1=35270&r2=35269&pathrev=35270 - ---- plugins/collab/backends/service/xp/tls_tunnel.cpp.orig 2014-11-04 01:12:14.000000000 +0000 -+++ plugins/collab/backends/service/xp/tls_tunnel.cpp -@@ -306,9 +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, - const std::string& ca_file, bool check_hostname) -@@ -400,8 +397,6 @@ 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_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t()); - - // setup transport diff --git a/editors/abiword/patches/patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp b/editors/abiword/patches/patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp deleted file mode 100644 index 95f74d947f2..00000000000 --- a/editors/abiword/patches/patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp +++ /dev/null @@ -1,150 +0,0 @@ -$NetBSD: patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp,v 1.1 2015/09/21 11:28:45 nros Exp $ - -First chunk: -Remove obsolete function call, see -http://bugzilla.abisource.com/show_bug.cgi?id=13726 - -Other chunks: -Fix build with link-grammar-5.2.5. -http://www.abisource.com/viewvc/abiword/trunk/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp?r1=32836&r2=34627 - ---- plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp.orig 2013-04-07 13:53:03.000000000 +0000 -+++ plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp -@@ -87,7 +87,7 @@ bool LinkGrammarWrap::parseSentence(Piec - parse_options_set_min_null_count(m_Opts, 0); - parse_options_set_max_null_count(m_Opts, 0); - parse_options_set_islands_ok(m_Opts, 0); -- parse_options_set_panic_mode(m_Opts, TRUE); -+ //parse_options_set_panic_mode(m_Opts, TRUE); - parse_options_reset_resources(m_Opts); - UT_sint32 num_linkages = sentence_parse(sent, m_Opts); - bool res = (num_linkages >= 1); -@@ -145,59 +145,57 @@ bool LinkGrammarWrap::parseSentence(Piec - } - AbiGrammarError * pWordMap = new AbiGrammarError(); - pWordMap->m_iErrLow = iLow; -- pWordMap->m_iErrHigh = iLow + strlen(sentence_get_nth_word(sent, i)); -+ pWordMap->m_iErrHigh = iLow + strlen(linkage_get_word(linkage, i)); - pWordMap->m_iWordNum = i; - vecMapOfWords.addItem(pWordMap); - bool bNew = false; -- if(!sentence_nth_word_has_disjunction(sent, i)) -+ -+ //UT_DEBUGMSG(("|%s| NULL LINK\n",sent->word[i].string)); -+ if(pErr == NULL) -+ { -+ pErr = new AbiGrammarError(); -+ bNew = true; -+ } -+ if(bNew || (pErr->m_iWordNum + 1 < i)) - { -- //UT_DEBUGMSG(("|%s| NULL LINK\n",sent->word[i].string)); -- if(pErr == NULL) -+ if(!bNew) - { -- pErr = new AbiGrammarError(); -- bNew = true; -+ if(pErr) -+ { -+ delete pErr; -+ } -+ pErr = new AbiGrammarError(); - } -- if(bNew || (pErr->m_iWordNum + 1 < i)) -+ iHigh = iLow + strlen(linkage_get_word(linkage, i)); -+ pErr->m_iErrLow = iLow + iOff -1; -+ pErr->m_iErrHigh = iHigh + iOff -1; -+ if(pErr->m_iErrLow < 0) -+ { -+ pErr->m_iErrLow = 0; -+ } -+ if(pErr->m_iErrHigh < totlen-1) - { -- if(!bNew) -- { -- if(pErr) -- { -- delete pErr; -- } -- pErr = new AbiGrammarError(); -- } -- iHigh = iLow + strlen(sentence_get_nth_word(sent, i)); -- pErr->m_iErrLow = iLow + iOff -1; -- pErr->m_iErrHigh = iHigh + iOff -1; -- if(pErr->m_iErrLow < 0) -- { -- pErr->m_iErrLow = 0; -- } -- if(pErr->m_iErrHigh < totlen-1) -- { - pErr->m_iErrHigh += 1; -- } -- pErr->m_iWordNum = i; -- // UT_DEBUGMSG(("Add Error %x low %d High %d\n",pErr,pErr->m_iErrLow,pErr->m_iErrHigh)); -- pT->m_vecGrammarErrors.addItem(pErr); -- pErr = NULL; - } -- else -+ pErr->m_iWordNum = i; -+ // UT_DEBUGMSG(("Add Error %x low %d High %d\n",pErr,pErr->m_iErrLow,pErr->m_iErrHigh)); -+ pT->m_vecGrammarErrors.addItem(pErr); -+ pErr = NULL; -+ } -+ else -+ { -+ // -+ // Expand the sqiggle -+ // -+ iHigh = iLow + strlen(linkage_get_word(linkage, i)) + iOff; -+ pErr->m_iErrHigh = iHigh; -+ if(pErr->m_iErrHigh < totlen-1) - { -- // -- // Expand the sqiggle -- // -- iHigh = iLow + strlen(sentence_get_nth_word(sent, i)) + iOff; -- pErr->m_iErrHigh = iHigh; -- if(pErr->m_iErrHigh < totlen-1) -- { - pErr->m_iErrHigh += 1; -- } -- pErr->m_iWordNum = i; - } -+ pErr->m_iWordNum = i; - } -- iLow += strlen(sentence_get_nth_word(sent, i)); -+ iLow += strlen(linkage_get_word(linkage, i)); - } - // - // No NULL links but still an error , mark the whole sentence bad. -@@ -229,30 +227,6 @@ bool LinkGrammarWrap::parseSentence(Piec - // } - UT_UTF8String sErr = linkage_get_violation_name(linkage); - // UT_DEBUGMSG(("Top Level error message |%s|\n",sErr.utf8_str())); -- UT_sint32 count = linkage_get_num_sublinkages(linkage); -- // -- // Find linkages with violations -- // -- for(i=0; iwrite(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) - { diff --git a/editors/abiword/patches/patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp b/editors/abiword/patches/patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp deleted file mode 100644 index 34077b43a57..00000000000 --- a/editors/abiword/patches/patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp,v 1.1 2018/06/30 12:43:29 maya Exp $ - -Bug 13754 - Fix build on gcc-6 (default to C++11) -https://github.com/AbiWord/abiword/commit/a83e6f50dbd5efa16fb39efe32b9de370f103130 - ---- plugins/xslfo/xp/ie_exp_XSL-FO.cpp.orig 2013-04-07 13:53:03.000000000 +0000 -+++ plugins/xslfo/xp/ie_exp_XSL-FO.cpp -@@ -1451,7 +1451,7 @@ void s_XSL_FO_Listener::_openSection(PT_ - { \ - UT_UTF8String esc = szValue; \ - esc.escapeXML(); \ -- buf += " "x"=\""; \ -+ buf += " " x"=\""; \ - buf += esc.utf8_str(); \ - buf += "\""; \ - } diff --git a/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp b/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp index 0a18c1df077..cc0c5d7834f 100644 --- a/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp +++ b/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp @@ -1,37 +1,9 @@ -$NetBSD: patch-src_text_ptbl_xp_pd__DocumentRDF.cpp,v 1.2 2018/04/25 05:53:53 markd Exp $ +$NetBSD: patch-src_text_ptbl_xp_pd__DocumentRDF.cpp,v 1.3 2018/11/24 19:14:09 nia Exp $ -* fixes build on FreeBSD 10 with clang. From FreeBSD ports mailing list. - Applied upstream. - https://lists.freebsd.org/pipermail/freebsd-ports/2015-March/098621.html +fix using modern libical -* fix using modern libical - ---- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig 2014-02-27 05:11:32.000000000 +0000 +--- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig 2015-04-02 03:09:20.000000000 +0000 +++ 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(); @@ -2269,8 +2269,8 @@ PD_RDFEvent::exportToFile( const std::st icalcomponent_set_uid( c, m_uid.c_str() ); icalcomponent_set_location( c, m_location.c_str() ); diff --git a/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.h b/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.h deleted file mode 100644 index 3b12d543664..00000000000 --- a/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_text_ptbl_xp_pd__DocumentRDF.h,v 1.1 2015/09/13 21:32:13 nros Exp $ -* Fixes build on FreeBSD 10 with clang. From freebsd-ports mailing list. - Applied upstream. - https://lists.freebsd.org/pipermail/freebsd-ports/2015-March/098621.html - ---- src/text/ptbl/xp/pd_DocumentRDF.h.orig 2015-04-04 22:38:01.000000000 +0000 -+++ 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; -- cgit v1.2.3