Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (84cad65a2ab36d4eb60a89d29327c22bce879958)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (84cad65a2ab36d4eb60a89d29327c22bce879958)
  • Date: Tue, 29 Aug 2006 18:11:32 -0500

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

doc/wv/HISTORY | 4 ++++
doc/wv/PRE_BUILD | 3 +++
doc/wv/abiword-fix.diff | 30 ++++++++++++++++++++++++++++++
3 files changed, 37 insertions(+)

New commits:
commit 84cad65a2ab36d4eb60a89d29327c22bce879958
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

wv: apply patch to fix abiword read msword doc files

diff --git a/doc/wv/HISTORY b/doc/wv/HISTORY
index 10b91a3..cd1fe6d 100644
--- a/doc/wv/HISTORY
+++ b/doc/wv/HISTORY
@@ -1,3 +1,7 @@
+2006-08-29 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to apply patch
+ http://bugzilla.abisource.com/show_bug.cgi?id=10247
+
2006-05-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.1

diff --git a/doc/wv/PRE_BUILD b/doc/wv/PRE_BUILD
new file mode 100755
index 0000000..2606a0c
--- /dev/null
+++ b/doc/wv/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p0 < ${SCRIPT_DIRECTORY}/abiword-fix.diff
diff --git a/doc/wv/abiword-fix.diff b/doc/wv/abiword-fix.diff
new file mode 100644
index 0000000..876fc2a
--- /dev/null
+++ b/doc/wv/abiword-fix.diff
@@ -0,0 +1,30 @@
+diff -p -u -5 -r1.119 wv.h
+--- wv.h 18 Oct 2005 04:03:30 -0000 1.119
++++ wv.h 29 Aug 2006 14:10:03 -0000
+@@ -2683,11 +2683,10 @@ that indicates their length.
+ /*public */
+ void *userData;
+
+ /*protected */
+ GsfInput *ole_file;
+- GsfInput *input;
+ wvStream *mainfd;
+ wvStream *tablefd;
+ wvStream *data;
+ wvStream *summary;
+ FIB fib;
+@@ -2740,11 +2739,12 @@ that indicates their length.
+
+ int fieldstate;
+ int fieldmiddle;
+ char *filename;
+ char *dir;
+- } wvParseStruct;
++ GsfInput *input;
++ } wvParseStruct;
+
+ void wvSetPassword (const char *password, wvParseStruct * ps);
+ void wvSetTableInfo (wvParseStruct * ps, TAP * ptap, int no);
+ int wvDecrypt95 (wvParseStruct * ps);
+ int wvDecrypt97 (wvParseStruct * ps);
+



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (84cad65a2ab36d4eb60a89d29327c22bce879958), Robin Cook, 08/29/2006

Archive powered by MHonArc 2.6.24.

Top of Page