Fix building with GCC 4.3. Closes bug #214372. Patch coming from Fedora, thanks to Peter Alfredsen for reporting.

Package-Manager: portage-2.1.5_rc5

4 files changed, 101 insertions, 6 deletions

diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index 8ddd6e442ded..8eda18c3fd2f 100644
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/krita
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.83 2007/11/12 01:49:12 philantrop Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.84 2008/04/21 22:53:13 flameeyes Exp $
+
+  21 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/krita-1.6.3+gcc-4.3.patch, krita-1.6.3.ebuild:
+  Fix building with GCC 4.3. Closes bug #214372. Patch coming from Fedora,
+  thanks to Peter Alfredsen for reporting.
 
   12 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org> metadata.xml,
   krita-1.6.3.ebuild:
diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest
index 72fd488aba3e..d2ca0959770d 100644
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX krita-1.6.3+gcc-4.3.patch 3030 RMD160 58dcaafdd42ff369173dbbca726653923670833a SHA1 3c0c7a13b1bcb25b41d264422ced3c6f87503d56 SHA256 99d9175f0834aa2e6428430e0ec3617796c7c1eda195a29367c3b0816c3c62f2
 DIST koffice-1.6.1.tar.bz2 56999028 RMD160 ee4fa84a53f92035c0ab9427e0acb18feca701db SHA1 891fb0a28ec3c4b070c4d6c2eae7fee1d2e37761 SHA256 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728
 DIST koffice-1.6.3.tar.bz2 56829391 RMD160 e474ba48fa983fafb61ad58fb79cddda69ec6908 SHA1 de84214dec913eac1d47dab04dd93f3d81729fd3 SHA256 c3975f0a59f50aaa5547f1709b6fad54f746fd06815859b374676b426dce12cb
 EBUILD krita-1.6.1.ebuild 1694 RMD160 b6507829fb1d9a6865b001ed3f02ef4886700b08 SHA1 33fe889b427612c006fb3052796d2133cf59f796 SHA256 77d005e340e019cc97a09c1010af7f064bd6ae1bbd486f1a433ec4401877c710
-EBUILD krita-1.6.3.ebuild 1893 RMD160 9509c33babc6a2cddab63e9b5756ce6a41be2814 SHA1 70a3516e824813a9d165e2fa542b239c3ba75e6f SHA256 6bad874a948e88252f7c72b45dfdf966b4bad0b51be63e829cbd49d8475d81e4
-MISC ChangeLog 9709 RMD160 eef4cb317b15660e61b28fc457e9845d66ed6a26 SHA1 a716b9ad1ee752c2fa0130f6aa98830711890dbd SHA256 6e1501a77fffcad1b52dbe605cc90e443aaba78f47dfbb91786fe895594ed668
+EBUILD krita-1.6.3.ebuild 1939 RMD160 c42b2fac2cc5ce37abe8a837a12138ffddf67b61 SHA1 c43aac3722de2f1b7838b6e93a6051cd37748cd7 SHA256 cb2f2ab0d2284cf7e8779d78f51c21720b157d465a61b1c01cf5c2d116127549
+MISC ChangeLog 9936 RMD160 d6a60de7605effe900c7cecba99a632e2c933256 SHA1 1241fa9efe6d9dc2b7bcd1d62311765811fa493c SHA256 8b0194276045047be216c88f98402d8029c51acd9f2eb14c05aba78c98162a1c
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgNGuQACgkQAiZjviIA2XhfjwCeMNq5LGKugON5qdok6uMxC4B2
+YKAAoItZSJyL1sdo+my8KH/7f9Qbh1d3
+=Yy5a
+-----END PGP SIGNATURE-----
diff --git a/app-office/krita/files/krita-1.6.3+gcc-4.3.patch b/app-office/krita/files/krita-1.6.3+gcc-4.3.patch
new file mode 100644
index 000000000000..916354f373ea
--- /dev/null
+++ b/app-office/krita/files/krita-1.6.3+gcc-4.3.patch
@@ -0,0 +1,77 @@
+diff -Nrua koffice-1.6.3/krita/core/kis_perspective_math.cpp koffice/krita/core/kis_perspective_math.cpp
+--- koffice-1.6.3/krita/core/kis_perspective_math.cpp	2007-05-30 23:40:31.000000000 +0200
++++ koffice/krita/core/kis_perspective_math.cpp	2008-03-12 00:56:21.000000000 +0100
+@@ -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++)
+ 
diff --git a/app-office/krita/krita-1.6.3.ebuild b/app-office/krita/krita-1.6.3.ebuild
index e8177d945d97..5bc572d03fd6 100644
--- a/app-office/krita/krita-1.6.3.ebuild
+++ b/app-office/krita/krita-1.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.6.3.ebuild,v 1.9 2007/11/12 01:49:12 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.6.3.ebuild,v 1.10 2008/04/21 22:53:13 flameeyes Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -45,6 +45,8 @@ KMEXTRACTONLY="lib/"
 
 KMEXTRA="filters/krita"
 
+PATCHES=( "${FILESDIR}/${P}+gcc-4.3.patch" )
+
 need-kde 3.5
 
 pkg_setup() {