Changes 2.2.2:

* A MacOSX port
* Table of contents
* Document history/revisions
* Text frames
* Better support for international scripts and locales
* List folding
* Text wrapping around images
* Faster rendering
* Dashboard integration
* Visual drag and drop

4 files changed, 26 insertions, 49 deletions

diff --git a/editors/abiword/patches/patch-aa b/editors/abiword/patches/patch-aa
index 745b3fb1ed2..a004d247bb7 100644
--- a/editors/abiword/patches/patch-aa
+++ b/editors/abiword/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.6 2004/11/22 13:31:46 adam Exp $
+$NetBSD: patch-aa,v 1.7 2005/01/11 11:09:27 adam Exp $
 
---- configure.orig	2004-10-24 04:15:56.000000000 +0000
+--- configure.orig	2004-12-13 10:28:57.000000000 +0000
 +++ configure
-@@ -3852,7 +3852,7 @@ case "$OS_NAME" in
+@@ -4114,7 +4114,7 @@ case "$OS_NAME" in
  		WARNING_CFLAGS=""
  		;;
- 	*BSD)
+ 	*BSD|DragonFly)
 -		WARNING_CFLAGS="-Wall -pedantic -ansi -D_BSD_SOURCE -pipe"
 +		WARNING_CFLAGS="-Wall -D_BSD_SOURCE -pipe"
  		;;
diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab
index ba031be14b3..4cfa0ff31c7 100644
--- a/editors/abiword/patches/patch-ab
+++ b/editors/abiword/patches/patch-ab
@@ -1,15 +1,13 @@
-$NetBSD: patch-ab,v 1.9 2004/03/30 00:53:31 reed Exp $
+$NetBSD: patch-ab,v 1.10 2005/01/11 11:09:27 adam Exp $
 
---- src/af/util/xp/ut_types.h.orig	2003-10-21 09:25:23.000000000 -0700
-+++ src/af/util/xp/ut_types.h
-@@ -259,7 +259,9 @@ ABI_EXPORT void * UT_calloc ( UT_uint32 
- (defined (__MACH__) && defined (__APPLE__)) || \
- (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
- defined(__BEOS__) || defined (__AIX__) || \
--(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1))
-+(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)) || \
-+defined(__NetBSD__) || \
-+(defined(_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x0109)
- 
- #define ICONV_CONST const
+--- src/af/util/xp/ut_iconv.cpp.orig	2004-11-22 10:42:04.000000000 +0000
++++ src/af/util/xp/ut_iconv.cpp
+@@ -339,7 +339,7 @@ size_t UT_iconv( UT_iconv_t cd, const ch
+ #ifdef UT_ICONV_USING_GLIB
+   return g_iconv((GIConv)cd, (char **)inbuf, inbytesleft, outbuf, outbytesleft);
  #else
+-  return iconv( (iconv_t)cd, (ICONV_CONST char **)inbuf, inbytesleft, outbuf, outbytesleft );
++  return iconv( (iconv_t)cd, (const char **)inbuf, inbytesleft, outbuf, outbytesleft );
+ #endif
+ }
+ 
diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac
deleted file mode 100644
index bf3e1eff4bb..00000000000
--- a/editors/abiword/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.13 2004/11/22 13:31:46 adam Exp $
-
---- src/af/xap/unix/xap_UnixFrameImpl.cpp.orig	2004-09-08 23:43:26.000000000 +0000
-+++ src/af/xap/unix/xap_UnixFrameImpl.cpp
-@@ -1666,6 +1666,11 @@ bool XAP_UnixFrameImpl::_openURL(const c
- 		        fmtstring = "phoenix '%s' &";
- 			execstring = g_strdup_printf(fmtstring, szURL);
- 		}
-+		else if(progExists("firefox"))
-+		{
-+			fmtstring = "firefox -a firefox -remote openURL\\('%s'\\) || firefox '%s' &";
-+			execstring = g_strdup_printf(fmtstring, szURL, szURL);
-+		}
- 		else if(progExists("netscape"))
- 		{
- 			// Try to connect to a running Netscape, if not, start new one
diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad
index 12c1fcfba22..cb8ea2afdea 100644
--- a/editors/abiword/patches/patch-ad
+++ b/editors/abiword/patches/patch-ad
@@ -1,24 +1,19 @@
-$NetBSD: patch-ad,v 1.13 2004/10/29 07:42:38 xtraeme Exp $
+$NetBSD: patch-ad,v 1.14 2005/01/11 11:09:27 adam Exp $
 
---- src/af/util/xp/ut_iconv.h.orig	2004-10-29 09:29:57.000000000 +0200
-+++ src/af/util/xp/ut_iconv.h	2004-10-29 09:30:03.000000000 +0200
-@@ -22,6 +22,8 @@
- #ifndef UT_ICONV_H
- #define UT_ICONV_H
+--- src/af/util/xp/ut_iconv.h.orig	2003-11-19 02:38:27.000000000 +0000
++++ src/af/util/xp/ut_iconv.h
+@@ -32,8 +32,14 @@
  
-+#include <sys/param.h>
-+
- #ifdef __cplusplus
- /* make freebsd happy */
- extern "C" {
-@@ -41,6 +43,10 @@
- 
- typedef iconv_t UT_iconv_t;
+ typedef void * UT_iconv_t;
  
 +#if defined(__NetBSD__) && __NetBSD_Version__ >= 200000000
-+struct __tag_iconv_t { };  /* XXX: for catch/throw (ISO C++ 15.1)*/
++struct __tag_iconv_t { }; /* XXX: for catch/throw (ISO C++ 15.1)*/
 +#endif
 +
- #define UT_ICONV_INVALID ((iconv_t)(-1))
+ #define UT_ICONV_INVALID ((UT_iconv_t)(-1))
  
++#include <sys/param.h>
++
  #ifdef __cplusplus
+ 
+ #include "ut_exception.h"