rpms/abiword/FC-3 abiword-2.0.12.libwpd.patch,1.8,1.9
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Oct 20 13:25:41 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/abiword/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv15443
Modified Files:
abiword-2.0.12.libwpd.patch
Log Message:
fix up libwpd problem
abiword-2.0.12.libwpd.patch:
abi/src/wp/impexp/xp/ie_mailmerge.h | 1
abiword-2.0.12.hacked/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.cpp | 1061 +++++-----
abiword-2.0.12.hacked/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.h | 128 -
abiword-2.0.12/abi/ac-helpers/abi-plugins.m4 | 2
abiword-2.0.12/abi/configure | 16
abiword-2.0.12/abiword-plugins/acinclude.m4 | 4
abiword-2.0.12/abiword-plugins/aclocal.m4 | 4
abiword-2.0.12/abiword-plugins/configure | 16
abiword-2.0.12/abiword-plugins/wp/impexp/wordperfect/plugin.m4 | 8
wv/wvConfig.c | 10
10 files changed, 649 insertions(+), 601 deletions(-)
Index: abiword-2.0.12.libwpd.patch
===================================================================
RCS file: /cvs/dist/rpms/abiword/FC-3/abiword-2.0.12.libwpd.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abiword-2.0.12.libwpd.patch 17 Oct 2005 12:25:49 -0000 1.8
+++ abiword-2.0.12.libwpd.patch 20 Oct 2005 13:25:37 -0000 1.9
@@ -6,7 +6,7 @@
wordperfect)
_abi_plugin_lib=AbiWordPerfect
- PKG_CHECK_MODULES(_abi_wordperfect,libwpd-1 >= 0.5.0)
-+ PKG_CHECK_MODULES(_abi_wordperfect,libwpd-0.8 >= 0.5.0)
++ PKG_CHECK_MODULES(_abi_wordperfect,libwpd-stream-0.8 >= 0.5.0)
PLUGIN_LIBS="$PLUGIN_LIBS $_abi_wordperfect_LIBS"
;;
xhtml)
@@ -23,7 +23,7 @@
+echo $ECHO_N "checking for libwpd >= 0.5.0... $ECHO_C" >&6
- if $PKG_CONFIG --exists "libwpd-1 >= 0.5.0" ; then
-+ if $PKG_CONFIG --exists "libwpd-0.8 >= 0.5.0" ; then
++ if $PKG_CONFIG --exists "libwpd-stream-0.8 >= 0.5.0" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
@@ -31,14 +31,14 @@
echo "$as_me:$LINENO: checking _abi_wordperfect_CFLAGS" >&5
echo $ECHO_N "checking _abi_wordperfect_CFLAGS... $ECHO_C" >&6
- _abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd-1 >= 0.5.0"`
-+ _abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 >= 0.5.0"`
++ _abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd-stream-0.8 >= 0.5.0"`
echo "$as_me:$LINENO: result: $_abi_wordperfect_CFLAGS" >&5
echo "${ECHO_T}$_abi_wordperfect_CFLAGS" >&6
echo "$as_me:$LINENO: checking _abi_wordperfect_LIBS" >&5
echo $ECHO_N "checking _abi_wordperfect_LIBS... $ECHO_C" >&6
- _abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd-1 >= 0.5.0"`
-+ _abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 >= 0.5.0"`
++ _abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd-stream-0.8 >= 0.5.0"`
echo "$as_me:$LINENO: result: $_abi_wordperfect_LIBS" >&5
echo "${ECHO_T}$_abi_wordperfect_LIBS" >&6
else
@@ -47,7 +47,7 @@
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd-1 >= 0.5.0"`
-+ _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd-0.8 >= 0.5.0"`
++ _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd-stream-0.8 >= 0.5.0"`
echo $_abi_wordperfect_PKG_ERRORS
fi
@@ -70,7 +70,7 @@
# Checks for header fils.
-PKG_CHECK_MODULES(_abi_wordperfect,libwpd-1 >= 0.7.0,[
-+PKG_CHECK_MODULES(_abi_wordperfect,libwpd-0.8 >= 0.7.0,[
++PKG_CHECK_MODULES(_abi_wordperfect,libwpd-stream-0.8 >= 0.7.0,[
ABI_PLUGIN_REPORT([WordPerfect: okay])
-],[ ABI_PLUGIN_REPORT([WordPerfect: error - libwpd-1 >= 0.7.0 required])
+],[ ABI_PLUGIN_REPORT([WordPerfect: error - libwpd-0.8 >= 0.7.0 required])
@@ -90,7 +90,7 @@
+echo $ECHO_N "checking for libwpd >= 0.7.0... $ECHO_C" >&6
- if $PKG_CONFIG --exists "libwpd-1 >= 0.7.0" ; then
-+ if $PKG_CONFIG --exists "libwpd-0.8 >= 0.7.0" ; then
++ if $PKG_CONFIG --exists "libwpd-stream-0.8 >= 0.7.0" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
@@ -98,14 +98,14 @@
echo "$as_me:$LINENO: checking _abi_wordperfect_CFLAGS" >&5
echo $ECHO_N "checking _abi_wordperfect_CFLAGS... $ECHO_C" >&6
- _abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd-1 >= 0.7.0"`
-+ _abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 >= 0.7.0"`
++ _abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd-stream-0.8 >= 0.7.0"`
echo "$as_me:$LINENO: result: $_abi_wordperfect_CFLAGS" >&5
echo "${ECHO_T}$_abi_wordperfect_CFLAGS" >&6
echo "$as_me:$LINENO: checking _abi_wordperfect_LIBS" >&5
echo $ECHO_N "checking _abi_wordperfect_LIBS... $ECHO_C" >&6
- _abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd-1 >= 0.7.0"`
-+ _abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 >= 0.7.0"`
++ _abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd-stream-0.8 >= 0.7.0"`
echo "$as_me:$LINENO: result: $_abi_wordperfect_LIBS" >&5
echo "${ECHO_T}$_abi_wordperfect_LIBS" >&6
else
@@ -114,7 +114,7 @@
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd-1 >= 0.7.0"`
-+ _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd-0.8 >= 0.7.0"`
++ _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd-stream-0.8 >= 0.7.0"`
fi
@@ -136,7 +136,7 @@
# Checks for header fils.
-PKG_CHECK_MODULES(_abi_wordperfect,libwpd-1 >= 0.7.0,[
-+PKG_CHECK_MODULES(_abi_wordperfect,libwpd-0.8 >= 0.7.0,[
++PKG_CHECK_MODULES(_abi_wordperfect,libwpd-stream-0.8 >= 0.7.0,[
ABI_PLUGIN_REPORT([WordPerfect: okay])
-],[ ABI_PLUGIN_REPORT([WordPerfect: error - libwpd-1 >= 0.7.0 required])
+],[ ABI_PLUGIN_REPORT([WordPerfect: error - libwpd-0.8 >= 0.7.0 required])
@@ -1739,10 +1739,10 @@
# Checks for header fils.
-PKG_CHECK_MODULES(_abi_wordperfect,libwpd-1 >= 0.7.0,[
-+PKG_CHECK_MODULES(_abi_wordperfect,libwpd-0.8 >= 0.7.0,[
++PKG_CHECK_MODULES(_abi_wordperfect,libwpd-stream-0.8 >= 0.7.0,[
ABI_PLUGIN_REPORT([WordPerfect: okay])
-],[ ABI_PLUGIN_REPORT([WordPerfect: error - libwpd-1 >= 0.7.0 required])
-+],[ ABI_PLUGIN_REPORT([WordPerfect: error - libwpd-0.8 >= 0.7.0 required])
++],[ ABI_PLUGIN_REPORT([WordPerfect: error - libwpd-stream-0.8 >= 0.7.0 required])
abi_plugin_disable=yes
])
if test $abi_plugin_disable = no; then
@@ -1753,3 +1753,53 @@
fi
AC_SUBST(WORDPERFECT_CPPFLAGS)
+--- abiword-2.0.12.orig/wv/wvConfig.c 2005-10-18 18:50:03.000000000 +0100
++++ abiword-2.0.12/wv/wvConfig.c 2005-10-18 18:52:46.000000000 +0100
+@@ -2130,7 +2130,7 @@
+ }
+
+ static void
+-startElement (void *userData, const XML_Char *name, const XML_Char **atts)
++wvstartElement (void *userData, const XML_Char *name, const XML_Char **atts)
+ {
+ unsigned int nAtts = 0;
+ const XML_Char **p;
+@@ -3094,7 +3094,7 @@
+ }
+
+ static void
+-endElement (void *userData, const XML_Char *name)
++wvendElement (void *userData, const XML_Char *name)
+ {
+ state_data *mydata = (state_data *) userData;
+ unsigned int token_type;
+@@ -3470,8 +3470,8 @@
+ memset(&hdl, 0, sizeof(hdl));
+
+ hdl.getEntity = _getEntity;
+- hdl.startElement = startElement;
+- hdl.endElement = endElement;
++ hdl.startElement = wvstartElement;
++ hdl.endElement = wvendElement;
+ hdl.characters = charData;
+
+ if (myhandle->fp)
+@@ -3514,7 +3514,7 @@
+ size_t len;
+
+ XML_SetUserData (parser, myhandle);
+- XML_SetElementHandler (parser, startElement, endElement);
++ XML_SetElementHandler (parser, wvstartElement, wvendElement);
+ XML_SetCharacterDataHandler (parser, charData);
+
+ if (myhandle->fp == NULL)
+--- abiword-2.0.12.orig/abi/src/wp/impexp/xp/ie_mailmerge.h 2005-10-18 18:49:11.000000000 +0100
++++ abiword-2.0.12/abi/src/wp/impexp/xp/ie_mailmerge.h 2005-10-18 19:10:04.000000000 +0100
+@@ -27,6 +27,7 @@
+
+ typedef UT_sint32 IEMergeType;
+ #define IEMT_Unknown ((IEMergeType)-1)
++class IE_MailMerge;
+
+ class ABI_EXPORT IE_MergeSniffer : public UT_AbiObject
+ {
More information about the fedora-cvs-commits
mailing list