compile fix

4 files changed, 73 insertions, 22 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index cdb6981ac7f0..93b4119e183c 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.25 2003/08/26 15:07:26 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.26 2003/09/08 02:30:46 caleb Exp $
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> koffice-1.3_beta3.ebuild:
+  Add compiler fix patch for gcc33 (bug #27315)
 
 *koffice-1.3_beta3 (26 Aug 2003)
 
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index ace6ba4370c2..3e7a5364a71b 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,29 +1,30 @@
-MD5 4e4fab387f62640da72b98e9e56233c2 ChangeLog 4538
-MD5 f2d92a55ae7414b4fd4297e4ac508ed5 koffice-1.1.1.ebuild 1140
 MD5 aae91cf6b00df2f62381e45b73173473 koffice-1.2-r1.ebuild 887
-MD5 9a620860de6fc04a27efe67c76f8c71d koffice-1.2-r2.ebuild 963
-MD5 a97021c128750296c2bbda61feb06149 koffice-1.2.1-r1.ebuild 825
 MD5 cd7530c334d300a44640540064734d7d koffice-1.2.1.ebuild 774
-MD5 2e2842e7db798be596acdcb2f5a39e17 koffice-1.2.ebuild 770
+MD5 a97021c128750296c2bbda61feb06149 koffice-1.2.1-r1.ebuild 825
+MD5 7f4ec488fa05c476c51f52508269e039 koffice-1.3_beta2.ebuild 1019
 MD5 1afe012999e9d82c0f34fc3d9989a090 koffice-1.2_beta2.ebuild 1106
-MD5 8d25144bc3f609caab76c82bc069a66b koffice-1.2_rc1.ebuild 847
+MD5 2e2842e7db798be596acdcb2f5a39e17 koffice-1.2.ebuild 770
+MD5 9a620860de6fc04a27efe67c76f8c71d koffice-1.2-r2.ebuild 963
 MD5 d043a27656d6972c3eff302c3278642d koffice-1.3_beta1.ebuild 1241
-MD5 7f4ec488fa05c476c51f52508269e039 koffice-1.3_beta2.ebuild 1019
+MD5 8d25144bc3f609caab76c82bc069a66b koffice-1.2_rc1.ebuild 847
+MD5 f2d92a55ae7414b4fd4297e4ac508ed5 koffice-1.1.1.ebuild 1140
+MD5 84b4232ef876a20b2ecc2e2c7ac2fb05 ChangeLog 4660
+MD5 def75edba9b1c52f8c37b1690866feaa koffice-1.3_beta3.ebuild 1061
 MD5 9ac6e869b89945991aa610d979745f09 metadata.xml 225
-MD5 e9c6f3bffdc5870a5bd4c15db9cde008 koffice-1.3_beta3.ebuild 1023
-MD5 4372c7005e477861f588fc5a4839127d files/digest-koffice-1.1.1 67
-MD5 ad9689676acdfdf5ed01b2467275d536 files/digest-koffice-1.2 65
-MD5 ad9689676acdfdf5ed01b2467275d536 files/digest-koffice-1.2-r1 65
-MD5 ad9689676acdfdf5ed01b2467275d536 files/digest-koffice-1.2-r2 65
-MD5 75c9f696b717a82bf663b4c545be66d2 files/digest-koffice-1.2.1 67
-MD5 75c9f696b717a82bf663b4c545be66d2 files/digest-koffice-1.2.1-r1 67
 MD5 7eb5f8e0051bdfa9d39ddc41d0f2b11e files/digest-koffice-1.2_beta2 71
-MD5 f8969b89924fa67d77c0deb8127cf159 files/digest-koffice-1.2_rc1 69
-MD5 284b55785dbede2c02523d9f341ac94a files/digest-koffice-1.3_beta1 69
-MD5 0fdb0d815d97087336270d8b09d82018 files/koffice-1.1.1-gentoo.diff 978
 MD5 362c1081c562d8405d25be71122ca125 files/koffice-1.2-connectortool.diff 493
-MD5 539a2c71f344995967d87d9662175330 files/koffice-1.2-kspread_cell.diff 2373
-MD5 bd89862f0c15396ad54e30a1c9f2f5d9 files/koffice-1.2.1-kword-crashes.diff 3840
-MD5 9146229d784d3d16978b11ea03be6912 files/koffice-1.3_beta1-fontconfig-2.2-support.diff 645
+MD5 0fdb0d815d97087336270d8b09d82018 files/koffice-1.1.1-gentoo.diff 978
+MD5 284b55785dbede2c02523d9f341ac94a files/digest-koffice-1.3_beta1 69
 MD5 a30ef4176bf47b54fa82b399ac3710c9 files/digest-koffice-1.3_beta2 69
 MD5 e52246a933f30e4551945973e3d434db files/digest-koffice-1.3_beta3 69
+MD5 bd89862f0c15396ad54e30a1c9f2f5d9 files/koffice-1.2.1-kword-crashes.diff 3840
+MD5 539a2c71f344995967d87d9662175330 files/koffice-1.2-kspread_cell.diff 2373
+MD5 9146229d784d3d16978b11ea03be6912 files/koffice-1.3_beta1-fontconfig-2.2-support.diff 645
+MD5 ad9689676acdfdf5ed01b2467275d536 files/digest-koffice-1.2-r1 65
+MD5 ad9689676acdfdf5ed01b2467275d536 files/digest-koffice-1.2-r2 65
+MD5 ad9689676acdfdf5ed01b2467275d536 files/digest-koffice-1.2 65
+MD5 4372c7005e477861f588fc5a4839127d files/digest-koffice-1.1.1 67
+MD5 75c9f696b717a82bf663b4c545be66d2 files/digest-koffice-1.2.1 67
+MD5 f8969b89924fa67d77c0deb8127cf159 files/digest-koffice-1.2_rc1 69
+MD5 5a23cf845584563e25579a8a2d6f3681 files/koffice-1.3_beta3-gcc33.diff 1224
+MD5 75c9f696b717a82bf663b4c545be66d2 files/digest-koffice-1.2.1-r1 67
diff --git a/app-office/koffice/files/koffice-1.3_beta3-gcc33.diff b/app-office/koffice/files/koffice-1.3_beta3-gcc33.diff
new file mode 100644
index 000000000000..2e1c13703dd0
--- /dev/null
+++ b/app-office/koffice/files/koffice-1.3_beta3-gcc33.diff
@@ -0,0 +1,46 @@
+--- filters/kspread/latex/export/table.cc~	2003-08-19 13:38:51.000000000 -0700
++++ filters/kspread/latex/export/table.cc	2003-08-19 15:01:47.000000000 -0700
+@@ -20,6 +20,7 @@
+ */
+ 
+ #include <kdebug.h>		/* for kdDebug stream */
++#include <qbitarray.h>
+ #include "cell.h"
+ #include "column.h"
+ #include "row.h"
+@@ -269,7 +270,7 @@
+ {
+ 	
+ 	Cell* cell = 0;
+-	bool border[getMaxColumn()];
++	QBitArray border(getMaxColumn());
+ 	bool fullLine = true;
+ 	for(int index = 1; index <= getMaxColumn(); index++)
+ 	{
+@@ -302,7 +303,7 @@
+ 				int begin = index;
+ 				int end;
+ 				index = index + 1;
+-				while(border[index] == true && index < getMaxColumn())
++				while(border[index] && index < getMaxColumn())
+ 				{
+ 					index = index + 1;
+ 				}
+@@ -325,7 +326,7 @@
+ void Table::generateBottomLineBorder(QTextStream& out, int row)
+ {
+ 	Cell* cell = 0;
+-	bool border[getMaxColumn()];
++	QBitArray border(getMaxColumn());
+ 	bool fullLine = true;
+ 
+ 	for(int index = 1; index <= getMaxColumn(); index++)
+@@ -358,7 +359,7 @@
+ 				int begin = index;
+ 				int end;
+ 				index = index + 1;
+-				while(border[index] == true && index < getMaxColumn())
++				while(border[index] && index < getMaxColumn())
+ 				{
+ 					index = index + 1;
+ 				}
diff --git a/app-office/koffice/koffice-1.3_beta3.ebuild b/app-office/koffice/koffice-1.3_beta3.ebuild
index 68c50d4e77ef..25159da49676 100644
--- a/app-office/koffice/koffice-1.3_beta3.ebuild
+++ b/app-office/koffice/koffice-1.3_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3_beta3.ebuild,v 1.2 2003/08/26 15:40:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3_beta3.ebuild,v 1.3 2003/09/08 02:30:47 caleb Exp $
 inherit kde-base flag-o-matic
 
 # TODO : mysql support
@@ -16,6 +16,7 @@ DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment.
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 SRC_URI="mirror://kde/unstable/${MY_P}/src/${MY_P}.tar.bz2"
+PATCHES="${FILESDIR}/${P}-gcc33.diff"
 
 S="$WORKDIR/${MY_P}"