Attachment #203361 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 iconv jpeg \
		libtool pathfix pkgconfig
USE_GNOME=	cairo libxml2 gtk30 librsvg2 libxslt
USE_XORG+=      x11
GNU_CONFIGURE=	yes
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

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

Lines 1-6 Link Here

(-)files/patch-abiword.desktop (-3 / +3 lines)
1	--- abiword.desktop.orig 2010-04-14 23:50:18.000000000 +0200	1	--- abiword.desktop.orig 2019-04-03 21:21:51 UTC
2	+++ abiword.desktop 2010-05-22 09:08:45.000000000 +0200	2	+++ abiword.desktop
3	@@ -6,7 +6,7 @@	3	@@ -6,7 +6,7 @@ Type=Application
4	Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;	4	Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
5	StartupNotify=true	5	StartupNotify=true
6	X-Desktop-File-Install-Version=0.9	6	X-Desktop-File-Install-Version=0.9




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




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

 wordperfect_deps="no"
 
 WORDPERFECT_CFLAGS=
@@ -22926,7 +22926,7 @@ if test -n "$PKG_CONFIG" && \
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
 

 	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
 




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




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

Line 0 Link Here

(-)files/patch-src_af_xap_xp_xap__Dialog.cpp (+11 lines)
	1	--- src/af/xap/xp/xap_Dialog.cpp.orig 2019-04-03 22:06:58 UTC
	2	+++ src/af/xap/xp/xap_Dialog.cpp
	3	@@ -267,7 +267,7 @@ XAP_Dialog_Modeless::BuildWindowName(char * pWindowNam
	4	// This function constructs and returns the window name of a modeless dialog by
	5	// concatenating the active frame with the dialog name
	6
	7	- *pWindowName = (char) NULL;
	8	+ *pWindowName = (char)(size_t) NULL;
	9	UT_UTF8String wn = UT_UTF8String(pDialogName);
	10
	11	XAP_Frame* pFrame = getActiveFrame();




--- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig	2019-04-03 21:34:11 UTC
+++ src/text/ptbl/xp/pd_DocumentRDF.cpp
@@ -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 ) );
+    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();
-}
-
+	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) );

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;

Line 0 Link Here

(-)files/patch-src_wp_ap_gtk_ap__UnixApp.cpp (+11 lines)
	1	--- src/wp/ap/gtk/ap_UnixApp.cpp.orig 2019-04-03 22:28:26 UTC
	2	+++ src/wp/ap/gtk/ap_UnixApp.cpp
	3	@@ -863,7 +863,7 @@ static bool is_so (const char *file) {
	4	if (len < (strlen(G_MODULE_SUFFIX) + 2)) // this is ".so" and at least one char for the filename
	5	return false;
	6	const char *suffix = file+(len-3);
	7	- if(0 == strcmp (suffix, "."G_MODULE_SUFFIX))
	8	+ if(0 == strcmp (suffix, "." G_MODULE_SUFFIX))
	9	return true;
	10	return false;
	11	}

Return to bug 220975

Lines 2-9 Link Here

