Attachment #200349 for bug #220975




# $FreeBSD$

PORTNAME=	abiword
PORTVERSION=	3.0.2
PORTREVISION=	11
CATEGORIES=	editors
MASTER_SITES=	http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
DIST_SUBDIR=	AbiWord

		libpng.so:graphics/png \
		libwv.so:textproc/wv \
		libfribidi.so:converters/fribidi \
		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=		compiler:c++11-lang desktop-file-utils gmake gnome iconv jpeg \
		libtool pathfix pkgconfig
USE_GNOME=	cairo libxml2 gtk30 librsvg2 libxslt
USE_XORG+=	x11
GNU_CONFIGURE=	yes
CPPFLAGS+=	-I${LOCALBASE}/include
CXXFLAGS+=	-std=c++98
LDFLAGS+=	-L${LOCALBASE}/lib
CONFIGURE_ARGS=	--without-gnomevfs --enable-plugins="${ABIWORD_PLUGINS}" \
		--enable-shared="yes" --enable-static="no"


PLIST_SUB+=	ABIVERSION=3.0

OPTIONS_DEFINE=	CLIPART DEBUG MATHVIEW NLS OTS PSION \
		TEMPLATES WP
OPTIONS_DEFAULT=CLIPART COLSERVICE COLSUGAR COLTCP SPELLCHECK TEMPLATES
OPTIONS_SUB=	yes

DICT_DESC=		Spelling and grammar checking
GRAMMAR_DESC=		Grammar checking plugin
MATHVIEW_DESC=		MathML render plugin
OTS_DESC=		Text Summarizer plugin
PSION_DESC=		Psion 5(MX) files convertion plugin
SPELLCHECK_DESC=	Spell checking support
TEMPLATES_DESC=		Include additional templates

NLS_USES=			gettext
NLS_CONFIGURE_ENABLE=		nls

OTS_LIB_DEPENDS=		libots-1.so:textproc/ots

PSION_LIB_DEPENDS=		libpsiconv.so:converters/psiconv

SPELLCHECK_LIB_DEPENDS=		libenchant.so:textproc/enchant

ABIWORD_PLUGINS+=	mathview
.endif

.if ${PORT_OPTIONS:MOTS}
ABIWORD_PLUGINS+=	ots
.endif

.if ${PORT_OPTIONS:MPSION}
ABIWORD_PLUGINS+=	psion
.endif

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (AbiWord/abiword-3.0.1.tar.gz) = e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6	1	TIMESTAMP = 1518488853
2	SIZE (AbiWord/abiword-3.0.1.tar.gz) = 11144990	2	SHA256 (AbiWord/abiword-3.0.2.tar.gz) = afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522
		3	SIZE (AbiWord/abiword-3.0.2.tar.gz) = 11154333




