Index: Makefile =================================================================== --- Makefile (revision 461672) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= abiword -PORTVERSION= 3.0.1 -PORTREVISION= 8 +PORTVERSION= 3.0.2 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/ DIST_SUBDIR= AbiWord @@ -19,11 +18,21 @@ libpng.so:graphics/png \ libwv.so:textproc/wv \ libfribidi.so:converters/fribidi \ - libgoffice-0.10.so:devel/goffice010 + libgoffice-0.10.so:devel/goffice010 \ + libdbus-1.so:devel/dbus \ + libgpg-error.so:security/libgpg-error \ + libraptor2.so:textproc/raptor2 \ + librasqal.so:textproc/rasqal \ + libfontconfig.so:x11-fonts/fontconfig \ + libicalss.so:devel/libical \ + libfreetype.so:print/freetype2 \ + librdf.so:textproc/redland \ + libwmf.so:graphics/libwmf RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu USES= desktop-file-utils gmake iconv jpeg libtool pathfix pkgconfig -USE_GNOME= libxml2 gtk30 librsvg2 libxslt +USE_GNOME= cairo libxml2 gtk30 librsvg2 libxslt +USE_XORG+= x11 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: distinfo =================================================================== --- distinfo (revision 461672) +++ 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 = 1518488853 +SHA256 (AbiWord/abiword-3.0.2.tar.gz) = afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522 +SIZE (AbiWord/abiword-3.0.2.tar.gz) = 11154333 Index: files/patch-c++11 =================================================================== --- files/patch-c++11 (revision 461672) +++ 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-flickering =================================================================== --- files/patch-flickering (nonexistent) +++ files/patch-flickering (working copy) @@ -0,0 +1,112 @@ +--- src/af/gr/gtk/gr_UnixCairoGraphics.cpp ++++ src/af/gr/gtk/gr_UnixCairoGraphics.cpp +@@ -577,9 +577,7 @@ void GR_UnixCairoGraphics::_endPaint() + + void GR_UnixCairoGraphics::flush(void) + { +- if (m_Widget) { +- gtk_widget_queue_draw(m_Widget); +- } ++ gdk_flush(); + } + + bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const +--- src/af/gr/xp/gr_Caret.cpp ++++ src/af/gr/xp/gr_Caret.cpp +@@ -155,22 +155,17 @@ void GR_Caret::s_enable(UT_Worker * _w) + { + GR_Caret * c = static_cast(_w->getInstanceData()); + ++ c->m_enabler->stop(); + c->m_worker->stop(); +- c->_blink(true); +- if (!c->m_bCursorIsOn) +- c->_blink(true); // blink again +- else +- { +- c->_blink(true); // ?? - MARCM +- c->_blink(true); +- } + c->m_worker->start(); +- c->m_enabler->stop(); ++ c->_blink(true); + } + + void GR_Caret::s_blink_timeout(UT_Worker * _w) + { + GR_Caret * c = static_cast(_w->getInstanceData()); ++ ++ c->m_blinkTimeout->stop(); + if (c->isEnabled()) + c->disable(); + } +--- src/af/xap/gtk/xap_UnixFrameImpl.cpp ++++ src/af/xap/gtk/xap_UnixFrameImpl.cpp +@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g + } + + #if GTK_CHECK_VERSION(3,0,0) +-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) ++gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) + #else + gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) + #endif + { + XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data")); + FV_View * pView = static_cast(pUnixFrameImpl->getFrame()->getCurrentView()); ++ double x, y, width, height; + #if GTK_CHECK_VERSION(3,0,0) +- GdkEventExpose *pExposeEvent = reinterpret_cast(gtk_get_current_event()); ++ cairo_clip_extents (cr, &x, &y, &width, &height); ++ width -= x; ++ height -= y; ++#else ++ x = pExposeEvent->area.x; ++ y = pExposeEvent->area.y; ++ width = pExposeEvent->area.width; ++ height = pExposeEvent->area.height; + #endif + /* Jean: commenting out next lines since the zoom update code does draw only + * part of what needs to be updated. */ +@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) + UT_Rect rClip; + if (pGr->getPaintCount () > 0) + return TRUE; +- xxx_UT_DEBUGMSG(("Expose area: x %d y %d width %d height %d \n",pExposeEvent->area.x,pExposeEvent->area.y,pExposeEvent->area.width,pExposeEvent->area.height)); +- rClip.left = pGr->tlu(pExposeEvent->area.x); +- rClip.top = pGr->tlu(pExposeEvent->area.y); +- rClip.width = pGr->tlu(pExposeEvent->area.width)+1; +- rClip.height = pGr->tlu(pExposeEvent->area.height)+1; +-#if GTK_CHECK_VERSION(3,0,0) ++ rClip.left = pGr->tlu(x); ++ rClip.top = pGr->tlu(y); ++ #if GTK_CHECK_VERSION(3,0,0) ++ rClip.width = pGr->tlu(width); ++ rClip.height = pGr->tlu(height); + static_cast(pGr)->setCairo(cr); + pView->draw(&rClip); + static_cast(pGr)->setCairo(NULL); + #else ++ rClip.width = pGr->tlu(width)+1; ++ rClip.height = pGr->tlu(height)+1; + pView->draw(&rClip); + #endif + } +- return FALSE; ++ return TRUE; + } + + static bool bScrollWait = false; +--- src/af/xap/gtk/xap_UnixFrameImpl.h ++++ src/af/xap/gtk/xap_UnixFrameImpl.h +@@ -152,7 +152,7 @@ protected: + static gint key_release_event(GtkWidget* w, GdkEventKey* e); + static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); + #if GTK_CHECK_VERSION(3,0,0) +- static gint draw(GtkWidget * w, cairo_t * cr); ++ static gboolean draw(GtkWidget * w, cairo_t * cr); + #else + static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); + #endif + + Property changes on: files/patch-flickering ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp =================================================================== --- files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp (revision 461672) +++ files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp (nonexistent) @@ -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 Property changes on: files/patch-plugins_collab_backends_service_xp_tls_tunnel.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-plugins_collab_backends_sipsimple_xp_SIPSimpleBuddy.h =================================================================== --- files/patch-plugins_collab_backends_sipsimple_xp_SIPSimpleBuddy.h (revision 461672) +++ 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-plugins_collab_backends_tcp_xp_Session.h =================================================================== --- files/patch-plugins_collab_backends_tcp_xp_Session.h (revision 461672) +++ files/patch-plugins_collab_backends_tcp_xp_Session.h (working copy) Property changes on: files/patch-plugins_collab_backends_tcp_xp_Session.h ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: files/patch-plugins_collab_core_sync_xp_SynchronizedQueue.h =================================================================== --- files/patch-plugins_collab_core_sync_xp_SynchronizedQueue.h (revision 461672) +++ files/patch-plugins_collab_core_sync_xp_SynchronizedQueue.h (working copy) Property changes on: files/patch-plugins_collab_core_sync_xp_SynchronizedQueue.h ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property