Mailinglist Archive: opensuse-commit (857 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package koffice
checked in at Fri Nov 16 00:35:45 CET 2007.

--------
--- KDE/koffice/koffice.changes 2007-11-02 23:56:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/koffice/koffice.changes        2007-11-15 
22:40:09.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Nov 15 22:40:04 CET 2007 - dmueller@xxxxxxx
+
+- fix build against gcc 4.3 
+
+-------------------------------------------------------------------

New:
----
  gcc-4.3.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ koffice.spec ++++++
--- /var/tmp/diff_new_pack.k25585/_old  2007-11-16 00:35:00.000000000 +0100
+++ /var/tmp/diff_new_pack.k25585/_new  2007-11-16 00:35:00.000000000 +0100
@@ -36,7 +36,7 @@
 Group:          Productivity/Office/Suite
 Summary:        Libraries and Base Files for the KDE Office Suite
 Version:        1.6.3
-Release:        77
+Release:        78
 Requires:       kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' 
kdelibs3`)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        koffice-%{version}.tar.bz2
@@ -51,6 +51,7 @@
 Patch11:        r729650.diff
 Patch12:        r729712.diff
 Patch13:        koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
+Patch14:        gcc-4.3.diff
 
 %description
 Base files and libraries for koffice applications. The applications are
@@ -273,6 +274,7 @@
 %patch11
 %patch12
 %patch13
+%patch14
 rm -rf ascend
 . /etc/opt/kde3/common_options
 update_admin --no-unsermake
@@ -778,6 +780,8 @@
 /opt/kde3/%_lib/libkexi*.la
 /opt/kde3/%_lib/libkformdesigner.la
 %changelog
+* Thu Nov 15 2007 - dmueller@xxxxxxx
+- fix build against gcc 4.3
 * Fri Nov 02 2007 - dmueller@xxxxxxx
 - fix multiple xpdf related vulnerabilities (CVE-2007-4352,
   CVE-2007-5392, CVE-2007-5393, #335637)



++++++ gcc-4.3.diff ++++++
--- lib/kross/ruby/rubyinterpreter.cpp
+++ lib/kross/ruby/rubyinterpreter.cpp
@@ -55,7 +55,7 @@ extern "C"
         }
         return 0;
     }
-};
+}
 
 
 namespace Kross {
--- krita/core/kis_perspective_math.cpp
+++ krita/core/kis_perspective_math.cpp
@@ -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()
@@ -59,7 +59,7 @@ template <class ElType>
         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 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] << ")" << 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++)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx