Skip to Content.
Sympa Menu

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

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 (2cf7e50862163ca51f616690ac58d172b47e903e)
  • Date: Fri, 6 Mar 2009 04:34:16 -0600

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

kde4-apps/koffice2/HISTORY | 4 ++++
kde4-apps/koffice2/PRE_BUILD | 2 ++
kde4-apps/koffice2/wv2.patch | 29 +++++++++++++++++++++++++++++
3 files changed, 35 insertions(+)

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

koffice2 - add upstream patch for building with wv2 on amd64

diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index 0e5363e..b5fb60a 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,7 @@
+2009-03-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * wv2.patch: added, upstream patch, for amd64
+ * PRE_BUILD: apply patch
+
2009-03-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.98.7
* exiv2.diff: deleted
diff --git a/kde4-apps/koffice2/PRE_BUILD b/kde4-apps/koffice2/PRE_BUILD
index 6c55f0a..a906dc4 100755
--- a/kde4-apps/koffice2/PRE_BUILD
+++ b/kde4-apps/koffice2/PRE_BUILD
@@ -1,4 +1,6 @@

default_pre_build &&
cd $SOURCE_DIRECTORY &&
+#fix bad use on amd64
+patch -p2 < $SPELL_DIRECTORY/wv2.patch &&
sed -i '/update_xdg_mimetypes/D' filters/krita/ora/CMakeLists.txt
diff --git a/kde4-apps/koffice2/wv2.patch b/kde4-apps/koffice2/wv2.patch
new file mode 100644
index 0000000..b74033b
--- /dev/null
+++ b/kde4-apps/koffice2/wv2.patch
@@ -0,0 +1,29 @@
+--- trunk/koffice/filters/kword/msword-odf/graphicshandler.cpp 2009/02/28
21:15:35 933412
++++ trunk/koffice/filters/kword/msword-odf/graphicshandler.cpp 2009/03/06
10:17:07 935799
+@@ -66,7 +66,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
+@@ -109,7 +109,7 @@
+ }
+ //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
+@@ -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 (2cf7e50862163ca51f616690ac58d172b47e903e), Treeve Jelbert, 03/06/2009

Archive powered by MHonArc 2.6.24.

Top of Page