Skip to Content.
Sympa Menu

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

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 (3f3e6e0cee76c207f53add5d7b7ff1bf66f5e0c2)
  • Date: Fri, 6 Mar 2009 04:40:53 -0600

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

kde4-apps/koffice2/HISTORY | 1 +
kde4-apps/koffice2/wv2.patch | 9 ---------
2 files changed, 1 insertion(+), 9 deletions(-)

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

koffice2 - fix previous patch

diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index b5fb60a..2eca054 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,6 +1,7 @@
2009-03-06 Treeve Jelbert <treeve AT sourcemage.org>
* wv2.patch: added, upstream patch, for amd64
* PRE_BUILD: apply patch
+ * wv2.patch: remove inapplicable part

2009-03-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.98.7
diff --git a/kde4-apps/koffice2/wv2.patch b/kde4-apps/koffice2/wv2.patch
index b74033b..718076d 100644
--- a/kde4-apps/koffice2/wv2.patch
+++ b/kde4-apps/koffice2/wv2.patch
@@ -18,12 +18,3 @@
len -= n;
delete [] buf;
//error checking
-@@ -193,7 +193,7 @@
- wvWare::U8* buf = new wvWare::U8[IMG_BUF_SIZE];
- size_t n = reader.read( buf, qMin( len, IMG_BUF_SIZE ) );
- Q_LONG n1 = m_store->write( (const char*)buf, n );
-- kDebug(30513) << "n=" << n << ", n1=" << n1 << "; buf contains " <<
(int) buf;
-+ kDebug(30513) << "n=" << n << ", n1=" << n1 << "; buf contains " <<
(void*) buf;
- len -= n;
- delete [] buf;
- //error checking



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3f3e6e0cee76c207f53add5d7b7ff1bf66f5e0c2), Treeve Jelbert, 03/06/2009

Archive powered by MHonArc 2.6.24.

Top of Page