Bugzilla Bug 96796

Compile fails as follows on GCC 4:
if g++ -DPACKAGE_NAME=\"AbiSuite\"
-DPACKAGE_TARNAME=\"abisuite\" -DPACKAGE_VERSION=\"2.2\"
-DPACKAGE_STRING=\"AbiSuite\ 2.2\"
-DPACKAGE_BUGREPORT=\"http://www.abisource.com/\"
-DPACKAGE=\"AbiSuite-2.2\" -DVERSION=\"2.2.8\"
-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1
-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1
-DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1
-DHAVE_UNISTD_H=1 -DSIZEOF_LONG_INT=8 -DENABLE_BINRELOC=
-DHAVE_LIBPTHREAD=1 -DBR_PTHREAD=1 -DSTDC_HEADERS=1
-DHAVE_LIMITS_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_TIME_H=1
-DHAVE_UNISTD_H=1 -DHAVE_MALLOC_H=1 -DHAVE_LIBXML2=1
-DHAVE_WV=1 -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1
-DRETSIGTYPE=void -DHAVE_RE_COMP=1 -DHAVE_REGCOMP=1
-DHAVE_STRDUP=1 -DHAVE_STRSTR=1 -DHAVE_STRCASECMP=1 -I. -I.
-I'../../../../src/af/util/xp' -I'../../../../src/af/ev/xp'
-I'../../../../src/af/ev/xp' -I'../../../../src/af/gr/xp'
-I'../../../../src/af/xap/xp'
-I'../../../../src/af/util/unix'
-I'../../../../src/af/ev/unix'
-I'../../../../src/af/gr/unix'
-I'../../../../src/af/xap/unix'
-I'../../../../src/af/xap/unix/gnome'
-I'../../../../src/af/ev/unix/gnome'
-I'../../../../src/wp/ap/xp'
-I'../../../../src/wp/impexp/xp'
-I'../../../../src/wp/ap/unix'
-I'../../../../src/wp/ap/xp/ToolbarIcons'
-I'../../../../src/wp/ap/unix/gnome'
-I'../../../../src/pkg/linux/apkg'
-I'../../../../src/text/ptbl/xp'
-I'../../../../src/text/fmt/xp'
-I'../../../../src/other/spell/xp'
-I'../../../../src/other/fribidi/xp'
-I'../../../../src/other/ttftool/unix' -Wall -pedantic
-ansi -D_POSIX_SOURCE -D_BSD_SOURCE -pipe -DNDEBUG
-I/usr/include/libxml2 -I/usr/include/fribidi
-I/usr/src/redhat/BUILD/abiword-2.2.8/wv
-I/usr/X11R6/include -I/usr/include/freetype2
-I/usr/include/freetype2/config -I/usr/include/libpng12
-DHAVE_THREADS=1 -pthread -I/usr/include/glib-2.0
-I/usr/lib64/glib-2.0/include -DABISIZEOF_LONG_INT=8
-DORBIT2=1 -pthread -DXTHREADS -D_REENTRANT
-DXUSE_MTSAFE_API -I/usr/include/libbonobo-2.0
-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-I/usr/include/orbit-2.0
-I/usr/include/bonobo-activation-2.0
-I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0
-I/usr/include/libgnomecanvas-2.0 -I/usr/include/gtk-2.0
-I/usr/include/libart-2.0 -I/usr/include/gconf/2
-I/usr/include/libbonoboui-2.0 -I/usr/include/gnome-vfs-2.0
-I/usr/lib64/gnome-vfs-2.0/include -I/usr/include/pango-1.0
-I/usr/include/freetype2 -I/usr/lib64/gtk-2.0/include
-I/usr/X11R6/include -I/usr/include/atk-1.0
-I/usr/include/freetype2/config -I/usr/include/libxml2
-I/usr/include/libgnomeprint-2.2
-I/usr/include/libgnomeprintui-2.2
-I/usr/include/libglade-2.0 -DHAVE_GNOME=1
-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -DORBIT2=1
-pthread -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0
-I/usr/lib64/glib-2.0/include -I/usr/include/libgnomeui-2.0
-I/usr/include/libgnome-2.0 -I/usr/lib64/gtk-2.0/include
-I/usr/X11R6/include -I/usr/include/atk-1.0
-I/usr/include/pango-1.0 -I/usr/include/freetype2
-I/usr/include/freetype2/config
-I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0
-I/usr/include/gconf/2 -I/usr/include/libbonoboui-2.0
-I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0
-I/usr/include/gnome-vfs-2.0
-I/usr/lib64/gnome-vfs-2.0/include
-I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2
   -DUSE_GUCHARMAP -DSUPPORTS_UT_IDLE=1
-DABISUITE_HOME=\"/usr/share/AbiSuite-2.2\"
-DABI_BUILD_VERSION=\"2.2.8\" -MT ap_Convert.o -MD -MP -MF
".deps/ap_Convert.Tpo" -c -o ap_Convert.o ap_Convert.cpp; \
then mv -f ".deps/ap_Convert.Tpo" ".deps/ap_Convert.Po";
else rm -f ".deps/ap_Convert.Tpo"; exit 1; fi
../../../../src/wp/impexp/xp/ie_mailmerge.h:63: error:
'IE_MailMerge' has not been declared

Created an attachment (id=61731) [edit]
abiword-2.2.8-mailmerge.patch__charset_ISO-8859-1

Promised patch from upstream.

looks fine to me, go ahead & apply Tony.

Compile tested, committed.