Add patch to fix build w/ GCC 4.3.

Package-Manager: portage-2.2_pre7-r1/cvs/Linux 2.6.25-gentoo-r3 Intel(R) Core(TM)2 Duo CPU T9300 @ 2.50GHz

4 files changed, 141 insertions, 8 deletions

diff --git a/app-office/kformula/ChangeLog b/app-office/kformula/ChangeLog
index 5e45b0d6d0fe..918a91e2a4b2 100644
--- a/app-office/kformula/ChangeLog
+++ b/app-office/kformula/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kformula
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/ChangeLog,v 1.82 2008/02/19 01:32:00 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/ChangeLog,v 1.83 2008/06/09 05:42:07 dirtyepic Exp $
+
+  09 Jun 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/kformula-1.6.2-gcc-4.3.patch, kformula-1.6.2.ebuild:
+  Add patch to fix build w/ GCC 4.3.
 
   19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kformula-1.6.2.ebuild:
   Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
diff --git a/app-office/kformula/Manifest b/app-office/kformula/Manifest
index a0940df066d0..9e85cf385572 100644
--- a/app-office/kformula/Manifest
+++ b/app-office/kformula/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX kformula-1.6.2-gcc-4.3.patch 5787 RMD160 be8652030479d4a48ea783d34014797d9a298d44 SHA1 a73d7c697230b949390d802ffafef0d65e6e7cb2 SHA256 e4b72ea280429f749705aec6ddce8f04553bbe41c17ca29972417eb5bf24059b
 DIST koffice-1.6.1.tar.bz2 56999028 RMD160 ee4fa84a53f92035c0ab9427e0acb18feca701db SHA1 891fb0a28ec3c4b070c4d6c2eae7fee1d2e37761 SHA256 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728
 DIST koffice-1.6.2.tar.bz2 57049103 RMD160 fb4ef5870870d80481a4a9d2864199428f495460 SHA1 a6a0dcc254f7a7f90d7e5b31f6ebecd54800f211 SHA256 fa5ca02eba02219d34c3c6efff92bf767060b4b1343da56eb63139661d53f380
 EBUILD kformula-1.6.1.ebuild 844 RMD160 7f34df3f6e2e633373d57d45d7091f098fcd80b5 SHA1 92f7dfa2f8fb790e77f091008a53e7ac8a17daa7 SHA256 119d32a9f373b7e6bb74d8f28bd867b82b333d8aeee4f678049db2a2790bf138
-EBUILD kformula-1.6.2.ebuild 1050 RMD160 c713340183f6beb29e69ab846ed7a9942703189c SHA1 2fc93c3d1c71121057fba9daec2d4e3e4e2f7e3e SHA256 722759f1e2651684aa9376beaf4a2d7797cf3cead2ffdbf0c6a4e87626d1a500
-MISC ChangeLog 9133 RMD160 7f6349f0ce897142bc71b0f4c4b4a128f1bbf3b6 SHA1 9a499c81ac29877482f1f1cf2c5d400bfda3ed2c SHA256 b7f37b0e610e2fe53b83f51f38eb5cf21eb4593aec60c439aa43265c487de9fb
+EBUILD kformula-1.6.2.ebuild 1106 RMD160 dfadc2136ff088cd66b5b7b5222f55e73d98a920 SHA1 cfb97b3a8de6415e45b94940aac5c2fbdc5c477e SHA256 ca53c52462927bb615c25458e9ffb1b41e4de2404ac4fdd1b3eff292b2e7dbad
+MISC ChangeLog 9284 RMD160 0c270f5d50566c9d12dfbfe6b71fc5b4d196defd SHA1 2de161e7356073afa87b3857e86836533077e918 SHA256 a6e1612b54ab4e622a2694a8264643a78ba1bf5bae4d9dd6d5b46cd3e935b0f6
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFHujFeB18eXLOpYdkRAu9eAJ9u45/sPhPUR9Cp7DiYLOsWQCwygACggmVM
-7vJjfV/Li11kWfZ0Ni4ISoE=
-=XMPO
+iEYEARECAAYFAkhMwqAACgkQiqiDRvmkBmIs2QCgmNP8pgl1aArVLlBwK4E19xpr
+dsMAn3nrAY0CG+GRkTfcf4LkqwnTOJgx
+=9y6N
 -----END PGP SIGNATURE-----
