From d530edd8791da5d6db4ddd202ff6507eedd8b1a1 Mon Sep 17 00:00:00 2001
From: fake <fake@rapidnetworks.de>
Date: Wed, 26 Jul 2006 15:40:21 +0000
Subject: [PATCH] fake: 	abiword: fix compile

[2006072320134226178] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7757 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/gnome2/abiword/gcc4.patch             | 11 ++++++++++
 package/gnome2/abiword/libxml-apichange.patch | 20 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 package/gnome2/abiword/gcc4.patch
 create mode 100644 package/gnome2/abiword/libxml-apichange.patch

diff --git a/package/gnome2/abiword/gcc4.patch b/package/gnome2/abiword/gcc4.patch
new file mode 100644
index 000000000..5def79dbb
--- /dev/null
+++ b/package/gnome2/abiword/gcc4.patch
@@ -0,0 +1,11 @@
+--- ./abi/src/wp/impexp/xp/ie_mailmerge.h.orig	2006-07-23 19:50:50.000000000 +0100
++++ ./abi/src/wp/impexp/xp/ie_mailmerge.h	2006-07-23 19:56:30.000000000 +0200
+@@ -28,6 +28,8 @@
+ typedef UT_sint32 IEMergeType;
+ #define IEMT_Unknown ((IEMergeType)-1)
+ 
++class IE_MailMerge;
++
+ class ABI_EXPORT IE_MergeSniffer : public UT_AbiObject
+ {
+   friend class IE_MailMerge;
diff --git a/package/gnome2/abiword/libxml-apichange.patch b/package/gnome2/abiword/libxml-apichange.patch
new file mode 100644
index 000000000..703a75187
--- /dev/null
+++ b/package/gnome2/abiword/libxml-apichange.patch
@@ -0,0 +1,20 @@
+--- ./wv/wvConfig.c.orig	2006-07-23 19:48:19.000000000 +0200
++++ ./wv/wvConfig.c	2006-07-23 19:48:44.000000000 +0200
+@@ -2129,7 +2129,7 @@
+ 
+ }
+ 
+-static void
++void
+ startElement (void *userData, const XML_Char *name, const XML_Char **atts)
+ {
+     unsigned int nAtts = 0;
+@@ -3093,7 +3093,7 @@
+       }
+ }
+ 
+-static void
++void
+ endElement (void *userData, const XML_Char *name)
+ {
+     state_data *mydata = (state_data *) userData;