(-)Makefile (-5 / +15 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-30 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
		31
23	RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu	32	RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu
24		33
25	USES= compiler:c++11-lang desktop-file-utils gmake gnome iconv jpeg \	34	USES= compiler:c++11-lang desktop-file-utils gmake iconv jpeg \
26	libtool pathfix pkgconfig	35	libtool pathfix pkgconfig
27	USE_GNOME= libxml2 gtk30 librsvg2 libxslt	36	USE_GNOME= cairo libxml2 gtk30 librsvg2 libxslt
		37	USE_XORG+= x11
28	GNU_CONFIGURE= yes	38	GNU_CONFIGURE= yes
29	CPPFLAGS+= -I${LOCALBASE}/include	39	CPPFLAGS+= -I${LOCALBASE}/include
30	LDFLAGS+= -L${LOCALBASE}/lib	40	LDFLAGS+= -L${LOCALBASE}/lib

Lines 1-100 Link Here

(-)files/patch-c++11 (-100 lines)
1	xap_Dialog.cpp:270:17: error: cast from pointer to smaller type 'char' loses information
2	*pWindowName = (char) NULL;
3	^~~~~~~~~~~
4	ap_UnixApp.cpp:866:29: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
5	if(0 == strcmp (suffix, "."G_MODULE_SUFFIX))
6	^
7	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]
8	buf += " "x"=\""; \
9	^
10	ie_exp_LaTeX.cpp:1332:43: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
11	#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true;
12	^
13	RealmProtocol.cpp:16:2: error: constant expression evaluates to -1 which cannot be narrowed to type 'uint32_t' (aka 'unsigned int') [-Wc++11-narrowing]
14	RPV1_PACKET_VARIABLE, /* user joined */
15	^~~~~~~~~~~~~~~~~~~~
16	RealmProtocol.cpp:10:30: note: expanded from macro 'RPV1_PACKET_VARIABLE'
17	#define RPV1_PACKET_VARIABLE -1
18	^~
19	RealmProtocol.cpp:16:2: note: insert an explicit cast to silence this issue
20	RPV1_PACKET_VARIABLE, /* user joined */
21	^~~~~~~~~~~~~~~~~~~~
22	static_cast<uint32_t>( )
23	RealmProtocol.cpp:10:30: note: expanded from macro 'RPV1_PACKET_VARIABLE'
24	#define RPV1_PACKET_VARIABLE -1
25	^~
26	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'
27	return soa::GenericPtr();
28	^~~~~~~~~~~~~~~~~
29
30	https://github.com/AbiWord/abiword/commit/a83e6f50dbd5
31	https://github.com/AbiWord/abiword/commit/5623a94c756c
32
33	--- plugins/collab/backends/service/xp/RealmProtocol.cpp.orig 2009-05-27 05:41:59 UTC
34	+++ plugins/collab/backends/service/xp/RealmProtocol.cpp
35	@@ -6,8 +6,8 @@ namespace protocolv1 {
36
37	#define MAX_PACKET_DATA_SIZE 6410241024
38
39	-#define RPV1_PACKET_NONEXISTENT -2
40	-#define RPV1_PACKET_VARIABLE -1
41	+#define RPV1_PACKET_NONEXISTENT uint32_t(-2)
42	+#define RPV1_PACKET_VARIABLE uint32_t(-1)
43
44	static uint32_t body_size[6] = {
45	RPV1_PACKET_NONEXISTENT, /* 0: reserved */
46	--- plugins/collab/backends/service/xp/soa_soup.cpp.orig 2009-09-29 13:58:11 UTC
47	+++ plugins/collab/backends/service/xp/soa_soup.cpp
48	@@ -163,7 +163,7 @@ namespace soup_soa {
49
50	static bool _invoke(const std::string& /url/, const soa::method_invocation& /mi/, SoaSoupSession& sess, std::string& result) {
51	if (!sess.m_session \|\| !sess.m_msg )
52	- return soa::GenericPtr();
53	+ return false;
54
55	guint status = soup_session_send_message (sess.m_session, sess.m_msg);
56	if (!(SOUP_STATUS_IS_SUCCESSFUL (status) \|\|
57	--- plugins/latex/xp/ie_exp_LaTeX.cpp.orig 2013-04-07 13:53:03 UTC
58	+++ plugins/latex/xp/ie_exp_LaTeX.cpp
59	@@ -1329,7 +1329,7 @@ void s_LaTeX_Listener::_outputData(const UT_UCSChar *
60	m_pie->write(sBuf.c_str(),sBuf.size());
61	}
62
63	-#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true;
64	+#define SUB(a,who) case a: subst = "\\(\\" who"\\)"; return true;
65	#define SUBd(a,who) case a: subst = who; return true;
66	static bool _convertLettersToSymbols(char c, const char *& subst)
67	{
68	--- plugins/xslfo/xp/ie_exp_XSL-FO.cpp.orig 2013-04-07 13:53:03 UTC
69	+++ plugins/xslfo/xp/ie_exp_XSL-FO.cpp
70	@@ -1451,7 +1451,7 @@ void s_XSL_FO_Listener::_openSection(PT_AttrPropIndex
71	{ \
72	UT_UTF8String esc = szValue; \
73	esc.escapeXML(); \
74	- buf += " "x"=\""; \
75	+ buf += " " x"=\""; \
76	buf += esc.utf8_str(); \
77	buf += "\""; \
78	}
79	--- src/af/xap/xp/xap_Dialog.cpp.orig 2013-04-07 13:53:03 UTC
80	+++ src/af/xap/xp/xap_Dialog.cpp
81	@@ -267,7 +267,7 @@ XAP_Dialog_Modeless::BuildWindowName(char * pWindowNam
82	// This function constructs and returns the window name of a modeless dialog by
83	// concatenating the active frame with the dialog name
84
85	- *pWindowName = (char) NULL;
86	+ *pWindowName = '\0';
87	UT_UTF8String wn = UT_UTF8String(pDialogName);
88
89	XAP_Frame* pFrame = getActiveFrame();
90	--- src/wp/ap/gtk/ap_UnixApp.cpp.orig 2013-04-07 13:53:03 UTC
91	+++ src/wp/ap/gtk/ap_UnixApp.cpp
92	@@ -863,7 +863,7 @@ static bool is_so (const char *file) {
93	if (len < (strlen(G_MODULE_SUFFIX) + 2)) // this is ".so" and at least one char for the filename
94	return false;
95	const char *suffix = file+(len-3);
96	- if(0 == strcmp (suffix, "."G_MODULE_SUFFIX))
97	+ if(0 == strcmp (suffix, "." G_MODULE_SUFFIX))
98	return true;
99	return false;
100	}

Line 0 Link Here

(-)files/patch-flickering (+138 lines)
		1	--- src/af/gr/gtk/gr_UnixCairoGraphics.cpp.orig 2019-04-03 20:11:12 UTC
		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.orig 2019-04-03 18:13:38 UTC
		15	+++ src/af/gr/xp/gr_Caret.cpp
		16	@@ -146,8 +146,10 @@ void GR_Caret::s_work(UT_Worker * _w)
		17	{
		18	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());
		19
		20	- if (c->m_nDisableCount == 0)
		21	- c->_blink(false);
		22	+ c->m_enabler->stop();
		23	+ c->m_worker->stop();
		24	+ c->m_worker->start();
		25	+ c->_blink(true);
		26	}
		27
		28	/** One-time enabler. */
		29	@@ -155,22 +157,17 @@ void GR_Caret::s_enable(UT_Worker * _w)
		30	{
		31	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());
		32
		33	+ c->m_enabler->stop();
		34	c->m_worker->stop();
		35	- c->_blink(true);
		36	- if (!c->m_bCursorIsOn)
		37	- c->_blink(true); // blink again
		38	- else
		39	- {
		40	- c->_blink(true); // ?? - MARCM
		41	- c->_blink(true);
		42	- }
		43	c->m_worker->start();
		44	- c->m_enabler->stop();
		45	+ c->_blink(true);
		46	}
		47
		48	void GR_Caret::s_blink_timeout(UT_Worker * _w)
		49	{
		50	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());
		51	+
		52	+ c->m_blinkTimeout->stop();
		53	if (c->isEnabled())
		54	c->disable();
		55	}
		56	--- src/af/util/xp/ut_iconv.cpp.orig 2019-04-03 18:13:38 UTC
		57	+++ src/af/util/xp/ut_iconv.cpp
		58	@@ -264,10 +264,10 @@ const char * ucs4Internal ()
		59	// we special-case the win32 build, otherwise spelling and other stuff
		60	// just doesn't work
		61	return "UCS-4LE";
		62	-#elif defined(_LIBICONV_H)
		63	+#elif defined(_LIBICONV_H) \|\| defined(__FreeBSD__)
		64	// libiconv seems to prefer UCS-4-INTERNAL to UCS-4BE and UCS-4LE
65	return "UCS-4-INTERNAL";
66	-#elif defined(__FreeBSD__) \|\| defined(__OpenBSD__) \|\| defined(__NetBSD__)
67	+#elif defined(__OpenBSD__) \|\| defined(__NetBSD__)
68	// we special case the BSDs since spelling just doesn't work
69	return "UCS4";
70	#else
71	--- src/af/xap/gtk/xap_UnixFrameImpl.cpp.orig 2019-04-03 18:13:38 UTC
72	+++ src/af/xap/gtk/xap_UnixFrameImpl.cpp
73	@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget *
74	}
75
76	#if GTK_CHECK_VERSION(3,0,0)
77	-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
78	+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
79	#else
80	gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
81	#endif
82	{
83	XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
84	FV_View * pView = static_cast<FV_View *>(pUnixFrameImpl->getFrame()->getCurrentView());
85	+ double x, y, width, height;
86	#if GTK_CHECK_VERSION(3,0,0)
87	- GdkEventExpose pExposeEvent = reinterpret_cast<GdkEventExpose >(gtk_get_current_event());
88	+ cairo_clip_extents (cr, &x, &y, &width, &height);
89	+ width -= x;
90	+ height -= y;
91	+#else
92	+ x = pExposeEvent->area.x;
93	+ y = pExposeEvent->area.y;
94	+ width = pExposeEvent->area.width;
95	+ height = pExposeEvent->area.height;
96	#endif
97	/* Jean: commenting out next lines since the zoom update code does draw only
98	* part of what needs to be updated. */
99	@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, Gdk
100	UT_Rect rClip;
101	if (pGr->getPaintCount () > 0)
102	return TRUE;
103	- 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));
104	- rClip.left = pGr->tlu(pExposeEvent->area.x);
105	- rClip.top = pGr->tlu(pExposeEvent->area.y);
106	- rClip.width = pGr->tlu(pExposeEvent->area.width)+1;
107	- rClip.height = pGr->tlu(pExposeEvent->area.height)+1;
108	-#if GTK_CHECK_VERSION(3,0,0)
109	+ rClip.left = pGr->tlu(x);
110	+ rClip.top = pGr->tlu(y);
111	+ #if GTK_CHECK_VERSION(3,0,0)
112	+ rClip.width = pGr->tlu(width);
113	+ rClip.height = pGr->tlu(height);
114	static_cast<GR_CairoGraphics *>(pGr)->setCairo(cr);
115	pView->draw(&rClip);
116	static_cast<GR_CairoGraphics *>(pGr)->setCairo(NULL);
117	#else
118	+ rClip.width = pGr->tlu(width)+1;
119	+ rClip.height = pGr->tlu(height)+1;
120	pView->draw(&rClip);
121	#endif
122	}
123	- return FALSE;
124	+ return TRUE;
125	}
126
127	static bool bScrollWait = false;
128	--- src/af/xap/gtk/xap_UnixFrameImpl.h.orig 2019-04-03 18:13:38 UTC
129	+++ src/af/xap/gtk/xap_UnixFrameImpl.h
130	@@ -152,7 +152,7 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl (protec
131	static gint key_release_event(GtkWidget* w, GdkEventKey* e);
132	static gint delete_event(GtkWidget * w, GdkEvent * /event/, gpointer /data/);
133	#if GTK_CHECK_VERSION(3,0,0)
134	- static gint draw(GtkWidget * w, cairo_t * cr);
135	+ static gboolean draw(GtkWidget * w, cairo_t * cr);
136	#else
137	static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
138	#endif

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-15 Link Here

(-)files/patch-src_af_util_xp_ut_iconv.cpp (-15 lines)
1	--- src/af/util/xp/ut_iconv.cpp.orig 2009-06-25 02:52:27.000000000 +0200
2	+++ src/af/util/xp/ut_iconv.cpp 2009-10-27 22:43:07.000000000 +0100
3	@@ -264,10 +264,10 @@ const char * ucs4Internal ()
4	// we special-case the win32 build, otherwise spelling and other stuff
5	// just doesn't work
6	return "UCS-4LE";
7	-#elif defined(_LIBICONV_H)
8	+#elif defined(_LIBICONV_H) \|\| defined(__FreeBSD__)
9	// libiconv seems to prefer UCS-4-INTERNAL to UCS-4BE and UCS-4LE
10	return "UCS-4-INTERNAL";
11	-#elif defined(__FreeBSD__) \|\| defined(__OpenBSD__) \|\| defined(__NetBSD__)
12	+#elif defined(__OpenBSD__) \|\| defined(__NetBSD__)
13	// we special case the BSDs since spelling just doesn't work
14	return "UCS4";
15	#else

Lines 1-26 Link Here

(-)files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp (-24 / +12 lines)
1	--- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig 2015-03-31 15:14:42 UTC	1	--- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig 2019-04-03 21:34:11 UTC
2	+++ src/text/ptbl/xp/pd_DocumentRDF.cpp	2	+++ src/text/ptbl/xp/pd_DocumentRDF.cpp
3	@@ -570,6 +570,11 @@ bool PD_URI::operator==(const std::strin	3	@@ -2269,9 +2269,8 @@ PD_RDFEvent::exportToFile( const std::string& filename
4	return m_value == b;	4	icalcomponent_set_uid( c, m_uid.c_str() );
5	}	5	icalcomponent_set_location( c, m_location.c_str() );
6		6	icalcomponent_set_description( c, m_desc.c_str() );
7	+bool PD_URI::operator<(const PD_URI& b) const	7	- icalcomponent_set_dtstart( c, icaltime_from_timet( m_dtstart, 0 ) );
8	+{	8	- icalcomponent_set_dtend( c, icaltime_from_timet( m_dtend, 0 ) );
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	-	9	-
24	bool operator<( std::pair< PD_URI, PD_URI > a, PD_URI b)	10	+ icalcomponent_set_dtstart( c, icaltime_from_timet_with_zone( m_dtstart, 0, 0) );
25	{	11	+ icalcomponent_set_dtend( c, icaltime_from_timet_with_zone( m_dtend, 0, 0 ) );
26	return a.first.toString() < b.toString();	12	char* data = icalcomponent_as_ical_string( c );
		13	std::ofstream oss( filename.c_str() );
		14	oss.write( data, strlen(data) );