Attachment 203361 Details for Bug 220975 – Patches updated to build on current ports tree in 12-RELEASE.

[patch] Patches updated to build on current ports tree in 12-RELEASE.

svn-diff-abiword-3.0.2 (text/plain), 50.77 KB, created by ralph on 2019-04-04 02:29:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ralph

Created: 2019-04-04 02:29:40 UTC

Size: 50.77 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 497775)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	abiword
>-PORTVERSION=	3.0.1
>-PORTREVISION=	11
>+PORTVERSION=	3.0.2
> 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/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=		compiler:c++11-lang desktop-file-utils gmake gnome iconv jpeg \
>+USES=		compiler:c++11-lang 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 497775)
>+++ 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-abiword.desktop
>===================================================================
>--- files/patch-abiword.desktop	(revision 497775)
>+++ 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 497775)
>+++ 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<uint32_t>( )
>-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<soa::Generic>') 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 497775)
>+++ files/patch-configure	(working copy)
>@@ -1,18 +1,405 @@
>---- 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	2016-10-21 00:43:11 UTC
>++++ configure
>+@@ -10977,7 +10977,7 @@ $as_echo_n "checking whether the $compiler linker ($LD
>+   hardcode_minus_L=no
>+   hardcode_shlibpath_var=unsupported
>+   inherit_rpath=no
>+-  link_all_deplibs=unknown
>++  link_all_deplibs=no
>+   module_cmds=
>+   module_expsym_cmds=
>+   old_archive_from_new_cmds=
>+@@ -11276,7 +11276,7 @@ _LT_EOF
>+ 	wlarc=
>+       else
>+ 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
>+-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
>++	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
>+       fi
>+       ;;
>  
>+@@ -11295,7 +11295,7 @@ _LT_EOF
>+ _LT_EOF
>+       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
>+ 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
>+-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
>++	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
>+       else
>+ 	ld_shlibs=no
>+       fi
>+@@ -11324,7 +11324,7 @@ _LT_EOF
>+ 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
>+ 	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
>+ 	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
>+-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
>++	    archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
>+ 	  else
>+ 	    ld_shlibs=no
>+ 	  fi
>+@@ -11342,7 +11342,7 @@ _LT_EOF
>+     *)
>+       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
>+ 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
>+-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
>++	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
>+       else
>+ 	ld_shlibs=no
>+       fi
>+@@ -11990,7 +11990,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
>+ 	hardcode_direct_absolute=yes
>+ 	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
>+ 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
>++	  archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver'
>+ 	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
>+ 	  export_dynamic_flag_spec='$wl-E'
>+ 	else
>+@@ -12839,7 +12839,7 @@ freebsd* | dragonfly*)
>+   version_type=freebsd-$objformat
>+   case $version_type in
>+     freebsd-elf*)
>+-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
>++      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
>+       soname_spec='$libname$release$shared_ext$major'
>+       need_version=no
>+       need_lib_prefix=no
>+@@ -13974,7 +13974,7 @@ striplib=
>+ old_striplib=
>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
>+ $as_echo_n "checking whether stripping libraries is possible... " >&6; }
>+-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
>++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
>+   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
>+   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
>+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
>+@@ -14226,7 +14226,7 @@ hardcode_automatic_CXX=no
>+ inherit_rpath_CXX=no
>+ module_cmds_CXX=
>+ module_expsym_cmds_CXX=
>+-link_all_deplibs_CXX=unknown
>++link_all_deplibs_CXX=no
>+ old_archive_cmds_CXX=$old_archive_cmds
>+ reload_flag_CXX=$reload_flag
>+ reload_cmds_CXX=$reload_cmds
>+@@ -14437,7 +14437,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
>+       # archiving commands below assume that GNU ld is being used.
>+       if test yes = "$with_gnu_ld"; then
>+         archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
>+-        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
>++        archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
>  
>+         hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
>+         export_dynamic_flag_spec_CXX='$wl--export-dynamic'
>+@@ -15129,7 +15129,7 @@ fi
>+ 	    case `$CC -V 2>&1` in
>+ 	      *"Version 7."*)
>+ 	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
>+-		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
>++		archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
>+ 		;;
>+ 	      *)  # Version 8.0 or newer
>+ 	        tmp_idyn=
>+@@ -15137,7 +15137,7 @@ fi
>+ 		  ia64*) tmp_idyn=' -i_dynamic';;
>+ 		esac
>+ 	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
>+-		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
>++		archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
>+ 		;;
>+ 	    esac
>+ 	    archive_cmds_need_lc_CXX=no
>+@@ -15169,7 +15169,7 @@ fi
>+ 	      ;;
>+ 	    *) # Version 6 and above use weak symbols
>+ 	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
>+-	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
>++	      archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
>+ 	      ;;
>+ 	    esac
>  
>+@@ -15180,7 +15180,7 @@ fi
>+ 	  cxx*)
>+ 	    # Compaq C++
>+ 	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
>+-	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
>++	    archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-version-script $wl$lib-ver'
>+ 
>+ 	    runpath_var=LD_RUN_PATH
>+ 	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
>+@@ -15214,7 +15214,7 @@ fi
>+ 	      # Sun C++ 5.9
>+ 	      no_undefined_flag_CXX=' -zdefs'
>+ 	      archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+-	      archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
>++	      archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script $wl$lib-ver'
>+ 	      hardcode_libdir_flag_spec_CXX='-R$libdir'
>+ 	      whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
>+ 	      compiler_needs_object_CXX=yes
>+@@ -15282,7 +15282,7 @@ fi
>+ 	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
>+ 	  hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
>+ 	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
>+-	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
>++	    archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script,$lib-ver -o $lib'
>+ 	    export_dynamic_flag_spec_CXX='$wl-E'
>+ 	    whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
>+ 	  fi
>+@@ -16804,7 +16804,7 @@ freebsd* | dragonfly*)
>+   version_type=freebsd-$objformat
>+   case $version_type in
>+     freebsd-elf*)
>+-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
>++      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
>+       soname_spec='$libname$release$shared_ext$major'
>+       need_version=no
>+       need_lib_prefix=no
>+@@ -20435,7 +20435,7 @@ fi
>+ test "$enable_openwriter" = "auto" && PLUGINS="$PLUGINS openwriter"
>+ 
>+ OPENWRITER_CFLAGS="$OPENWRITER_CFLAGS "'${PLUGIN_CFLAGS}'
>+-OPENWRITER_LIBS="$OPENWRITER_LIBS "'${PLUGIN_LIBS}'
>++OPENWRITER_LIBS='${PLUGIN_LIBS}'" $OPENWRITER_LIBS "
>+ 
>+ if test "$enable_openwriter_builtin" = "yes"; then
>+ 	OPENWRITER_CFLAGS="$OPENWRITER_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -20584,7 +20584,7 @@ fi
>+ test "$enable_grammar" = "auto" && PLUGINS="$PLUGINS grammar"
>+ 
>+ GRAMMAR_CFLAGS="$GRAMMAR_CFLAGS "'${PLUGIN_CFLAGS}'
>+-GRAMMAR_LIBS="$GRAMMAR_LIBS "'${PLUGIN_LIBS}'
>++GRAMMAR_LIBS='${PLUGIN_LIBS}'" $GRAMMAR_LIBS "
>+ 
>+ fi
>+ 
>+@@ -20592,7 +20592,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
>-@@ -24341,8 +24341,8 @@
>+@@ -20717,7 +20717,7 @@ fi
>+ test "$enable_wpg" = "auto" && PLUGINS="$PLUGINS wpg"
>  
>+ WPG_CFLAGS="$WPG_CFLAGS "'${PLUGIN_CFLAGS}'
>+-WPG_LIBS="$WPG_LIBS "'${PLUGIN_LIBS}'
>++WPG_LIBS='${PLUGIN_LIBS}'" $WPG_LIBS "
>  
>+ fi
>  
>+@@ -20733,7 +20733,7 @@ if test "$enable_gimp" != ""; then
>+ test "$enable_gimp" = "auto" && PLUGINS="$PLUGINS gimp"
>+ 
>+ GIMP_CFLAGS="$GIMP_CFLAGS "'${PLUGIN_CFLAGS}'
>+-GIMP_LIBS="$GIMP_LIBS "'${PLUGIN_LIBS}'
>++GIMP_LIBS='${PLUGIN_LIBS}'" $GIMP_LIBS "
>+ 
>+ if test "$enable_gimp_builtin" = "yes"; then
>+ 	GIMP_CFLAGS="$GIMP_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -20888,7 +20888,7 @@ fi
>+ test "$enable_aiksaurus" = "auto" && PLUGINS="$PLUGINS aiksaurus"
>+ 
>+ AIKSAURUS_CFLAGS="$AIKSAURUS_CFLAGS "'${PLUGIN_CFLAGS}'
>+-AIKSAURUS_LIBS="$AIKSAURUS_LIBS "'${PLUGIN_LIBS}'
>++AIKSAURUS_LIBS='${PLUGIN_LIBS}'" $AIKSAURUS_LIBS "
>+ 
>+ fi
>+ 
>+@@ -21037,7 +21037,7 @@ fi
>+ test "$enable_command" = "auto" && PLUGINS="$PLUGINS command"
>+ 
>+ COMMAND_CFLAGS="$COMMAND_CFLAGS "'${PLUGIN_CFLAGS}'
>+-COMMAND_LIBS="$COMMAND_LIBS "'${PLUGIN_LIBS}'
>++COMMAND_LIBS='${PLUGIN_LIBS}'" $COMMAND_LIBS "
>+ 
>+ fi
>+ 
>+@@ -21197,7 +21197,7 @@ fi
>+ test "$enable_goffice" = "auto" && PLUGINS="$PLUGINS goffice"
>+ 
>+ GOFFICE_CFLAGS="$GOFFICE_CFLAGS "'${PLUGIN_CFLAGS}'
>+-GOFFICE_LIBS="$GOFFICE_LIBS "'${PLUGIN_LIBS}'
>++GOFFICE_LIBS='${PLUGIN_LIBS}'" $GOFFICE_LIBS "
>+ 
>+ fi
>+ 
>+@@ -21326,7 +21326,7 @@ fi
>+ test "$enable_sdw" = "auto" && PLUGINS="$PLUGINS sdw"
>+ 
>+ SDW_CFLAGS="$SDW_CFLAGS "'${PLUGIN_CFLAGS}'
>+-SDW_LIBS="$SDW_LIBS "'${PLUGIN_LIBS}'
>++SDW_LIBS='${PLUGIN_LIBS}'" $SDW_LIBS "
>+ 
>+ if test "$enable_sdw_builtin" = "yes"; then
>+ 	SDW_CFLAGS="$SDW_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -21352,7 +21352,7 @@ if test "$TOOLKIT" = "win"; then
>+ fi
>+ 
>+ PAINT_CFLAGS="$PAINT_CFLAGS "'${PLUGIN_CFLAGS}'
>+-PAINT_LIBS="$PAINT_LIBS "'${PLUGIN_LIBS}'
>++PAINT_LIBS='${PLUGIN_LIBS}'" $PAINT_LIBS "
>+ 
>+ if test "$enable_paint_builtin" = "yes"; then
>+ 	PAINT_CFLAGS="$PAINT_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -21372,7 +21372,7 @@ if test "$enable_passepartout" != ""; then
>+ test "$enable_passepartout" = "auto" && PLUGINS="$PLUGINS passepartout"
>+ 
>+ PASSEPARTOUT_CFLAGS="$PASSEPARTOUT_CFLAGS "'${PLUGIN_CFLAGS}'
>+-PASSEPARTOUT_LIBS="$PASSEPARTOUT_LIBS "'${PLUGIN_LIBS}'
>++PASSEPARTOUT_LIBS='${PLUGIN_LIBS}'" $PASSEPARTOUT_LIBS "
>+ 
>+ if test "$enable_passepartout_builtin" = "yes"; then
>+ 	PASSEPARTOUT_CFLAGS="$PASSEPARTOUT_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -21517,7 +21517,7 @@ fi
>+ test "$enable_opendocument" = "auto" && PLUGINS="$PLUGINS opendocument"
>+ 
>+ OPENDOCUMENT_CFLAGS="$OPENDOCUMENT_CFLAGS "'${PLUGIN_CFLAGS}'
>+-OPENDOCUMENT_LIBS="$OPENDOCUMENT_LIBS "'${PLUGIN_LIBS} -lz'
>++OPENDOCUMENT_LIBS='${PLUGIN_LIBS} -lz'" $OPENDOCUMENT_LIBS "
>+ 
>+ if test "$enable_opendocument_builtin" = "yes"; then
>+ 	OPENDOCUMENT_CFLAGS="$OPENDOCUMENT_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -21650,7 +21650,7 @@ fi
>+ test "$enable_wml" = "auto" && PLUGINS="$PLUGINS wml"
>+ 
>+ WML_CFLAGS="$WML_CFLAGS "'${PLUGIN_CFLAGS}'
>+-WML_LIBS="$WML_LIBS "'${PLUGIN_LIBS}'
>++WML_LIBS='${PLUGIN_LIBS}'" $WML_LIBS "
>+ 
>+ if test "$enable_wml_builtin" = "yes"; then
>+ 	WML_CFLAGS="$WML_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -21670,7 +21670,7 @@ if test "$enable_eml" != ""; then
>+ test "$enable_eml" = "auto" && PLUGINS="$PLUGINS eml"
>+ 
>+ EML_CFLAGS="$EML_CFLAGS "'${PLUGIN_CFLAGS}'
>+-EML_LIBS="$EML_LIBS "'${PLUGIN_LIBS}'
>++EML_LIBS='${PLUGIN_LIBS}'" $EML_LIBS "
>+ 
>+ if test "$enable_eml_builtin" = "yes"; then
>+ 	EML_CFLAGS="$EML_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -21904,7 +21904,7 @@ $as_echo "yes" >&6; }
>+ fi
>+ 
>+ MHT_CFLAGS="$MHT_CFLAGS "'${PLUGIN_CFLAGS}'
>+-MHT_LIBS="$MHT_LIBS $MHT_OPT_LIBS "'${PLUGIN_LIBS}'
>++MHT_LIBS='${PLUGIN_LIBS}'" $MHT_LIBS $MHT_OPT_LIBS "
>+ 
>+ fi
>+ 
>+@@ -22001,7 +22001,7 @@ if test "$enable_s5" != ""; then
>+ test "$enable_s5" = "auto" && PLUGINS="$PLUGINS s5"
>+ 
>+ S5_CFLAGS="$S5_CFLAGS "'${PLUGIN_CFLAGS}'
>+-S5_LIBS="$S5_LIBS "'${PLUGIN_LIBS}'
>++S5_LIBS='${PLUGIN_LIBS}'" $S5_LIBS "
>+ 
>+ if test "$enable_s5_builtin" = "yes"; then
>+ 	S5_CFLAGS="$S5_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -22021,7 +22021,7 @@ if test "$enable_babelfish" != ""; then
>+ test "$enable_babelfish" = "auto" && PLUGINS="$PLUGINS babelfish"
>+ 
>+ BABELFISH_CFLAGS="$BABELFISH_CFLAGS "'${PLUGIN_CFLAGS}'
>+-BABELFISH_LIBS="$BABELFISH_LIBS "'${PLUGIN_LIBS}'
>++BABELFISH_LIBS='${PLUGIN_LIBS}'" $BABELFISH_LIBS "
>+ 
>+ if test "$enable_babelfish_builtin" = "yes"; then
>+ 	BABELFISH_CFLAGS="$BABELFISH_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -22158,7 +22158,7 @@ $as_echo "yes" >&6; }
>+ fi
>+ 
>+ OTS_CFLAGS="$OTS_CFLAGS "'${PLUGIN_CFLAGS}'
>+-OTS_LIBS="$OTS_LIBS "'${PLUGIN_LIBS}'
>++OTS_LIBS='${PLUGIN_LIBS}'" $OTS_LIBS "
>+ 
>+ fi
>+ 
>+@@ -22182,7 +22182,7 @@ if test "$enable_bmp" = "yes" || \
>+ # TODO check for libpng, well abiword links to it anyways
>+ 
>+ BMP_CFLAGS="$BMP_CFLAGS $PNG_CFLAGS "'${PLUGIN_CFLAGS}'
>+-BMP_LIBS="$BMP_LIBS $PNG_LIBS "'${PLUGIN_LIBS}'
>++BMP_LIBS='${PLUGIN_LIBS}'" $BMP_LIBS $PNG_LIBS "
>+ 
>+ if test "$enable_bmp_builtin" = "yes"; then
>+ 	BMP_CFLAGS="$BMP_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -22344,7 +22344,7 @@ fi
>+ test "$enable_psion" = "auto" && PLUGINS="$PLUGINS psion"
>+ 
>+ PSION_CFLAGS="$PSION_CFLAGS $PNG_CFLAGS "'${PLUGIN_CFLAGS}'
>+-PSION_LIBS="$PSION_LIBS $PNG_LIBS -lgsf-1 "'${PLUGIN_LIBS}'
>++PSION_LIBS='${PLUGIN_LIBS}'" $PSION_LIBS $PNG_LIBS -lgsf-1 "
>+ 
>+ fi
>+ 
>+@@ -22492,7 +22492,7 @@ fi
>+ test "$enable_gda" = "auto" && PLUGINS="$PLUGINS gda"
>+ 
>+ GDA_CFLAGS="$GDA_CFLAGS "'${PLUGIN_CFLAGS}'
>+-GDA_LIBS="$GDA_LIBS "'${PLUGIN_LIBS}'
>++GDA_LIBS='${PLUGIN_LIBS}'" $GDA_LIBS "
>+ 
>+ fi
>+ 
>+@@ -22508,7 +22508,7 @@ if test "$enable_opml" != ""; then
>+ test "$enable_opml" = "auto" && PLUGINS="$PLUGINS opml"
>+ 
>+ OPML_CFLAGS="$OPML_CFLAGS "'${PLUGIN_CFLAGS}'
>+-OPML_LIBS="$OPML_LIBS "'${PLUGIN_LIBS}'
>++OPML_LIBS='${PLUGIN_LIBS}'" $OPML_LIBS "
>+ 
>+ if test "$enable_opml_builtin" = "yes"; then
>+ 	OPML_CFLAGS="$OPML_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -22677,7 +22677,7 @@ fi
>+ test "$enable_garble" = "auto" && PLUGINS="$PLUGINS garble"
>+ 
>+ GARBLE_CFLAGS="$GARBLE_CFLAGS $PNG_CFLAGS "'${PLUGIN_CFLAGS}'
>+-GARBLE_LIBS="$GARBLE_LIBS $PNG_LIBS "'${PLUGIN_LIBS}'
>++GARBLE_LIBS='${PLUGIN_LIBS}'" $GARBLE_LIBS $PNG_LIBS "
>+ 
>+ if test "$enable_garble_builtin" = "yes"; then
>+ 	GARBLE_CFLAGS="$GARBLE_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -22697,7 +22697,7 @@ if test "$enable_hrtext" != ""; then
>+ test "$enable_hrtext" = "auto" && PLUGINS="$PLUGINS hrtext"
>+ 
>+ HRTEXT_CFLAGS="$HRTEXT_CFLAGS "'${PLUGIN_CFLAGS}'
>+-HRTEXT_LIBS="$HRTEXT_LIBS "'${PLUGIN_LIBS}'
>++HRTEXT_LIBS='${PLUGIN_LIBS}'" $HRTEXT_LIBS "
>+ 
>+ if test "$enable_hrtext_builtin" = "yes"; then
>+ 	HRTEXT_CFLAGS="$HRTEXT_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -22717,7 +22717,7 @@ if test "$enable_presentation" != ""; then
>+ test "$enable_presentation" = "auto" && PLUGINS="$PLUGINS presentation"
>+ 
>+ PRESENTATION_CFLAGS="$PRESENTATION_CFLAGS "'${PLUGIN_CFLAGS}'
>+-PRESENTATION_LIBS="$PRESENTATION_LIBS "'${PLUGIN_LIBS}'
>++PRESENTATION_LIBS='${PLUGIN_LIBS}'" $PRESENTATION_LIBS "
>+ 
>+ if test "$enable_presentation_builtin" = "yes"; then
>+ 	PRESENTATION_CFLAGS="$PRESENTATION_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -22737,7 +22737,7 @@ if test "$enable_freetranslation" != ""; then
>+ test "$enable_freetranslation" = "auto" && PLUGINS="$PLUGINS freetranslation"
>+ 
>+ FREETRANSLATION_CFLAGS="$FREETRANSLATION_CFLAGS "'${PLUGIN_CFLAGS}'
>+-FREETRANSLATION_LIBS="$FREETRANSLATION_LIBS "'${PLUGIN_LIBS}'
>++FREETRANSLATION_LIBS='${PLUGIN_LIBS}'" $FREETRANSLATION_LIBS "
>+ 
>+ if test "$enable_freetranslation_builtin" = "yes"; then
>+ 	FREETRANSLATION_CFLAGS="$FREETRANSLATION_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -22870,7 +22870,7 @@ fi
>+ test "$enable_xslfo" = "auto" && PLUGINS="$PLUGINS xslfo"
>+ 
>+ XSLFO_CFLAGS="$XSLFO_CFLAGS "'${PLUGIN_CFLAGS}'
>+-XSLFO_LIBS="$XSLFO_LIBS "'${PLUGIN_LIBS}'
>++XSLFO_LIBS='${PLUGIN_LIBS}'" $XSLFO_LIBS "
>+ 
>+ if test "$enable_xslfo_builtin" = "yes"; then
>+ 	XSLFO_CFLAGS="$XSLFO_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -22882,8 +22882,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"
>@@ -20,7 +407,7 @@
>  wordperfect_deps="no"
>  
>  WORDPERFECT_CFLAGS=
>-@@ -24385,7 +24385,7 @@
>+@@ -22926,7 +22926,7 @@ if test -n "$PKG_CONFIG" && \
>    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>    test $ac_status = 0; }; then
>  
>@@ -29,3 +416,210 @@
>  	WPS_DEFINE=" -DHAVE_LIBWPS"
>  
>  fi
>+@@ -23026,7 +23026,7 @@ fi
>+ test "$enable_wordperfect" = "auto" && PLUGINS="$PLUGINS wordperfect"
>+ 
>+ WORDPERFECT_CFLAGS="$WORDPERFECT_CFLAGS "'${PLUGIN_CFLAGS}'"$WPS_DEFINE"
>+-WORDPERFECT_LIBS="$WORDPERFECT_LIBS "'${PLUGIN_LIBS}'
>++WORDPERFECT_LIBS='${PLUGIN_LIBS}'" $WORDPERFECT_LIBS "
>+ 
>+ fi
>+ 
>+@@ -23155,7 +23155,7 @@ fi
>+ test "$enable_applix" = "auto" && PLUGINS="$PLUGINS applix"
>+ 
>+ APPLIX_CFLAGS="$APPLIX_CFLAGS "'${PLUGIN_CFLAGS}'
>+-APPLIX_LIBS="$APPLIX_LIBS "'${PLUGIN_LIBS}'
>++APPLIX_LIBS='${PLUGIN_LIBS}'" $APPLIX_LIBS "
>+ 
>+ if test "$enable_applix_builtin" = "yes"; then
>+ 	APPLIX_CFLAGS="$APPLIX_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -23288,7 +23288,7 @@ fi
>+ test "$enable_loadbindings" = "auto" && PLUGINS="$PLUGINS loadbindings"
>+ 
>+ LOADBINDINGS_CFLAGS="$LOADBINDINGS_CFLAGS "'${PLUGIN_CFLAGS}'
>+-LOADBINDINGS_LIBS="$LOADBINDINGS_LIBS "'${PLUGIN_LIBS}'
>++LOADBINDINGS_LIBS='${PLUGIN_LIBS}'" $LOADBINDINGS_LIBS "
>+ 
>+ if test "$enable_loadbindings_builtin" = "yes"; then
>+ 	LOADBINDINGS_CFLAGS="$LOADBINDINGS_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -23457,7 +23457,7 @@ fi
>+ test "$enable_docbook" = "auto" && PLUGINS="$PLUGINS docbook"
>+ 
>+ DOCBOOK_CFLAGS="$DOCBOOK_CFLAGS "'${PLUGIN_CFLAGS}'
>+-DOCBOOK_LIBS="$DOCBOOK_LIBS "'${PLUGIN_LIBS}'
>++DOCBOOK_LIBS='${PLUGIN_LIBS}'" $DOCBOOK_LIBS "
>+ 
>+ if test "$enable_docbook_builtin" = "yes"; then
>+ 	DOCBOOK_CFLAGS="$DOCBOOK_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -23477,7 +23477,7 @@ if test "$enable_mif" != ""; then
>+ test "$enable_mif" = "auto" && PLUGINS="$PLUGINS mif"
>+ 
>+ MIF_CFLAGS="$MIF_CFLAGS "'${PLUGIN_CFLAGS}'
>+-MIF_LIBS="$MIF_LIBS "'${PLUGIN_LIBS}'
>++MIF_LIBS='${PLUGIN_LIBS}'" $MIF_LIBS "
>+ 
>+ if test "$enable_mif_builtin" = "yes"; then
>+ 	MIF_CFLAGS="$MIF_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -23613,7 +23613,7 @@ fi
>+ test "$enable_pdf" = "auto" && PLUGINS="$PLUGINS pdf"
>+ 
>+ PDF_CFLAGS="$PDF_CFLAGS "'${PLUGIN_CFLAGS}'
>+-PDF_LIBS="$PDF_LIBS "'${PLUGIN_LIBS}'
>++PDF_LIBS='${PLUGIN_LIBS}'" $PDF_LIBS "
>+ 
>+ if test "$enable_pdf_builtin" = "yes"; then
>+ 	PDF_CFLAGS="$PDF_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -23633,7 +23633,7 @@ if test "$enable_google" != ""; then
>+ test "$enable_google" = "auto" && PLUGINS="$PLUGINS google"
>+ 
>+ GOOGLE_CFLAGS="$GOOGLE_CFLAGS "'${PLUGIN_CFLAGS}'
>+-GOOGLE_LIBS="$GOOGLE_LIBS "'${PLUGIN_LIBS}'
>++GOOGLE_LIBS='${PLUGIN_LIBS}'" $GOOGLE_LIBS "
>+ 
>+ if test "$enable_google_builtin" = "yes"; then
>+ 	GOOGLE_CFLAGS="$GOOGLE_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -23766,7 +23766,7 @@ fi
>+ test "$enable_clarisworks" = "auto" && PLUGINS="$PLUGINS clarisworks"
>+ 
>+ CLARISWORKS_CFLAGS="$CLARISWORKS_CFLAGS "'${PLUGIN_CFLAGS}'
>+-CLARISWORKS_LIBS="$CLARISWORKS_LIBS "'${PLUGIN_LIBS}'
>++CLARISWORKS_LIBS='${PLUGIN_LIBS}'" $CLARISWORKS_LIBS "
>+ 
>+ if test "$enable_clarisworks_builtin" = "yes"; then
>+ 	CLARISWORKS_CFLAGS="$CLARISWORKS_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -24002,7 +24002,7 @@ fi
>+ fi
>+ 
>+ LATEX_CFLAGS="$LATEX_CFLAGS "'${PLUGIN_CFLAGS}'
>+-LATEX_LIBS="$LATEX_LIBS "'${PLUGIN_LIBS}'
>++LATEX_LIBS='${PLUGIN_LIBS}'" $LATEX_LIBS "
>+ 
>+ if test "$enable_latex_builtin" = "yes"; then
>+ 	LATEX_CFLAGS="$LATEX_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -24135,7 +24135,7 @@ fi
>+ test "$enable_t602" = "auto" && PLUGINS="$PLUGINS t602"
>+ 
>+ T602_CFLAGS="$T602_CFLAGS "'${PLUGIN_CFLAGS}'
>+-T602_LIBS="$T602_LIBS "'${PLUGIN_LIBS}'
>++T602_LIBS='${PLUGIN_LIBS}'" $T602_LIBS "
>+ 
>+ if test "$enable_t602_builtin" = "yes"; then
>+ 	T602_CFLAGS="$T602_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -24602,7 +24602,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
>+ 
>+@@ -24797,7 +24797,7 @@ fi
>+ test "$enable_mswrite" = "auto" && PLUGINS="$PLUGINS mswrite"
>+ 
>+ MSWRITE_CFLAGS="$MSWRITE_CFLAGS "'${PLUGIN_CFLAGS}'
>+-MSWRITE_LIBS="$MSWRITE_LIBS "'${PLUGIN_LIBS}'
>++MSWRITE_LIBS='${PLUGIN_LIBS}'" $MSWRITE_LIBS "
>+ 
>+ if test "$enable_mswrite_builtin" = "yes"; then
>+ 	MSWRITE_CFLAGS="$MSWRITE_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -24817,7 +24817,7 @@ if test "$enable_iscii" != ""; then
>+ test "$enable_iscii" = "auto" && PLUGINS="$PLUGINS iscii"
>+ 
>+ ISCII_CFLAGS="$ISCII_CFLAGS "'${PLUGIN_CFLAGS}'
>+-ISCII_LIBS="$ISCII_LIBS "'${PLUGIN_LIBS}'
>++ISCII_LIBS='${PLUGIN_LIBS}'" $ISCII_LIBS "
>+ 
>+ if test "$enable_iscii_builtin" = "yes"; then
>+ 	ISCII_CFLAGS="$ISCII_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -24953,7 +24953,7 @@ fi
>+ test "$enable_openxml" = "auto" && PLUGINS="$PLUGINS openxml"
>+ 
>+ OPENXML_CFLAGS="$OPENXML_CFLAGS "'${PLUGIN_CFLAGS}'
>+-OPENXML_LIBS="$OPENXML_LIBS "'${PLUGIN_LIBS}'
>++OPENXML_LIBS='${PLUGIN_LIBS}'" $OPENXML_LIBS "
>+ 
>+ if test "$enable_openxml_builtin" = "yes"; then
>+ 	OPENXML_CFLAGS="$OPENXML_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -24973,7 +24973,7 @@ if test "$enable_wikipedia" != ""; then
>+ test "$enable_wikipedia" = "auto" && PLUGINS="$PLUGINS wikipedia"
>+ 
>+ WIKIPEDIA_CFLAGS="$WIKIPEDIA_CFLAGS "'${PLUGIN_CFLAGS}'
>+-WIKIPEDIA_LIBS="$WIKIPEDIA_LIBS "'${PLUGIN_LIBS}'
>++WIKIPEDIA_LIBS='${PLUGIN_LIBS}'" $WIKIPEDIA_LIBS "
>+ 
>+ if test "$enable_wikipedia_builtin" = "yes"; then
>+ 	WIKIPEDIA_CFLAGS="$WIKIPEDIA_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -25106,7 +25106,7 @@ fi
>+ test "$enable_pdb" = "auto" && PLUGINS="$PLUGINS pdb"
>+ 
>+ PDB_CFLAGS="$PDB_CFLAGS "'${PLUGIN_CFLAGS}'
>+-PDB_LIBS="$PDB_LIBS "'${PLUGIN_LIBS}'
>++PDB_LIBS='${PLUGIN_LIBS}'" $PDB_LIBS "
>+ 
>+ if test "$enable_pdb_builtin" = "yes"; then
>+ 	PDB_CFLAGS="$PDB_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -25284,7 +25284,7 @@ fi
>+ test "$enable_mathview" = "auto" && PLUGINS="$PLUGINS mathview"
>+ 
>+ MATHVIEW_CFLAGS="$MATHVIEW_CFLAGS $HASHMAP_CFLAGS "'${PLUGIN_CFLAGS}'
>+-MATHVIEW_LIBS="$MATHVIEW_LIBS "'${PLUGIN_LIBS}'
>++MATHVIEW_LIBS='${PLUGIN_LIBS}'" $MATHVIEW_LIBS "
>+ 
>+ fi
>+ 
>+@@ -25509,7 +25509,7 @@ if test "$enable_urldict" != ""; then
>+ test "$enable_urldict" = "auto" && PLUGINS="$PLUGINS urldict"
>+ 
>+ URLDICT_CFLAGS="$URLDICT_CFLAGS "'${PLUGIN_CFLAGS}'
>+-URLDICT_LIBS="$URLDICT_LIBS "'${PLUGIN_LIBS}'
>++URLDICT_LIBS='${PLUGIN_LIBS}'" $URLDICT_LIBS "
>+ 
>+ if test "$enable_urldict_builtin" = "yes"; then
>+ 	URLDICT_CFLAGS="$URLDICT_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -25669,7 +25669,7 @@ fi
>+ test "$enable_wmf" = "auto" && PLUGINS="$PLUGINS wmf"
>+ 
>+ WMF_CFLAGS="$WMF_CFLAGS "'${PLUGIN_CFLAGS}'
>+-WMF_LIBS="$WMF_LIBS "'${PLUGIN_LIBS}'
>++WMF_LIBS='${PLUGIN_LIBS}'" $WMF_LIBS "
>+ 
>+ fi
>+ 
>+@@ -25798,7 +25798,7 @@ fi
>+ test "$enable_hancom" = "auto" && PLUGINS="$PLUGINS hancom"
>+ 
>+ HANCOM_CFLAGS="$HANCOM_CFLAGS "'${PLUGIN_CFLAGS}'
>+-HANCOM_LIBS="$HANCOM_LIBS "'${PLUGIN_LIBS}'
>++HANCOM_LIBS='${PLUGIN_LIBS}'" $HANCOM_LIBS "
>+ 
>+ if test "$enable_hancom_builtin" = "yes"; then
>+ 	HANCOM_CFLAGS="$HANCOM_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -25931,7 +25931,7 @@ fi
>+ test "$enable_epub" = "auto" && PLUGINS="$PLUGINS epub"
>+ 
>+ EPUB_CFLAGS="$EPUB_CFLAGS "'${PLUGIN_CFLAGS}'
>+-EPUB_LIBS="$EPUB_LIBS "'${PLUGIN_LIBS}'
>++EPUB_LIBS='${PLUGIN_LIBS}'" $EPUB_LIBS "
>+ 
>+ if test "$enable_epub_builtin" = "yes"; then
>+ 	EPUB_CFLAGS="$EPUB_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -26064,7 +26064,7 @@ fi
>+ test "$enable_kword" = "auto" && PLUGINS="$PLUGINS kword"
>+ 
>+ KWORD_CFLAGS="$KWORD_CFLAGS "'${PLUGIN_CFLAGS}'
>+-KWORD_LIBS="$KWORD_LIBS "'${PLUGIN_LIBS}'
>++KWORD_LIBS='${PLUGIN_LIBS}'" $KWORD_LIBS "
>+ 
>+ if test "$enable_kword_builtin" != ""; then
>+ 	KWORD_CFLAGS="$KWORD_CFLAGS -DABI_PLUGIN_BUILTIN"
>+@@ -26210,7 +26210,7 @@ fi
>+ test "$enable_rsvg" = "auto" && PLUGINS="$PLUGINS rsvg"
>+ 
>+ RSVG_CFLAGS="$RSVG_CFLAGS "'${PLUGIN_CFLAGS}'
>+-RSVG_LIBS="$RSVG_LIBS "'${PLUGIN_LIBS}'
>++RSVG_LIBS='${PLUGIN_LIBS}'" $RSVG_LIBS "
>+ 
>+ fi
>+ 
>Index: files/patch-flickering
>===================================================================
>--- files/patch-flickering	(nonexistent)
>+++ files/patch-flickering	(working copy)
>@@ -0,0 +1,138 @@
>+--- src/af/gr/gtk/gr_UnixCairoGraphics.cpp.orig	2019-04-03 20:11:12 UTC
>++++ 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.orig	2019-04-03 18:13:38 UTC
>++++ src/af/gr/xp/gr_Caret.cpp
>+@@ -146,8 +146,10 @@ void GR_Caret::s_work(UT_Worker * _w)
>+ {
>+ 	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());
>+ 
>+-	if (c->m_nDisableCount == 0)
>+-		c->_blink(false);
>++	c->m_enabler->stop();
>++        c->m_worker->stop();
>++	c->m_worker->start();
>++	c->_blink(true);
>+ }
>+ 
>+ /** One-time enabler. */
>+@@ -155,22 +157,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/util/xp/ut_iconv.cpp.orig	2019-04-03 18:13:38 UTC
>++++ src/af/util/xp/ut_iconv.cpp
>+@@ -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
>+--- src/af/xap/gtk/xap_UnixFrameImpl.cpp.orig	2019-04-03 18:13:38 UTC
>++++ src/af/xap/gtk/xap_UnixFrameImpl.cpp
>+@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * 
>+ }
>+ 
>+ #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, Gdk
>+ 		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.orig	2019-04-03 18:13:38 UTC
>++++ src/af/xap/gtk/xap_UnixFrameImpl.h
>+@@ -152,7 +152,7 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl (protec
>+ 			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 497775)
>+++ 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 497775)
>+++ 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<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;
>
>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 497775)
>+++ 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_af_xap_xp_xap__Dialog.cpp
>===================================================================
>--- files/patch-src_af_xap_xp_xap__Dialog.cpp	(nonexistent)
>+++ files/patch-src_af_xap_xp_xap__Dialog.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/af/xap/xp/xap_Dialog.cpp.orig	2019-04-03 22:06:58 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 = (char)(size_t) NULL;
>+ 	UT_UTF8String wn = UT_UTF8String(pDialogName);
>+ 
>+ 	XAP_Frame* pFrame = getActiveFrame();
>
>Property changes on: files/patch-src_af_xap_xp_xap__Dialog.cpp
>___________________________________________________________________
>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-src_text_ptbl_xp_pd__DocumentRDF.cpp
>===================================================================
>--- files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp	(revision 497775)
>+++ files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp	(working copy)
>@@ -1,26 +1,14 @@
>---- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig	2015-03-31 15:14:42 UTC
>+--- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig	2019-04-03 21:34:11 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();
>--}
>+@@ -2269,9 +2269,8 @@ PD_RDFEvent::exportToFile( const std::string& filename
>+         icalcomponent_set_uid( c,         m_uid.c_str() );
>+         icalcomponent_set_location( c,    m_location.c_str() );
>+         icalcomponent_set_description( c, m_desc.c_str() );
>+-        icalcomponent_set_dtstart( c,     icaltime_from_timet( m_dtstart, 0 ) );
>+-        icalcomponent_set_dtend( c,       icaltime_from_timet( m_dtend, 0 ) );
> -
>- bool operator<( std::pair< PD_URI, PD_URI > a, PD_URI b)
>- {
>-     return a.first.toString() < b.toString();
>++	icalcomponent_set_dtstart( c,     icaltime_from_timet_with_zone( m_dtstart, 0, 0) );
>++	icalcomponent_set_dtend( c,       icaltime_from_timet_with_zone( m_dtend, 0, 0  ) );
>+         char* data = icalcomponent_as_ical_string( c );
>+         std::ofstream oss( filename.c_str() );
>+         oss.write( data, strlen(data) );
>Index: files/patch-src_text_ptbl_xp_pd__DocumentRDF.h
>===================================================================
>--- files/patch-src_text_ptbl_xp_pd__DocumentRDF.h	(revision 497775)
>+++ 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: files/patch-src_wp_ap_gtk_ap__UnixApp.cpp
>===================================================================
>--- files/patch-src_wp_ap_gtk_ap__UnixApp.cpp	(nonexistent)
>+++ files/patch-src_wp_ap_gtk_ap__UnixApp.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/wp/ap/gtk/ap_UnixApp.cpp.orig	2019-04-03 22:28:26 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-src_wp_ap_gtk_ap__UnixApp.cpp
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 220975: 190587 | 197643 | 200348 | 200349 | 203361 | 203363