--- 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<GR_Caret *>(_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<GR_Caret *>(_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<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
 	FV_View * pView = static_cast<FV_View *>(pUnixFrameImpl->getFrame()->getCurrentView());
+	double x, y, width, height;
 #if GTK_CHECK_VERSION(3,0,0)
-	GdkEventExpose *pExposeEvent = reinterpret_cast<GdkEventExpose *>(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<GR_CairoGraphics *>(pGr)->setCairo(cr);
 		pView->draw(&rClip);
 		static_cast<GR_CairoGraphics *>(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






--- 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




--- 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<DocHandle*>& docHandles = getDocHandles();
+		const std::vector<DocHandle*>& docHandles = getDocHandles();
 		DocTreeItem* first = 0;
 		DocTreeItem* prev = 0;
-		for (vector<DocHandle*>::const_iterator pos = docHandles.begin(); pos != docHandles.end(); pos++)
+		for (std::vector<DocHandle*>::const_iterator pos = docHandles.begin(); pos != docHandles.end(); pos++)
 		{
 			DocTreeItem* item = new DocTreeItem();
 			item->m_type = DOCTREEITEM_TYPE_DOCUMENT;




--- 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();

Lines 1-10 Link Here

(-)files/patch-src_text_ptbl_xp_pd__DocumentRDF.h (-10 lines)
1	--- src/text/ptbl/xp/pd_DocumentRDF.h.orig 2015-03-31 15:15:00 UTC
2	+++ src/text/ptbl/xp/pd_DocumentRDF.h
3	@@ -68,6 +68,7 @@ class ABI_EXPORT PD_URI
4	bool isValid() const;
5	bool operator==(const PD_URI& b) const;
6	bool operator==(const std::string& b) const;
7	+ bool operator<(const PD_URI& b) const;
8
9	virtual bool read( std::istream& ss );
10	virtual bool write( std::ostream& ss ) const;

Return to bug 220975

Lines 2-9 Link Here

(-)Makefile (-5 / +22 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= abiword	4	PORTNAME= abiword
5	PORTVERSION= 3.0.1	5	PORTVERSION= 3.0.2
6	PORTREVISION= 11
7	CATEGORIES= editors	6	CATEGORIES= editors
8	MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/	7	MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
9	DIST_SUBDIR= AbiWord	8	DIST_SUBDIR= AbiWord
Lines 19-32 Link Here
19	libpng.so:graphics/png \	18	libpng.so:graphics/png \
20	libwv.so:textproc/wv \	19	libwv.so:textproc/wv \
21	libfribidi.so:converters/fribidi \	20	libfribidi.so:converters/fribidi \
22	libgoffice-0.10.so:devel/goffice010	21	libgoffice-0.10.so:devel/goffice010 \
		22	libdbus-1.so:devel/dbus \
		23	libgpg-error.so:security/libgpg-error \
		24	libraptor2.so:textproc/raptor2 \
		25	librasqal.so:textproc/rasqal \
		26	libfontconfig.so:x11-fonts/fontconfig \
		27	libicalss.so:devel/libical \
		28	libfreetype.so:print/freetype2 \
		29	librdf.so:textproc/redland \
		30	libwmf.so:graphics/libwmf
23	RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu	31	RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu
24		32
25	USES= compiler:c++11-lang desktop-file-utils gmake gnome iconv jpeg \	33	USES= compiler:c++11-lang desktop-file-utils gmake gnome iconv jpeg \
26	libtool pathfix pkgconfig	34	libtool pathfix pkgconfig
27	USE_GNOME= libxml2 gtk30 librsvg2 libxslt	35	USE_GNOME= cairo libxml2 gtk30 librsvg2 libxslt
		36	USE_XORG+= x11
28	GNU_CONFIGURE= yes	37	GNU_CONFIGURE= yes
29	CPPFLAGS+= -I${LOCALBASE}/include	38	CPPFLAGS+= -I${LOCALBASE}/include
		39	CXXFLAGS+= -std=c++98
30	LDFLAGS+= -L${LOCALBASE}/lib	40	LDFLAGS+= -L${LOCALBASE}/lib
31	CONFIGURE_ARGS= --without-gnomevfs --enable-plugins="${ABIWORD_PLUGINS}" \	41	CONFIGURE_ARGS= --without-gnomevfs --enable-plugins="${ABIWORD_PLUGINS}" \
32	--enable-shared="yes" --enable-static="no"	42	--enable-shared="yes" --enable-static="no"
Lines 36-42 Link Here
36		46
37	PLIST_SUB+= ABIVERSION=3.0	47	PLIST_SUB+= ABIVERSION=3.0
38		48
39	OPTIONS_DEFINE= CLIPART DEBUG MATHVIEW NLS PSION \	49	OPTIONS_DEFINE= CLIPART DEBUG MATHVIEW NLS OTS PSION \
40	TEMPLATES WP	50	TEMPLATES WP
41	OPTIONS_DEFAULT=CLIPART COLSERVICE COLSUGAR COLTCP SPELLCHECK TEMPLATES	51	OPTIONS_DEFAULT=CLIPART COLSERVICE COLSUGAR COLTCP SPELLCHECK TEMPLATES
42	OPTIONS_SUB= yes	52	OPTIONS_SUB= yes
Lines 57-62 Link Here
57	DICT_DESC= Spelling and grammar checking	67	DICT_DESC= Spelling and grammar checking
58	GRAMMAR_DESC= Grammar checking plugin	68	GRAMMAR_DESC= Grammar checking plugin
59	MATHVIEW_DESC= MathML render plugin	69	MATHVIEW_DESC= MathML render plugin
		70	OTS_DESC= Text Summarizer plugin
60	PSION_DESC= Psion 5(MX) files convertion plugin	71	PSION_DESC= Psion 5(MX) files convertion plugin
61	SPELLCHECK_DESC= Spell checking support	72	SPELLCHECK_DESC= Spell checking support
62	TEMPLATES_DESC= Include additional templates	73	TEMPLATES_DESC= Include additional templates
Lines 110-115 Link Here
110	NLS_USES= gettext	121	NLS_USES= gettext
111	NLS_CONFIGURE_ENABLE= nls	122	NLS_CONFIGURE_ENABLE= nls
112		123
		124	OTS_LIB_DEPENDS= libots-1.so:textproc/ots
		125
113	PSION_LIB_DEPENDS= libpsiconv.so:converters/psiconv	126	PSION_LIB_DEPENDS= libpsiconv.so:converters/psiconv
114		127
115	SPELLCHECK_LIB_DEPENDS= libenchant.so:textproc/enchant	128	SPELLCHECK_LIB_DEPENDS= libenchant.so:textproc/enchant
Lines 139-144 Link Here
139	ABIWORD_PLUGINS+= mathview	152	ABIWORD_PLUGINS+= mathview
140	.endif	153	.endif
141		154
		155	.if ${PORT_OPTIONS:MOTS}
		156	ABIWORD_PLUGINS+= ots
		157	.endif
		158
142	.if ${PORT_OPTIONS:MPSION}	159	.if ${PORT_OPTIONS:MPSION}
143	ABIWORD_PLUGINS+= psion	160	ABIWORD_PLUGINS+= psion
144	.endif	161	.endif

Line 0 Link Here

(-)files/patch-flickering (+112 lines)
		1	--- src/af/gr/gtk/gr_UnixCairoGraphics.cpp
		2	+++ src/af/gr/gtk/gr_UnixCairoGraphics.cpp
		3	@@ -577,9 +577,7 @@ void GR_UnixCairoGraphics::_endPaint()
		4
		5	void GR_UnixCairoGraphics::flush(void)
		6	{
		7	- if (m_Widget) {
		8	- gtk_widget_queue_draw(m_Widget);
		9	- }
		10	+ gdk_flush();
		11	}
		12
		13	bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const
		14	--- src/af/gr/xp/gr_Caret.cpp
		15	+++ src/af/gr/xp/gr_Caret.cpp
		16	@@ -155,22 +155,17 @@ void GR_Caret::s_enable(UT_Worker * _w)
		17	{
		18	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());
		19
		20	+ c->m_enabler->stop();
		21	c->m_worker->stop();
		22	- c->_blink(true);
		23	- if (!c->m_bCursorIsOn)
		24	- c->_blink(true); // blink again
		25	- else
		26	- {
		27	- c->_blink(true); // ?? - MARCM
		28	- c->_blink(true);
		29	- }
		30	c->m_worker->start();
		31	- c->m_enabler->stop();
		32	+ c->_blink(true);
		33	}
		34
		35	void GR_Caret::s_blink_timeout(UT_Worker * _w)
		36	{
		37	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());
		38	+
		39	+ c->m_blinkTimeout->stop();
		40	if (c->isEnabled())
		41	c->disable();
		42	}
		43	--- src/af/xap/gtk/xap_UnixFrameImpl.cpp
		44	+++ src/af/xap/gtk/xap_UnixFrameImpl.cpp
		45	@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /event/, g
		46	}
		47
		48	#if GTK_CHECK_VERSION(3,0,0)
		49	-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
		50	+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
		51	#else
		52	gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
		53	#endif
		54	{
		55	XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
		56	FV_View * pView = static_cast<FV_View *>(pUnixFrameImpl->getFrame()->getCurrentView());
		57	+ double x, y, width, height;
		58	#if GTK_CHECK_VERSION(3,0,0)
		59	- GdkEventExpose pExposeEvent = reinterpret_cast<GdkEventExpose >(gtk_get_current_event());
		60	+ cairo_clip_extents (cr, &x, &y, &width, &height);
		61	+ width -= x;
		62	+ height -= y;
		63	+#else
		64	+ x = pExposeEvent->area.x;
65	+ y = pExposeEvent->area.y;
66	+ width = pExposeEvent->area.width;
67	+ height = pExposeEvent->area.height;
68	#endif
69	/* Jean: commenting out next lines since the zoom update code does draw only
70	* part of what needs to be updated. */
71	@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
72	UT_Rect rClip;
73	if (pGr->getPaintCount () > 0)
74	return TRUE;
75	- 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));
76	- rClip.left = pGr->tlu(pExposeEvent->area.x);
77	- rClip.top = pGr->tlu(pExposeEvent->area.y);
78	- rClip.width = pGr->tlu(pExposeEvent->area.width)+1;
79	- rClip.height = pGr->tlu(pExposeEvent->area.height)+1;
80	-#if GTK_CHECK_VERSION(3,0,0)
81	+ rClip.left = pGr->tlu(x);
82	+ rClip.top = pGr->tlu(y);
83	+ #if GTK_CHECK_VERSION(3,0,0)
84	+ rClip.width = pGr->tlu(width);
85	+ rClip.height = pGr->tlu(height);
86	static_cast<GR_CairoGraphics *>(pGr)->setCairo(cr);
87	pView->draw(&rClip);
88	static_cast<GR_CairoGraphics *>(pGr)->setCairo(NULL);
89	#else
90	+ rClip.width = pGr->tlu(width)+1;
91	+ rClip.height = pGr->tlu(height)+1;
92	pView->draw(&rClip);
93	#endif
94	}
95	- return FALSE;
96	+ return TRUE;
97	}
98
99	static bool bScrollWait = false;
100	--- src/af/xap/gtk/xap_UnixFrameImpl.h
101	+++ src/af/xap/gtk/xap_UnixFrameImpl.h
102	@@ -152,7 +152,7 @@ protected:
103	static gint key_release_event(GtkWidget* w, GdkEventKey* e);
104	static gint delete_event(GtkWidget * w, GdkEvent * /event/, gpointer /data/);
105	#if GTK_CHECK_VERSION(3,0,0)
106	- static gint draw(GtkWidget * w, cairo_t * cr);
107	+ static gboolean draw(GtkWidget * w, cairo_t * cr);
108	#else
109	static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
110	#endif
111
112

