Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4dacd21a4e29397c5dcdfe8858a846821a3e0567)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4dacd21a4e29397c5dcdfe8858a846821a3e0567)
  • Date: Wed, 2 Sep 2009 06:04:38 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

doc/wv2/DETAILS | 1 +
doc/wv2/HISTORY | 5 +++++
doc/wv2/PRE_BUILD | 2 ++
doc/wv2/styles.h.diff | 11 +++++++++++
4 files changed, 19 insertions(+)

New commits:
commit 1d3609f5ea109cf90de71241b045039d2b06e29c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

wv2 - add upstream patch

diff --git a/doc/wv2/DETAILS b/doc/wv2/DETAILS
index 596c2d6..ae87538 100755
--- a/doc/wv2/DETAILS
+++ b/doc/wv2/DETAILS
@@ -1,6 +1,7 @@
SPELL=wv2
VERSION=0.4.0

SOURCE_HASH=sha512:9d03e918ee2c7ec5d42cff663603fbefddb2fe1326ed9192cbd04c93154dd8e89bc186458110d277cf41785addc899969dddfde0c36254774cd83b5d3a554908
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/wvware/$SOURCE
diff --git a/doc/wv2/HISTORY b/doc/wv2/HISTORY
index 2b93646..dad33fc 100644
--- a/doc/wv2/HISTORY
+++ b/doc/wv2/HISTORY
@@ -1,3 +1,8 @@
+2009-08-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply upstream patch
+ * styles.h.diff: added, fix for gcc-4.4
+
2009-08-28 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: CMake does not like "--with-libwmf"
CMake Error: The source directory
"/usr/src/wv2-0.4.0/build/--with-libwmf"
diff --git a/doc/wv2/PRE_BUILD b/doc/wv2/PRE_BUILD
index a71476c..3d0ae28 100755
--- a/doc/wv2/PRE_BUILD
+++ b/doc/wv2/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build
cd $SOURCE_DIRECTORY &&
+# fix for gcc-4.4
+patch -p1 < $SPELL_DIRECTORY/styles.h.diff &&
# fix for gcc-4.4.1
sed -i 's|^#elif$|#else|;/#elif H/s|$|)|;/#elif H/s|H|defined(H|' \
src/ustring.cpp
diff --git a/doc/wv2/styles.h.diff b/doc/wv2/styles.h.diff
new file mode 100644
index 0000000..acc7769
--- /dev/null
+++ b/doc/wv2/styles.h.diff
@@ -0,0 +1,11 @@
+--- wv2-trunk/src/styles.h 2009/08/27 00:49:39 28
++++ wv2-trunk/src/styles.h 2009/08/31 13:52:05 29
+@@ -19,7 +19,7 @@
+ #ifndef STYLES_H
+ #define STYLES_H
+
+-#include <word97_generated.h>
++#include "word97_generated.h"
+
+ namespace wvWare
+ {



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4dacd21a4e29397c5dcdfe8858a846821a3e0567), Treeve Jelbert, 09/02/2009

Archive powered by MHonArc 2.6.24.

Top of Page