Skip to Content.
Sympa Menu

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

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 (fb46cf4d73c08a3fceeeac004d38d9904c7b75f4)
  • Date: Sun, 18 Oct 2009 13:31:20 -0500

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

doc/wv2/DEPENDS | 1 +
doc/wv2/DETAILS | 5 ++---
doc/wv2/HISTORY | 5 +++++
doc/wv2/PRE_BUILD | 7 -------
doc/wv2/styles.h.diff | 11 -----------
kde4-apps/koffice2/DEPENDS | 1 -
kde4-apps/koffice2/HISTORY | 1 +
7 files changed, 9 insertions(+), 22 deletions(-)

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

koffice2 - does not depends on libart_lgpl

commit 1febd658d5583c9f16b42ce2e2a6c8b7fb20db99
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

wv2: => 0.4.1

diff --git a/doc/wv2/DEPENDS b/doc/wv2/DEPENDS
index af81b7b..74b5e61 100755
--- a/doc/wv2/DEPENDS
+++ b/doc/wv2/DEPENDS
@@ -2,4 +2,5 @@ depends cmake &&
depends pkgconfig &&
depends g++ &&
depends libgsf &&
+depends zlib &&
optional_depends "libwmf" "" "" "to see embeded images in doc files"
diff --git a/doc/wv2/DETAILS b/doc/wv2/DETAILS
index ae87538..904aff9 100755
--- a/doc/wv2/DETAILS
+++ b/doc/wv2/DETAILS
@@ -1,7 +1,6 @@
SPELL=wv2
- VERSION=0.4.0
-
SOURCE_HASH=sha512:9d03e918ee2c7ec5d42cff663603fbefddb2fe1326ed9192cbd04c93154dd8e89bc186458110d277cf41785addc899969dddfde0c36254774cd83b5d3a554908
- PATCHLEVEL=1
+ VERSION=0.4.1
+
SOURCE_HASH=sha512:f5e3da2790cd1e81500c7443342094283660889c5fcf52d8db6fb605c05efc9bed0cf17a3a4e99ace02a7aabbd5553b441e422d0526f0967632abfc4a988d8d2
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 dad33fc..687fc7f 100644
--- a/doc/wv2/HISTORY
+++ b/doc/wv2/HISTORY
@@ -1,3 +1,8 @@
+2009-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.1
+ * PRE_BUILD, styles.h.diff:: deleted
+ * DEPENDS: add zlib
+
2009-08-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply upstream patch
diff --git a/doc/wv2/PRE_BUILD b/doc/wv2/PRE_BUILD
deleted file mode 100755
index 3d0ae28..0000000
--- a/doc/wv2/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index acc7769..0000000
--- a/doc/wv2/styles.h.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- {
diff --git a/kde4-apps/koffice2/DEPENDS b/kde4-apps/koffice2/DEPENDS
index c69607a..94e3062 100755
--- a/kde4-apps/koffice2/DEPENDS
+++ b/kde4-apps/koffice2/DEPENDS
@@ -23,7 +23,6 @@ optional_depends openexr '' '' 'Krita EXR filter'
&&
optional_depends qca2 '' '' 'crypto support' &&
optional_depends qimageblitz '' '' 'graphics manipulation' &&
optional_depends glpk '' '' 'painterly mixer plugin'&&
-optional_depends libart_lgpl '' '' '2D graphics support' &&
optional_depends kdepimlibs4 '' '' 'PIM support' &&
optional_depends libwpg '' '' 'WordPerfect graphics' &&
optional_depends libwpd '' '' 'WordPerfect import'
diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index 564e52b..77963bb 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,5 +1,6 @@
2009-10-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: removing trigger on kdelibs4
+ * DEPENDS: delete libart_lgpl

2009-10-010 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.83 (unstable)



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (fb46cf4d73c08a3fceeeac004d38d9904c7b75f4), Treeve Jelbert, 10/18/2009

Archive powered by MHonArc 2.6.24.

Top of Page