Lines 1-24 Link Here

(-)files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp (-24 lines)
1	--- plugins/collab/backends/service/xp/tls_tunnel.cpp.orig 2014-11-04 01:12:14 UTC
2	+++ plugins/collab/backends/service/xp/tls_tunnel.cpp
3	@@ -306,8 +306,6 @@ void Proxy::tunnel_(transport_ptr_t tran
4	disconnect_(transport_ptr, session_ptr, local_socket_ptr, remote_socket_ptr);
5	}
6
7	-static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 };
8	-static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 };
9
10	// FIXME: this clientproxy can only handle 1 SSL connection at the same time
11	ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port,
12	@@ -399,9 +397,9 @@ session_ptr_t ClientProxy::setup_tls_ses
13
14	// setup session
15	return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t());
16	- return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t());
17	- return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t());
18	- return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t());
19	+ return_val_if_neg(gnutls_priority_set_direct(*session_ptr,"NORMAL"
20	+ ":-CIPHER-ALL:+AES-256-CBC:+AES-128-CBC:+3DES-CBC:+ARCFOUR-128"
21	+ ":-KX-ALL:+ANON-DH:+RSA:+DHE-DSS:+DHE-RSA",NULL), session_ptr_t());
22	return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t());
23
24	// setup transport

Lines 1-15 Link Here