diff --git a/app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch b/app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch
new file mode 100644
index 000000000000..1f9ce05bc9c4
--- /dev/null
+++ b/app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch
@@ -0,0 +1,126 @@
+--- branches/koffice/1.6/koffice/lib/kformula/textelement.h	2007/05/28 18:20:51	669185
++++ branches/koffice/1.6/koffice/lib/kformula/textelement.h	2007/05/28 18:26:19	669186
+@@ -75,7 +75,7 @@
+      * Calculates our width and height and
+      * our children's parentPosition.
+      */
+-    virtual void calcSizes( const ContextStyle& style,
++    virtual void calcSizes( const ContextStyle& cstyle,
+ 						    ContextStyle::TextStyle tstyle,
+ 						    ContextStyle::IndexStyle istyle,
+ 							StyleAttributes& style );
+@@ -246,7 +246,7 @@
+      * Calculates our width and height and
+      * our children's parentPosition.
+      */
+-    virtual void calcSizes( const ContextStyle& style,
++    virtual void calcSizes( const ContextStyle& cstyle,
+ 						    ContextStyle::TextStyle tstyle,
+ 						    ContextStyle::IndexStyle istyle,
+ 							StyleAttributes& style );
+--- branches/koffice/1.6/koffice/lib/kformula/symbolelement.h	2007/05/28 18:20:51	669185
++++ branches/koffice/1.6/koffice/lib/kformula/symbolelement.h	2007/05/28 18:26:19	669186
+@@ -67,7 +67,7 @@
+      * Calculates our width and height and
+      * our children's parentPosition.
+      */
+-    virtual void calcSizes( const ContextStyle& style,
++    virtual void calcSizes( const ContextStyle& cstyle,
+ 						    ContextStyle::TextStyle tstyle,
+ 						    ContextStyle::IndexStyle istyle,
+ 							StyleAttributes& style );
+--- branches/koffice/1.6/koffice/lib/kformula/spaceelement.h	2007/05/28 18:20:51	669185
++++ branches/koffice/1.6/koffice/lib/kformula/spaceelement.h	2007/05/28 18:26:19	669186
+@@ -80,7 +80,7 @@
+      * Calculates our width and height and
+      * our children's parentPosition.
+      */
+-    virtual void calcSizes( const ContextStyle& style,
++    virtual void calcSizes( const ContextStyle& cstyle,
+ 						    ContextStyle::TextStyle tstyle,
+ 						    ContextStyle::IndexStyle istyle,
+ 							StyleAttributes& style );
+--- branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h	2007/05/28 18:20:51	669185
++++ branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h	2007/05/28 18:26:19	669186
+@@ -94,7 +94,7 @@
+      * Calculates our width and height and
+      * our children's parentPosition.
+      */
+-    virtual void calcSizes( const ContextStyle& style,
++    virtual void calcSizes( const ContextStyle& cstyle,
+ 						    ContextStyle::TextStyle tstyle,
+ 						    ContextStyle::IndexStyle istyle,
+ 							StyleAttributes& style );
+--- branches/koffice/1.6/koffice/lib/kformula/rootelement.h	2007/05/28 18:20:51	669185
++++ branches/koffice/1.6/koffice/lib/kformula/rootelement.h	2007/05/28 18:26:19	669186
+@@ -68,7 +68,7 @@
+      * Calculates our width and height and
+      * our children's parentPosition.
+      */
+-    virtual void calcSizes( const ContextStyle& style,
++    virtual void calcSizes( const ContextStyle& cstyle,
+ 						    ContextStyle::TextStyle tstyle,
+ 						    ContextStyle::IndexStyle istyle,
+ 							StyleAttributes& style );
+@@ -79,7 +79,7 @@
+      * We can use our parentPosition to get our own origin then.
+      */
+     virtual void draw( QPainter& painter, const LuPixelRect& r,
+-                       const ContextStyle& style,
++                       const ContextStyle& cstyle,
+                        ContextStyle::TextStyle tstyle,
+                        ContextStyle::IndexStyle istyle,
+ 					   StyleAttributes& style,
+--- branches/koffice/1.6/koffice/lib/kformula/paddedelement.h	2007/05/28 18:20:51	669185
++++ branches/koffice/1.6/koffice/lib/kformula/paddedelement.h	2007/05/28 18:26:19	669186
+@@ -34,7 +34,7 @@
+      * Calculates our width and height and
+      * our children's parentPosition.
+      */
+-    virtual void calcSizes( const ContextStyle& style,
++    virtual void calcSizes( const ContextStyle& cstyle,
+ 						    ContextStyle::TextStyle tstyle,
+ 						    ContextStyle::IndexStyle istyle,
+ 							StyleAttributes& style );
+--- branches/koffice/1.6/koffice/lib/kformula/matrixelement.h	2007/05/28 18:20:51	669185
++++ branches/koffice/1.6/koffice/lib/kformula/matrixelement.h	2007/05/28 18:26:19	669186
+@@ -82,7 +82,7 @@
+      * Calculates our width and height and
+      * our children's parentPosition.
+      */
+-    virtual void calcSizes( const ContextStyle& style,
++    virtual void calcSizes( const ContextStyle& cstyle,
+ 						    ContextStyle::TextStyle tstyle,
+ 						    ContextStyle::IndexStyle istyle,
+ 							StyleAttributes& style );
+@@ -377,7 +377,7 @@
+      * Calculates our width and height and
+      * our children's parentPosition.
+      */
+-    virtual void calcSizes( const ContextStyle& style,
++    virtual void calcSizes( const ContextStyle& cstyle,
+ 						    ContextStyle::TextStyle tstyle,
+ 						    ContextStyle::IndexStyle istyle,
+ 							StyleAttributes& style );
+--- branches/koffice/1.6/koffice/lib/kformula/indexelement.h	2007/05/28 18:20:51	669185
++++ branches/koffice/1.6/koffice/lib/kformula/indexelement.h	2007/05/28 18:26:19	669186
+@@ -79,7 +79,7 @@
+      * Calculates our width and height and
+      * our children's parentPosition.
+      */
+-    virtual void calcSizes( const ContextStyle& style,
++    virtual void calcSizes( const ContextStyle& cstyle,
+ 						    ContextStyle::TextStyle tstyle,
+ 						    ContextStyle::IndexStyle istyle,
+ 							StyleAttributes& style );
+--- branches/koffice/1.6/koffice/lib/kformula/glyphelement.h	2007/05/28 18:20:51	669185
++++ branches/koffice/1.6/koffice/lib/kformula/glyphelement.h	2007/05/28 18:26:19	669186
+@@ -33,7 +33,7 @@
+      * Calculates our width and height and
+      * our children's parentPosition.
+      */
+-    virtual void calcSizes( const ContextStyle& style,
++    virtual void calcSizes( const ContextStyle& cstyle,
+ 						    ContextStyle::TextStyle tstyle,
+ 						    ContextStyle::IndexStyle istyle,
+ 							StyleAttributes& style );
diff --git a/app-office/kformula/kformula-1.6.2.ebuild b/app-office/kformula/kformula-1.6.2.ebuild
index 47ee3428b6c9..0de4a34123e1 100644
--- a/app-office/kformula/kformula-1.6.2.ebuild
+++ b/app-office/kformula/kformula-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/kformula-1.6.2.ebuild,v 1.13 2008/02/19 01:32:00 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/kformula-1.6.2.ebuild,v 1.14 2008/06/09 05:42:07 dirtyepic Exp $
 
 MAXKOFFICEVER=1.6.3
 KMNAME=koffice
@@ -41,4 +41,6 @@ src_unpack() {
 
 	# Fixing desktop files, cf. bug 190006
 	sed -i -e "s:x-kformula$:x-kformula;:g" "${S}"/kformula/kformula.desktop
+
+	epatch "${FILESDIR}"/${P}-gcc-4.3.patch   # 214365
 }