[gentoo-commits] gentoo-x86 commit in app-office/koffice/files: koffice-1.6.3-gcc43.patch

[Ryan Hill (dirtyepic)]

dirtyepic    08/11/28 03:29:53

  Added:                koffice-1.6.3-gcc43.patch
  Log:
  Fix building w/ gcc-4.3. Bug #228839.
  (Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64)

Revision  Changes    Path
1.1                  app-office/koffice/files/koffice-1.6.3-gcc43.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/koffice/files/koffice-1.6.3-gcc43.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/koffice/files/koffice-1.6.3-gcc43.patch?rev=1.1&content-type=text/plain

Index: koffice-1.6.3-gcc43.patch
===================================================================
diff -Naurp koffice-1.6.3-orig/filters/kpresenter/powerpoint/libppt/pole.cpp koffice-1.6.3/filters/kpresenter/powerpoint/libppt/pole.cpp
--- koffice-1.6.3-orig/filters/kpresenter/powerpoint/libppt/pole.cpp	2007-05-30 15:38:58.000000000 -0600
+++ koffice-1.6.3/filters/kpresenter/powerpoint/libppt/pole.cpp	2008-11-22 16:45:05.000000000 -0600
@@ -32,6 +32,8 @@
 #include <string>
 #include <vector>
 
+#include <string.h>
+
 #include "pole.h"
 
 // enable to activate debugging output
diff -Naurp koffice-1.6.3-orig/filters/kword/wordperfect/import/TableStyle.cxx koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx
--- koffice-1.6.3-orig/filters/kword/wordperfect/import/TableStyle.cxx	2007-05-30 15:39:02.000000000 -0600
+++ koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx	2008-11-22 16:47:47.000000000 -0600
@@ -36,6 +36,8 @@
 #include <minmax.h>
 #endif
 
+#include <cstring>
+
 TableCellStyle::TableCellStyle(const WPXPropertyList &xPropList, const char *psName) :
 	Style(psName),
         mPropList(xPropList)
diff -Naurp koffice-1.6.3-orig/filters/kword/wordperfect/import/TextRunStyle.cxx koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx
--- koffice-1.6.3-orig/filters/kword/wordperfect/import/TextRunStyle.cxx	2007-05-30 15:39:02.000000000 -0600
+++ koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx	2008-11-22 16:48:30.000000000 -0600
@@ -37,6 +37,8 @@
 #include <minmax.h>
 #endif
 
+#include <cstring>
+
 ParagraphStyle::ParagraphStyle(WPXPropertyList *pPropList, const WPXPropertyListVector &xTabStops, const WPXString &sName) :
 	mpPropList(pPropList),
 	mxTabStops(xTabStops),
diff -Naurp koffice-1.6.3-orig/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
--- koffice-1.6.3-orig/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp	2007-05-30 15:35:49.000000000 -0600
+++ koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp	2008-11-22 16:50:24.000000000 -0600
@@ -26,6 +26,7 @@
 
 #include <klocale.h>
 #include <kdebug.h>
+#include <stdlib.h>
 
 using namespace KexiDB;
 
diff -Naurp koffice-1.6.3-orig/krita/core/kis_perspective_math.cpp koffice-1.6.3/krita/core/kis_perspective_math.cpp
--- koffice-1.6.3-orig/krita/core/kis_perspective_math.cpp	2007-05-30 15:40:31.000000000 -0600
+++ koffice-1.6.3/krita/core/kis_perspective_math.cpp	2008-11-22 16:52:47.000000000 -0600
@@ -24,7 +24,7 @@
 
 #if 1
 
-#include <iostream.h>
+#include <iostream>
 #include <stdlib.h>
 #include <math.h>
 //#define NDEBUG // uncomment to remove checking of assert()
@@ -57,9 +57,9 @@ template <class ElType>
         void  rprint()const;  //print entries on a single line
         void resize(int n);
         int operator==(const vector<ElType>& v)const;
-        friend   vector<ElType> operator*(ElType c,vector<ElType>& v );
-        friend   vector<ElType> operator*(vector<ElType>& v,ElType c );
-        friend ostream& operator<<(ostream& s,vector<ElType>& v);
+        friend vector<ElType> operator* (ElType c,vector<ElType>& v );
+        friend vector<ElType> operator*(vector<ElType>& v,ElType c );
+        friend std::ostream& operator<<(std::ostream& s,vector<ElType>& v);
 };
 template <class ElType>
         void vector<ElType>::zero()