(-)files/patch-plugins_collab_backends_sipsimple_xp_SIPSimpleBuddy.h (-15 lines)
1	--- plugins/collab/backends/sipsimple/xp/SIPSimpleBuddy.h.orig 2015-04-04 04:57:15 UTC
2	+++ plugins/collab/backends/sipsimple/xp/SIPSimpleBuddy.h
3	@@ -52,10 +52,10 @@ public:
4
5	virtual const DocTreeItem* getDocTreeItems() const
6	{
7	- const vector<DocHandle*>& docHandles = getDocHandles();
8	+ const std::vector<DocHandle*>& docHandles = getDocHandles();
9	DocTreeItem* first = 0;
10	DocTreeItem* prev = 0;
11	- for (vector<DocHandle*>::const_iterator pos = docHandles.begin(); pos != docHandles.end(); pos++)
12	+ for (std::vector<DocHandle*>::const_iterator pos = docHandles.begin(); pos != docHandles.end(); pos++)
13	{
14	DocTreeItem* item = new DocTreeItem();
15	item->m_type = DOCTREEITEM_TYPE_DOCUMENT;

Lines 1-26 Link Here

(-)files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp (-26 lines)
1	--- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig 2015-03-31 15:14:42 UTC
2	+++ src/text/ptbl/xp/pd_DocumentRDF.cpp
3	@@ -570,6 +570,11 @@ bool PD_URI::operator==(const std::strin
4	return m_value == b;
5	}
6
7	+bool PD_URI::operator<(const PD_URI& b) const
8	+{
9	+ return m_value < b.m_value;
10	+}
11	+
12	PD_URI
13	PD_URI::prefixedToURI( PD_RDFModelHandle model ) const
14	{
15	@@ -611,11 +616,6 @@ bool PD_URI::write( std::ostream& ss ) c
16	return true;
17	}
18
19	-bool operator<( PD_URI a, PD_URI b)
20	-{
21	- return a.toString() < b.toString();
22	-}
23	-
24	bool operator<( std::pair< PD_URI, PD_URI > a, PD_URI b)
25	{
26	return a.first.toString() < b.toString();