| 1 |
flameeyes 08/04/21 22:53:14 |
| 2 |
|
| 3 |
Added: krita-1.6.3+gcc-4.3.patch |
| 4 |
Log: |
| 5 |
Fix building with GCC 4.3. Closes bug #214372. Patch coming from Fedora, thanks to Peter Alfredsen for reporting. |
| 6 |
(Portage version: 2.1.5_rc5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-office/krita/files/krita-1.6.3+gcc-4.3.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/krita/files/krita-1.6.3+gcc-4.3.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/krita/files/krita-1.6.3+gcc-4.3.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: krita-1.6.3+gcc-4.3.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nrua koffice-1.6.3/krita/core/kis_perspective_math.cpp koffice/krita/core/kis_perspective_math.cpp |
| 17 |
--- koffice-1.6.3/krita/core/kis_perspective_math.cpp 2007-05-30 23:40:31.000000000 +0200 |
| 18 |
+++ koffice/krita/core/kis_perspective_math.cpp 2008-03-12 00:56:21.000000000 +0100 |
| 19 |
@@ -24,7 +24,7 @@ |
| 20 |
|
| 21 |
#if 1 |
| 22 |
|
| 23 |
-#include <iostream.h> |
| 24 |
+#include <iostream> |
| 25 |
#include <stdlib.h> |
| 26 |
#include <math.h> |
| 27 |
//#define NDEBUG // uncomment to remove checking of assert() |
| 28 |
@@ -57,9 +57,9 @@ |
| 29 |
void rprint()const; //print entries on a single line |
| 30 |
void resize(int n); |
| 31 |
int operator==(const vector<ElType>& v)const; |
| 32 |
- friend vector<ElType> operator*(ElType c,vector<ElType>& v ); |
| 33 |
- friend vector<ElType> operator*(vector<ElType>& v,ElType c ); |
| 34 |
- friend ostream& operator<<(ostream& s,vector<ElType>& v); |
| 35 |
+ friend vector<ElType> operator* (ElType c,vector<ElType>& v ); |
| 36 |
+ friend vector<ElType> operator*(vector<ElType>& v,ElType c ); |
| 37 |
+ friend std::ostream& operator<<(std::ostream& s,vector<ElType>& v); |
| 38 |
}; |
| 39 |
template <class ElType> |
| 40 |
void vector<ElType>::zero() |
| 41 |
@@ -129,10 +129,10 @@ |
| 42 |
void vector<ElType>::rprint()const //print entries on a single line |
| 43 |
{ |
| 44 |
int i; |
| 45 |
- cout << "VECTOR: "; |
| 46 |
- cout << "("; |
| 47 |
- for(i=0;i<len-1;i++) cout << data[i] << ","; |
| 48 |
- cout << data[len-1] << ")" << endl; |
| 49 |
+ std::cout << "VECTOR: "; |
| 50 |
+ std::cout << "("; |
| 51 |
+ for(i=0;i<len-1;i++) std::cout << data[i] << ","; |
| 52 |
+ std::cout << data[len-1] << ")" << std::endl; |
| 53 |
return; |
| 54 |
} |
| 55 |
template <class ElType> |
| 56 |
@@ -164,7 +164,7 @@ |
| 57 |
return ans; |
| 58 |
} |
| 59 |
template <class ElType> |
| 60 |
- ostream& operator<<(ostream& s,vector<ElType>& v) |
| 61 |
+ std::ostream& operator<<(std::ostream& s,vector<ElType>& v) |
| 62 |
{ |
| 63 |
s << "("; |
| 64 |
for(int i=0;i<v.len-1;i++) s << v.data[i] << ", "; |
| 65 |
@@ -192,7 +192,7 @@ |
| 66 |
matrix<ElType> operator-(const matrix<ElType>& a); |
| 67 |
matrix<ElType> transpose(); |
| 68 |
//matrix<ElType> inverse(); |
| 69 |
- friend ostream& operator<<(ostream& s,matrix<ElType>& m); |
| 70 |
+ friend std::ostream& operator<<(std::ostream& s,matrix<ElType>& m); |
| 71 |
friend void ludcmp(matrix<ElType>& a,vector<int>& indx,double &d); |
| 72 |
friend void lubksb(matrix<ElType>&a,vector<int>& indx,vector<ElType>&b); |
| 73 |
}; |
| 74 |
@@ -357,7 +357,7 @@ |
| 75 |
return ans; |
| 76 |
} |
| 77 |
template <class ElType> |
| 78 |
- ostream& operator<<(ostream& s,matrix<ElType>& m) |
| 79 |
+ std::ostream& operator<<(std::ostream& s,matrix<ElType>& m) |
| 80 |
{ |
| 81 |
for(int i=0; i<m.rows;i++) s << m[i]; |
| 82 |
return s; |
| 83 |
@@ -381,7 +381,7 @@ |
| 84 |
// kdDebug() << "new search" << endl; |
| 85 |
for (j=0;j<n;j++) { if ((temp=fabs(a[i][j])) > big) big=temp; |
| 86 |
/* kdDebug() << temp << " " << fabs(a[i][j]) << " "<< big <<endl; */} |
| 87 |
- if (big == 0.0) { cerr << "Singular matrix in routine LUDCMP" << endl; big = TINY;} |
| 88 |
+ if (big == 0.0) { std::cerr << "Singular matrix in routine LUDCMP" << std::endl; big = TINY;} |
| 89 |
vv[i]=1.0/big; |
| 90 |
} |
| 91 |
for (j=0;j<n;j++) |
| 92 |
|
| 93 |
|
| 94 |
|
| 95 |
|
| 96 |
-- |
| 97 |
gentoo-commits@l.g.o mailing list |
Archives