@@ -129,10 +129,10 @@ template <class ElType>
         void  vector<ElType>::rprint()const  //print entries on a single line
 {
     int i;
-    cout << "VECTOR: ";
-    cout << "(";
-    for(i=0;i<len-1;i++) cout << data[i] << ",";
-    cout << data[len-1] << ")" << endl;
+    std::cout << "VECTOR: ";
+    std::cout << "(";
+    for(i=0;i<len-1;i++) std::cout << data[i] << ",";
+    std::cout << data[len-1] << ")" << std::endl;
     return;
 }
 template <class ElType>
@@ -164,7 +164,7 @@ template <class ElType>
     return ans;
 }
 template <class ElType>
-        ostream& operator<<(ostream& s,vector<ElType>& v)
+        std::ostream& operator<<(std::ostream& s,vector<ElType>& v)
 {
     s << "(";
     for(int i=0;i<v.len-1;i++) s << v.data[i] << ", ";
@@ -192,7 +192,7 @@ template <class ElType>
         matrix<ElType> operator-(const matrix<ElType>& a);
         matrix<ElType> transpose();
     //matrix<ElType> inverse();
-        friend ostream& operator<<(ostream& s,matrix<ElType>& m);
+        friend std::ostream& operator<<(std::ostream& s,matrix<ElType>& m);
         friend void ludcmp(matrix<ElType>& a,vector<int>& indx,double &d);
         friend void lubksb(matrix<ElType>&a,vector<int>& indx,vector<ElType>&b);
 };
@@ -357,7 +357,7 @@ template <class ElType>
     return ans;
 }
 template <class ElType>
-        ostream& operator<<(ostream& s,matrix<ElType>& m)
+        std::ostream& operator<<(std::ostream& s,matrix<ElType>& m)
 {
     for(int i=0; i<m.rows;i++) s << m[i];
     return s;
@@ -381,7 +381,7 @@ void ludcmp(matrix<ElType>& a, vector<in
 //         kdDebug() << "new search" << endl;
         for (j=0;j<n;j++) { if ((temp=fabs(a[i][j])) > big) big=temp;
 /*            kdDebug() << temp << " " << fabs(a[i][j]) << " "<< big <<endl; */}
-            if (big == 0.0) { cerr << "Singular matrix in routine LUDCMP" << endl; big = TINY;}
+            if (big == 0.0) { std::cerr << "Singular matrix in routine LUDCMP" << std::endl; big = TINY;}
             vv[i]=1.0/big;
     }
     for (j=0;j<n;j++)
diff -Naurp koffice-1.6.3-orig/kspread/plugins/scripting/kspreadcore/krs_cell.cpp koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp
--- koffice-1.6.3-orig/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	2007-05-30 15:43:20.000000000 -0600
+++ koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	2008-11-22 16:55:43.000000000 -0600
@@ -174,12 +174,7 @@ const QString Cell::text() const {
 	return m_cell->text();
 }
 
-bool Cell::setText(const QString& text, bool asString) {
-
-	//FIXME: there is some problem with asString parameter, when it's set
-	//to true KSpread says: ASSERT: "f" in Dependencies.cpp (621)
-	//kspread: Cell at row 6, col 1 marked as formula, but formula is NULL
-
+bool Cell::setText(const QString& text) {
 	KSpread::ProtectedCheck prot;
 	prot.setSheet (m_sheet);
 	prot.add (QPoint (m_col, m_row));
@@ -189,7 +184,7 @@ bool Cell::setText(const QString& text, 
 	KSpread::DataManipulator *dm = new KSpread::DataManipulator ();
 	dm->setSheet (m_sheet);
 	dm->setValue (text);
-	dm->setParsing (!asString);
+	dm->setParsing (true);
 	dm->add (QPoint (m_col, m_row));
 	dm->execute ();
 
diff -Naurp koffice-1.6.3-orig/kspread/plugins/scripting/kspreadcore/krs_cell.h koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h
--- koffice-1.6.3-orig/kspread/plugins/scripting/kspreadcore/krs_cell.h	2007-05-30 15:43:20.000000000 -0600
+++ koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h	2008-11-22 16:56:56.000000000 -0600
@@ -131,11 +131,10 @@ class Cell : public Kross::Api::Class<Ce
 		*/
 		const QString text() const;
 		/**
-		* Set the text of the cell. If asString is true, the text
-		* will be handled as string else we try to parse the
-		* string to the expected value.
+		 * Set the text of the cell. the text
+		 * will be handled as string
 		*/
-		bool setText(const QString& text, bool asString = false);
+		bool setText(const QString& text);
 
 		/**
 		* Return the textcolor as RGB-value in the format "#RRGGBB".