Add AbiWord2-2.0.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1220 df743ca5-7f9a-e211-a948-0013205c9059

15 files changed, 345 insertions, 0 deletions

diff --git a/editors/AbiWord2/files/patch-..::wv::magick::Makefile.in b/editors/AbiWord2/files/patch-..::wv::magick::Makefile.in
new file mode 100644
index 000000000..3880ad648
--- /dev/null
+++ b/editors/AbiWord2/files/patch-..::wv::magick::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/editors/AbiWord2/files/patch-..::wv::magick::Makefile.in,v 1.2 2003/02/23 18:39:35 marcus Exp $
+
+--- ../wv/magick/Makefile.in	2001/08/08 11:44:02	1.1
++++ ../wv/magick/Makefile.in	2001/08/08 11:44:13
+@@ -40,7 +40,7 @@
+ all: $(MAGICKOBJECTS)
+ 
+ %.$(OBJEXT): $(srcdir)/%.c 
+-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c 
++	$(CC) @CPPFLAGS@ $(CFLAGS) -c $(srcdir)/$*.c 
+ 
+ clean:
+ 	rm -rf *.$(OBJEXT) core a.$(OBJEXT)ut *.a
diff --git a/editors/AbiWord2/files/patch-GNUmakefile.am b/editors/AbiWord2/files/patch-GNUmakefile.am
new file mode 100644
index 000000000..3e4cc389d
--- /dev/null
+++ b/editors/AbiWord2/files/patch-GNUmakefile.am
@@ -0,0 +1,22 @@
+--- GNUmakefile.am.orig	Mon Aug 18 09:45:27 2003
++++ GNUmakefile.am	Mon Aug 25 04:25:53 2003
+@@ -76,7 +76,6 @@
+ 
+ # Install the datafiles. This is quick-and-dirty.
+ install-data-local:
+-	@$(mkinstalldirs) $(DESTDIR)$(bonobodir)
+ 	if test -d $(top_srcdir)/../abidistfiles ; then \
+ 	  for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \
+ 	    $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\
+@@ -89,11 +88,7 @@
+ 	      for file in $(top_srcdir)/../abidistfiles/$$dir/* ; do \
+ 	        if test -f $$file ; then \
+ 		  sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \
+-		  if test "$$sfile.server" = $$file; then \
+-		    $(INSTALL_DATA) $$file $(DESTDIR)$(bonobodir); \
+-		  else \
+ 		    $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/$$dir; \
+-		  fi; \
+ 	        fi; \
+ 	      done; \
+ 	    fi; \
diff --git a/editors/AbiWord2/files/patch-af b/editors/AbiWord2/files/patch-af
new file mode 100644
index 000000000..502e8de76
--- /dev/null
+++ b/editors/AbiWord2/files/patch-af
@@ -0,0 +1,11 @@
+--- src/af/util/xp/ut_png.cpp.orig	Wed Apr 17 12:49:55 2002
++++ src/af/util/xp/ut_png.cpp	Fri Apr 19 20:40:25 2002
+@@ -24,7 +24,7 @@
+ #ifdef _AIX
+ #define jmpbuf __jmpbuf
+ #endif
+-#include "png.h"
++#include <png.h>
+ 
+ #include "ut_assert.h"
+ #include "ut_bytebuf.h"
diff --git a/editors/AbiWord2/files/patch-an b/editors/AbiWord2/files/patch-an
new file mode 100644
index 000000000..a116fb076
--- /dev/null
+++ b/editors/AbiWord2/files/patch-an
@@ -0,0 +1,46 @@
+
+$FreeBSD: ports/editors/AbiWord2/files/patch-an,v 1.5 2003/02/23 18:39:35 marcus Exp $
+
+--- src/Makefile.orig	Thu May 30 17:51:53 2002
++++ src/Makefile	Wed Jun  5 15:47:41 2002
+@@ -48,6 +48,7 @@
+ 
+ ## Set the following to a list of pathnames to be copied to $(CANONDIR)
+ CANON_TOPLEVELFILES=	$(ABI_ROOT)/COPYING $(ABI_ROOT)/user/wp/readme.txt
++CANON_TLF_NOTDIR=	$(notdir $(CANON_TOPLEVELFILES))
+ 
+ ## Set the following to a list of directories (probably a subset of DIRS)
+ ## that have work to do.
+@@ -58,6 +59,9 @@
+ 	@for k in $(CANON_TOPLEVELFILES); do			\
+ 		$(ABICOPY) $$k $(CANONDIR);			\
+ 	done
++	@for k in $(CANON_TLF_NOTDIR); do			\
++		$(ABICHMOD) ugo=r $(CANONDIR)/$$k;		\
++	done
+ 	@for k in $(CANON_SubDirs); do				\
+ 		$(MAKE) ABI_ROOT=$(ABI_ROOT) -C $$k canonical;	\
+ 	done
+@@ -72,6 +76,7 @@
+ 			cp $$k american.hash;		\
+ 			rm $$k ;			\
+ 		done)
++	@(cd $(CANONDIR)/dictionary; $(ABICHMOD) ugo=r *)
+ # We currently only ship american.hash, so the above and below aren't logical.
+ # For same reason, this will only copy american.hash-encoding once in place.  The rest is in abispell.
+ 	@$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/*.hash-encoding $(CANONDIR)/dictionary	
+@@ -112,10 +117,12 @@
+ 	fi
+ # icons for X window manager use
+ 	@$(subst xxxx,$(CANONDIR)/icons,$(VERIFY_DIRECTORY))
+-	(cd $(ABI_ROOT)/../abidistfiles/icons; cp abi* $(CANONDIR)/icons)
++	(cd $(ABI_ROOT)/../abidistfiles/icons; $(ABICOPY) abi* $(CANONDIR)/icons)
++	@(cd $(CANONDIR)/icons; $(ABICHMOD) ugo=r *_48*)
+ # font stuff for installation
+ 	@$(subst xxxx,$(CANONDIR)/fonts,$(VERIFY_DIRECTORY))
+-	(cd $(ABI_ROOT)/../unixfonts/fonts ; cp *.* $(CANONDIR)/fonts)
++	(cd $(ABI_ROOT)/../unixfonts/fonts ; $(ABICOPY) *.* $(CANONDIR)/fonts)
++	@(cd $(CANONDIR)/fonts; $(ABICHMOD) ugo=r *.*)
+ endif
+ 
+ ##################################################################
diff --git a/editors/AbiWord2/files/patch-ap b/editors/AbiWord2/files/patch-ap
new file mode 100644
index 000000000..76fbc4554
--- /dev/null
+++ b/editors/AbiWord2/files/patch-ap
@@ -0,0 +1,23 @@
+--- src/wp/Makefile.orig	Sat Apr 13 07:22:38 2002
++++ src/wp/Makefile	Fri Apr 19 23:30:57 2002
+@@ -44,8 +44,18 @@
+ 	@$(subst xxxx,$(CANON_AppDir),$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/strings,$(VERIFY_DIRECTORY))
+ 	@$(subst xxxx,$(CANON_AppDir)/help,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/howto,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/howto/howtoweb.xhtml_data,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/howto/howtoword.xhtml_data,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/info,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/dialogreplace.xhtml_data,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/menufile.xhtml_data,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/workspace.xhtml_data,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/problems,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/en-US/tutorial,$(VERIFY_DIRECTORY))
++	@$(subst xxxx,$(CANON_AppDir)/help/images,$(VERIFY_DIRECTORY))
+ 	@$(ABICOPY) $(USERDIR)/wp/readme.txt $(CANON_AppDir)
+ 	@$(ABICOPY) $(USERDIR)/wp/system.profile* $(CANON_AppDir)
+ 	@$(ABICOPY) $(USERDIR)/wp/strings/*.strings $(CANON_AppDir)/strings
+-	(cd $(USERDIR)/wp/help; tar cf - images ./*.* $(CANON_Lang)/*.* $(CANON_Lang)/*/*.*) | (cd $(CANON_AppDir)/help; tar xf -)
+-	@$(ABICOPY) $(ABI_ROOT)/CREDITS.TXT $(CANON_AppDir)/help/en-US/credits.txt
diff --git a/editors/AbiWord2/files/patch-aq b/editors/AbiWord2/files/patch-aq
new file mode 100644
index 000000000..ed0324f28
--- /dev/null
+++ b/editors/AbiWord2/files/patch-aq
@@ -0,0 +1,27 @@
+--- src/config/abi_defs.mk	Fri Jun  9 15:48:49 2000
++++ src/config/abi_defs.mk.new	Thu Jun 22 16:32:03 2000
+@@ -124,11 +124,11 @@
+ ## INSTALL program...
+ 
+ define MAKE_OBJDIR
+-if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi
++if test ! -d $(@D); then rm -rf $(@D); $(ABIMKDIR) -p $(@D); fi
+ endef
+ 
+ define VERIFY_DIRECTORY
+-if test ! -d xxxx; then rm -rf xxxx; mkdir -p  xxxx; fi
++if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p  xxxx; fi
+ endef
+ 
+ ifeq ($(OS_NAME), WIN32)
+@@ -160,7 +160,9 @@
+ ##################################################################
+ ##################################################################
+ 
+-ABICOPY=cp
++ABICOPY = cp
++ABICHMOD = chmod
++ABIMKDIR = mkdir -m u=rwx,go=rx
+ 
+ ifdef ABISOURCE_LICENSED_TRADEMARKS
+ ABI_TMDEFS=	-DABISOURCE_LICENSED_TRADEMARKS
diff --git a/editors/AbiWord2/files/patch-ar b/editors/AbiWord2/files/patch-ar
new file mode 100644
index 000000000..9f93ba444
--- /dev/null
+++ b/editors/AbiWord2/files/patch-ar
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/editors/AbiWord2/files/patch-ar,v 1.3 2003/02/23 18:39:35 marcus Exp $
+
+--- src/pkg/common/unix/scripts/install.sh.orig	Sat Apr  7 10:59:52 2001
++++ src/pkg/common/unix/scripts/install.sh	Wed Aug  8 13:31:57 2001
+@@ -80,7 +80,7 @@
+ 
+ echo "Installing program binaries to [$LIBEXECDIR]..."
+ # Setup bins 
+-(cd $SRCDIR/bin; tar cf - *) | (cd $LIBEXECDIR; tar xf -)
++(cd $SRCDIR/bin; cp Abi* $LIBEXECDIR)
+ 
+ ########################################################################
+ # If we're on Solaris, run makepsres on the font path
diff --git a/editors/AbiWord2/files/patch-autogen.sh b/editors/AbiWord2/files/patch-autogen.sh
new file mode 100644
index 000000000..4534322f4
--- /dev/null
+++ b/editors/AbiWord2/files/patch-autogen.sh
@@ -0,0 +1,63 @@
+--- autogen.sh.orig	Fri Aug  1 04:40:52 2003
++++ autogen.sh	Mon Aug 25 03:31:45 2003
+@@ -10,31 +10,31 @@
+ 
+ rm -f autogen.err
+ 
+-automake --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
++%%AUTOMAKE%% --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
+ 
+ if [ $? -ne 0 ]; then
+     echo "Error: you need automake 1.4 or later.  Please upgrade."
+     exit 1
+ fi
+ 
+-if test ! -d `aclocal --print-ac-dir 2>> autogen.err`; then
+-  echo "Bad aclocal (automake) installation"
++if test ! -d `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`; then
++  echo "Bad %%ACLOCAL%% (automake) installation"
+   exit 1
+ fi
+ 
+ # Produce aclocal.m4, so autoconf gets the automake macros it needs
+ # 
+-echo "Creating aclocal.m4: aclocal -I ac-helpers $ACLOCAL_FLAGS"
++echo "Creating aclocal.m4: %%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS"
+ 
+-aclocal -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
++%%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
+ 
+ echo "Checking for PKG_CHECK_MODULES..."
+ 
+ pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
+ if test "x$pkgcheckdef" = "x"; then
+-  echo "Running aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS"
+-  (aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS 2>> autogen.err) || {
+-    echo "aclocal failed! Unable to continue."
++  echo "Running %%ACLOCAL%% -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS"
++  (%%ACLOCAL%% -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS 2>> autogen.err) || {
++    echo "%%ACLOCAL%% failed! Unable to continue."
+     exit 1
+   }
+   pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
+@@ -56,9 +56,9 @@
+ # Produce all the `GNUmakefile.in's and create neat missing things
+ # like `install-sh', etc.
+ # 
+-echo "automake --add-missing --copy --foreign"
++echo "%%AUTOMAKE%% --add-missing --copy --foreign"
+ 
+-automake --add-missing --copy --foreign 2>> autogen.err || {
++%%AUTOMAKE%% --add-missing --copy --foreign 2>> autogen.err || {
+     echo ""
+     echo "* * * warning: possible errors while running automake - check autogen.err"
+     echo ""
+@@ -74,7 +74,7 @@
+ # 
+ echo "Creating configure..."
+ 
+-autoconf 2>> autogen.err || {
++%%AUTOCONF%% 2>> autogen.err || {
+     echo ""
+     echo "* * * warning: possible errors while running automake - check autogen.err"
+     echo ""
diff --git a/editors/AbiWord2/files/patch-ax b/editors/AbiWord2/files/patch-ax
new file mode 100644
index 000000000..91ab01775
--- /dev/null
+++ b/editors/AbiWord2/files/patch-ax
@@ -0,0 +1,10 @@
+--- ../wv/libole2/ms-ole.h	Sun Oct  6 20:18:41 2002
++++ ../wv/libole2/ms-ole.h.new	Sun Oct  6 20:18:48 2002
+@@ -20,6 +20,7 @@
+ #if defined(__QNXNTO__)
+ # include <sys/types.h>	
+ #endif
++# include <sys/types.h>	
+ # include <fcntl.h>       /* for mode_t */
+ #else
+ # include <stdlib.h>
diff --git a/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp b/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
new file mode 100644
index 000000000..720a1a614
--- /dev/null
+++ b/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp,v 1.3 2003/02/23 18:39:36 marcus Exp $
+
+--- src/wp/ap/unix/ap_UnixApp.cpp.orig	Thu Dec  6 09:00:14 2001
++++ src/wp/ap/unix/ap_UnixApp.cpp	Mon Dec 17 13:49:48 2001
+@@ -612,7 +612,7 @@
+   {
+       pluginDir = pluginList[i];
+ 
+-      n = scandir(pluginDir.c_str(), &namelist, so_only, alphasort);
++      n = scandir(pluginDir.c_str(), &namelist, (int (*)(dirent *))so_only, alphasort);
+       UT_DEBUGMSG(("DOM: found %d plugins in %s\n", n, pluginDir.c_str()));
+ 
+       if (n > 0)
diff --git a/editors/AbiWord2/files/patch-src_af_util_xp_ut_iconv.cpp b/editors/AbiWord2/files/patch-src_af_util_xp_ut_iconv.cpp
new file mode 100644
index 000000000..72ff257a6
--- /dev/null
+++ b/editors/AbiWord2/files/patch-src_af_util_xp_ut_iconv.cpp
@@ -0,0 +1,13 @@
+--- src/af/util/xp/ut_iconv.cpp.orig	Thu Jul 17 15:12:55 2003
++++ src/af/util/xp/ut_iconv.cpp	Thu Jul 17 15:16:40 2003
+@@ -295,8 +295,8 @@
+     return (size_t)-1;
+ 
+ 
+-  ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf);
+-  return iconv( cd, buf, inbytesleft, outbuf, outbytesleft );
++  //ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf);
++  return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft );
+ }
+ 
+ int  UT_iconv_close( UT_iconv_t cd )
diff --git a/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp b/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp
new file mode 100644
index 000000000..a82b611a7
--- /dev/null
+++ b/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp
@@ -0,0 +1,26 @@
+--- src/af/util/xp/ut_string_class.cpp.orig	Mon Aug 25 03:34:03 2003
++++ src/af/util/xp/ut_string_class.cpp	Mon Aug 25 03:42:00 2003
+@@ -28,6 +28,7 @@
+ #include <locale.h>
+ #include <ctype.h>
+ #include <stdarg.h>
++#include <glib.h>
+ 
+ #include "ut_string.h"
+ #include "ut_string_class.h"
+@@ -340,13 +341,13 @@
+   return len;
+ }
+ 
++#define VA_COPY G_VA_COPY
++
+ #if !defined (VA_COPY)
+ #  if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32) || defined(WIN32)) || defined(__s390__) || defined(__x86_64__)
+ #  define VA_COPY(ap1, ap2)	  (*(ap1) = *(ap2))
+ #  elif defined (VA_COPY_AS_ARRAY)
+ #  define VA_COPY(ap1, ap2)	  memmove ((ap1), (ap2), sizeof (va_list))
+-#  elif defined (__GNUC__)
+-#  define VA_COPY(ap1,ap2)     __va_copy((ap1),(ap2))
+ #  else /* va_list is a pointer */
+ #  define VA_COPY(ap1, ap2)	  ((ap1) = (ap2))
+ #  endif /* va_list is a pointer */
diff --git a/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixFont.cpp b/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixFont.cpp
new file mode 100644
index 000000000..29b75760b
--- /dev/null
+++ b/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixFont.cpp
@@ -0,0 +1,15 @@
+--- src/af/xap/unix/xap_UnixFont.cpp.orig	Mon Aug  4 20:24:53 2003
++++ src/af/xap/unix/xap_UnixFont.cpp	Mon Aug  4 20:25:50 2003
+@@ -400,10 +400,10 @@
+ 	size_t idx = 0;
+ 	for (size_t i = 0; i < coverage.size(); i += 2)
+ 	  {
+-		  UT_UCSChar c1 = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(coverage[i]));
++		  UT_UCSChar c1 = static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(coverage[i]));
+ 		  UT_UCSChar c2 =
+ 			  static_cast<UT_UCSChar>(static_cast<UT_uint32>(c1)) +
+-			  static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(coverage[i + 1]));
++			  static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(coverage[i + 1]));
+ 		  for (UT_UCSChar c = c1; c < c2; ++c)
+ 		    {
+ 			    FT_UInt glyph_idx = FT_Get_Char_Index(face, c);
diff --git a/editors/AbiWord2/files/patch-src_af_xap_xp_xap_Draw_Symbol.cpp b/editors/AbiWord2/files/patch-src_af_xap_xp_xap_Draw_Symbol.cpp
new file mode 100644
index 000000000..baf6ff9a7
--- /dev/null
+++ b/editors/AbiWord2/files/patch-src_af_xap_xp_xap_Draw_Symbol.cpp
@@ -0,0 +1,36 @@
+--- src/af/xap/xp/xap_Draw_Symbol.cpp.orig	Wed Jul 30 01:04:34 2003
++++ src/af/xap/xp/xap_Draw_Symbol.cpp	Wed Jul 30 01:07:18 2003
+@@ -153,7 +153,7 @@
+ 	
+ 	for (i = 0; i < m_vCharSet.size(); i += 2)
+ 	{
+-		UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i]));
++		UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(m_vCharSet[i]));
+ 		size_t nb_chars = reinterpret_cast<size_t>(m_vCharSet[i + 1]);
+ 
+ 		for (UT_UCSChar j = base; j < base + nb_chars; ++j)
+@@ -194,11 +194,11 @@
+ 	UT_DEBUGMSG(("calcSymbolFromCoords(x = [%u], y = [%u]) =", ix, iy));
+ 	for (size_t i = 0; i < m_vCharSet.size(); i += 2)
+ 	{
+-		count += reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]);
++		count += static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i + 1]));
+ 		if (count > index)
+ 		{
+ 			UT_DEBUGMSG((" %u\n", static_cast<UT_uint32>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]))));
+-			return static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]));
++			return static_cast<UT_UCSChar>(static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i])) + index - count + static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i + 1])));
+ 		}
+ 	}
+ 
+@@ -227,8 +227,8 @@
+ 
+ 	for (size_t i = 0; i < m_vCharSet.size(); i += 2)
+ 	{
+-		UT_uint32 base = reinterpret_cast<UT_uint32>(m_vCharSet[i]);
+-		UT_uint32 size = reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]);
++		UT_uint32 base = static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i]));
++		UT_uint32 size = static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i + 1]));
+ 		
+ 		if (base + size > c)
+ 		{
diff --git a/editors/AbiWord2/files/patch-src_pkg_linux_rpm_data_abiword.desktop b/editors/AbiWord2/files/patch-src_pkg_linux_rpm_data_abiword.desktop
new file mode 100644
index 000000000..656c586a6
--- /dev/null
+++ b/editors/AbiWord2/files/patch-src_pkg_linux_rpm_data_abiword.desktop
@@ -0,0 +1,11 @@
+--- src/pkg/linux/rpm/data/abiword.desktop.orig	Sun Apr  6 14:45:19 2003
++++ src/pkg/linux/rpm/data/abiword.desktop	Sun Apr 20 00:33:09 2003
+@@ -12,7 +12,7 @@
+ Icon=abiword_48.png
+ Terminal=0
+ Type=Application
+-Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
++Categories=Application;Office;WordProcessor;
+ StartupNotify=true
+ Encoding=UTF-8
+ X-Desktop-File-Install-Version=0.3