Let this compile with NetBSD-current/gcc-3.3.1.

4 files changed, 52 insertions, 1 deletions

diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 3ce8c778d12..c8b7f3f8bac 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.19 2003/04/17 06:22:23 martti Exp $
+$NetBSD: distinfo,v 1.20 2003/09/26 14:31:40 fredb Exp $
 
 SHA1 (abisuite/abiword-1.0.5.tar.gz) = 29292d858dd361bd4ad10c98c32c5b8b5941110d
 Size (abisuite/abiword-1.0.5.tar.gz) = 18966097 bytes
 SHA1 (patch-ab) = 31f61d0a855db4dd9d3fa2c2ab1bae31fb03c636
+SHA1 (patch-ac) = 4b07508d1183a17b7659c1c67f62d69646bd4565
 SHA1 (patch-ad) = 1b1cdab98c9b58b5395e0a43169fa54cac819b04
 SHA1 (patch-ae) = a8fbe68e56bed6881329632bb12173cb67b8d750
 SHA1 (patch-af) = 9bf0cb3abe338b7021acbf771b34b55bb7edcbae
 SHA1 (patch-ag) = 9a9faa81fc5343c7f33e8148f30fbbb845b21c4c
 SHA1 (patch-ah) = 19e2e5def6d235ff44efc856346a4ae85b2bdbd5
+SHA1 (patch-ai) = 7d25e739042c0ce703a32ddf8e08585fad0aea31
+SHA1 (patch-aj) = 661784a408c0cd399cf04ba9e9845a405ab53575
 SHA1 (patch-ak) = 692401ca4f4d701b5eca3952ef300497d35f6b27
 SHA1 (patch-al) = cfeed65d62c8f580fcb504be68f94c8343cca583
diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac
new file mode 100644
index 00000000000..93087957930
--- /dev/null
+++ b/editors/abiword/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.8 2003/09/26 14:31:40 fredb Exp $
+
+--- src/af/util/xp/ut_iconv.cpp.orig	2002-04-24 14:49:23.000000000 -0500
++++ src/af/util/xp/ut_iconv.cpp
+@@ -159,8 +159,8 @@ size_t  UT_iconv( UT_iconv_t cd, const c
+   if ( !UT_iconv_isValid ( cd ) )
+     return (size_t)-1;
+ 
+-  ICONV_CONST char ** buf = (ICONV_CONST char**)(inbuf);
+-  return iconv( cd, buf, inbytesleft, outbuf, outbytesleft );
++  // ICONV_CONST char ** buf = (ICONV_CONST char**)(inbuf);
++  return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft );
+ }
+ 
+ int  UT_iconv_close( UT_iconv_t cd )
diff --git a/editors/abiword/patches/patch-ai b/editors/abiword/patches/patch-ai
new file mode 100644
index 00000000000..2780827f764
--- /dev/null
+++ b/editors/abiword/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.7 2003/09/26 14:31:40 fredb Exp $
+
+--- src/wp/ap/xp/ap_Menu_Id_List.h.orig	2002-03-22 12:21:45.000000000 -0600
++++ src/wp/ap/xp/ap_Menu_Id_List.h
+@@ -262,4 +262,8 @@ menuitem(AUTOTEXT_EMAIL_6)
+ /**** Add Menu Items here ****/
+ 
+ 
++#ifdef MENUITEMLAST_IS_SPECIAL
++menuitemlast(_BOGUS2__)				/* must be last */
++#else
+ menuitem(_BOGUS2__)				/* must be last */
++#endif
diff --git a/editors/abiword/patches/patch-aj b/editors/abiword/patches/patch-aj
new file mode 100644
index 00000000000..5536957701e
--- /dev/null
+++ b/editors/abiword/patches/patch-aj
@@ -0,0 +1,20 @@
+$NetBSD: patch-aj,v 1.9 2003/09/26 14:31:40 fredb Exp $
+
+--- src/wp/ap/xp/ap_Menu_Id.h.orig	2001-11-08 20:27:10.000000000 -0600
++++ src/wp/ap/xp/ap_Menu_Id.h
+@@ -33,11 +33,15 @@
+ 
+ /* the following Id's must start at zero and be contiguous */
+ 
++
+ #define menuitem(id)			AP_MENU_ID_##id,
++#define menuitemlast(id)		AP_MENU_ID_##id
+ 
+ enum _Ap_Menu_Id
+ {
++#define MENUITEMLAST_IS_SPECIAL
+ #include "ap_Menu_Id_List.h"
++#undef MENUITEMLAST_IS_SPECIAL
+ };
+ 
+