rpms/koffice/devel koffice-1.6.3-gcc43.patch, NONE, 1.1 koffice.spec, 1.70, 1.71

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25333

Modified Files:
	koffice.spec 
Added Files:
	koffice-1.6.3-gcc43.patch 
Log Message:
* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org>
1.6.3-15
- upstream gcc43 patch (#433994)
- kivio: omit Requires: kdegraphics, use versioned Obsoletes
- touchup %descriptions, %summaries


koffice-1.6.3-gcc43.patch:

--- NEW FILE koffice-1.6.3-gcc43.patch ---
# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/

Index: koffice/krita/core/kis_perspective_math.cpp
===================================================================
--- koffice/krita/core/kis_perspective_math.cpp	(revision 738928)
+++ koffice/krita/core/kis_perspective_math.cpp	(revision 738929)
@@ -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 @@
         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 @@
         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 @@
     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 @@
         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 @@
     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 @@
 //         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++)
Index: koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp
===================================================================
--- koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	(revision 729275)
+++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	(revision 729276)
@@ -174,12 +174,7 @@
 	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 @@
 	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 ();
 
Index: koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h
===================================================================
--- koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h	(revision 729275)
+++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h	(revision 729276)
@@ -131,11 +131,10 @@
 		*/
 		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".


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- koffice.spec	18 Feb 2008 20:24:06 -0000	1.70
+++ koffice.spec	22 Feb 2008 18:57:17 -0000	1.71
@@ -1,8 +1,8 @@
 
 Name:           koffice
 Version:        1.6.3
-Release:        14%{?dist}
-Summary:        A free, integrated office suite for KDE
+Release:        15%{?dist}
+Summary:        An integrated office suite
 
 Group:          Applications/Productivity
 # apps GPLv2+, libs LGPLv2+
@@ -19,8 +19,12 @@
 # http://www.kde.org/info/security/advisory-20071107-1.txt
 Patch2: ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
 
+# upstream patch pulled via: svn diff -c 738929 
+# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+Patch3: koffice-1.6.3-gcc43.patch
+
 # BuildRequires: world-devel ;)
-BuildRequires:  kdebase3-devel
 BuildRequires:  kdelibs3-devel
 # See http://bugzilla.redhat.com/244091
 %global kdelibs_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.8) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
@@ -65,11 +69,10 @@
 %endif
 
 %description
-KOffice - Integrated Office Suite
-KOffice is a free, integrated office suite for KDE, the K Desktop Environment.
+KOffice is an integrated office suite.
 
 %package suite
-Summary:        A free, integrated office suite for KDE
+Summary:        An integrated office suite
 Group:          Applications/Productivity
 Obsoletes:      koffice <= 4:%{version}-%{release}
 Obsoletes:      koffice-i18n < 4:%{version}
@@ -90,8 +93,7 @@
 Requires:       koffice-kplato = %{version}-%{release}
 
 %description suite
-KOffice - Integrated Office Suite
-KOffice is a free, integrated office suite for KDE, the K Desktop Environment.
+KOffice is an integrated office suite.
 
 %package core
 Summary:        Core support files for koffice
@@ -147,8 +149,9 @@
 Summary:        A flowcharting application
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{version}-%{release}
-Requires:       kdegraphics
-Obsoletes:      kivio
+# why? omit for now -- Rex
+#Requires:       kdegraphics
+Obsoletes:      kivio < %{version}-%{release}
 
 %description kivio
 %{summary}
@@ -242,6 +245,7 @@
 
 %patch1 -p0 -b .CVE-2007-3387
 %patch2 -p0 -b .CVE-2007-4352-5392-5393
+%patch3 -p1 -b .gcc43
 
 
 %build
@@ -681,6 +685,12 @@
 
 
 %changelog
+* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org>
+1.6.3-15
+- upstream gcc43 patch (#433994)
+- kivio: omit Requires: kdegraphics, use versioned Obsoletes
+- touchup %%descriptions, %%summaries
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.3-14
 - Autorebuild for GCC 4.3