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

3 files changed, 48 insertions, 0 deletions

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