gcc2 fix

4 files changed, 36 insertions, 9 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 6df526f2e401..9dd3f2634bf9 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.39 2003/09/17 20:19:32 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.40 2003/09/21 17:33:54 foser Exp $
 
 *gnumeric-1.2.0 (17 Sep 2003)
 
+  21 Sep 2003; foser <foser@gentoo.org> gnumeric-1.2.0.ebuild :
+  Added patch to fix gcc2 compilation, provided by 
+  Tristan Henderson <T.Henderson@cs.ucl.ac.uk> (#29181)
+
   17 Sep 2003; Alastair Tse <liquidx@gentoo.org> gnumeric-1.2.0.ebuild,
   files/gnumeric-1.2.0-fix_doc_destdir_install.patch:
   version bump. patch for docs thanks to Andy Pyles <a_pyles@yahoo.com> (#28946)
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index cedff6501515..72a39b00d87f 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,11 +1,12 @@
-MD5 1a8ef533f7637f2e40797b9166e39820 ChangeLog 6278
-MD5 5c9854c592e07c330b27b050b9aa088a gnumeric-1.0.13-r1.ebuild 2995
-MD5 d45d9d014b7f82c405b5574e1726a1fa gnumeric-1.0.8.ebuild 3245
-MD5 e2daa02b1788742675d0ce2ef3252f38 gnumeric-1.2.0.ebuild 1666
+MD5 d2426a7ea33f912ee99da4e46ef93c7b gnumeric-1.2.0.ebuild 1743
+MD5 c565a3a413eee846bece1bb10e9c4e5d ChangeLog 6449
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 7843727e1fcde50a4a2283ba34da3c1d files/digest-gnumeric-1.0.13-r1 69
+MD5 d45d9d014b7f82c405b5574e1726a1fa gnumeric-1.0.8.ebuild 3245
+MD5 5c9854c592e07c330b27b050b9aa088a gnumeric-1.0.13-r1.ebuild 2995
+MD5 8a88ece514714721699de5346a0f4e1e files/gnumeric-1.0.8-docbuild.patch 728
+MD5 e3240d8a40c24a464b95631ef8c41727 files/gnumeric-1.2.0-fix_doc_destdir_install.patch 563
 MD5 a88fe4d27bf9a2579f4f3db0ca6f355f files/digest-gnumeric-1.0.8 69
 MD5 9e7ac50a8f6681cf92cdacfbbaa3a4ee files/digest-gnumeric-1.2.0 69
-MD5 8a88ece514714721699de5346a0f4e1e files/gnumeric-1.0.8-docbuild.patch 728
+MD5 7843727e1fcde50a4a2283ba34da3c1d files/digest-gnumeric-1.0.13-r1 69
 MD5 b4f77780f0a0a1a29df8c8b184b2c110 files/gnumeric-1.1.16-scrollkeeper.patch 493
-MD5 e3240d8a40c24a464b95631ef8c41727 files/gnumeric-1.2.0-fix_doc_destdir_install.patch 563
+MD5 4ea524a5bc0155e6fb624670d57075f7 files/gnumeric-1.2.0-gcc2_fix.patch 693
diff --git a/app-office/gnumeric/files/gnumeric-1.2.0-gcc2_fix.patch b/app-office/gnumeric/files/gnumeric-1.2.0-gcc2_fix.patch
new file mode 100644
index 000000000000..3c991ddb9149
--- /dev/null
+++ b/app-office/gnumeric/files/gnumeric-1.2.0-gcc2_fix.patch
@@ -0,0 +1,20 @@
+diff -Naur gnumeric-1.2.0.orig/src/dialogs/dialog-sheet-order.c gnumeric-1.2.0/src/dialogs/dialog-sheet-order.c
+--- gnumeric-1.2.0.orig/src/dialogs/dialog-sheet-order.c	2003-09-15 01:40:38.000000000 -0400
++++ gnumeric-1.2.0/src/dialogs/dialog-sheet-order.c	2003-09-20 06:35:59.000000000 -0400
+@@ -106,6 +106,7 @@
+ static gint
+ location_of_iter (GtkTreeIter  *iter, GtkListStore *model)
+ {
++	gint loc;
+ 	/* Note: in gtk 2.2 we could just do: */
+ /* 	gchar* path = gtk_tree_model_get_string_from_iter */
+ /* 		(GTK_TREE_MODEL (model), iter); */
+@@ -117,7 +118,7 @@
+ 	gtk_tree_path_free (treepath);
+ 	/* end of gtk 2.0 code */
+ 
+-	gint loc = atoi(path);
++	loc = atoi(path);
+ 	
+ 	g_free (path);
+ 
diff --git a/app-office/gnumeric/gnumeric-1.2.0.ebuild b/app-office/gnumeric/gnumeric-1.2.0.ebuild
index 108e063a91c4..74e166da899f 100644
--- a/app-office/gnumeric/gnumeric-1.2.0.ebuild
+++ b/app-office/gnumeric/gnumeric-1.2.0.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/gnumeric/gnumeric-1.2.0.ebuild,v 1.1 2003/09/17 20:19:32 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.2.0.ebuild,v 1.2 2003/09/21 17:33:54 foser Exp $
 
 #provide Xmake and Xemake
 inherit virtualx libtool gnome2 eutils debug
@@ -47,6 +47,8 @@ src_unpack() {
 	cd ${S}
 	# fixes a sandbox issue - foser <foser@gentoo.org>
 	epatch ${FILESDIR}/${P}-fix_doc_destdir_install.patch
+	# fixes gcc2 compile failure (#29181)
+	epatch ${FILESDIR}/${P}-gcc2_fix.patch
 
 }