Added gcc-3.4 fixes to close bug #53655

4 files changed, 115 insertions, 14 deletions

diff --git a/app-pda/gnome-pilot/ChangeLog b/app-pda/gnome-pilot/ChangeLog
index 6ecbaa2945ae..94191623d13d 100644
--- a/app-pda/gnome-pilot/ChangeLog
+++ b/app-pda/gnome-pilot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/gnome-pilot
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.12 2004/06/27 02:13:33 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.13 2004/07/12 18:59:03 eradicator Exp $
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/gnome-pilot-2.0.10-gcc34.patch:
+  Added gcc-3.4 fixes to close bug #53655
 
   27 Jun 2004; Alastair Tse <liquidx@gentoo.org>
   +files/gnome-pilot-2.0.10-clie.patch:
diff --git a/app-pda/gnome-pilot/Manifest b/app-pda/gnome-pilot/Manifest
index 5a4ef91c3f4f..0404048531aa 100644
--- a/app-pda/gnome-pilot/Manifest
+++ b/app-pda/gnome-pilot/Manifest
@@ -1,17 +1,18 @@
-MD5 db26cab929faaf5210f81f6ff7b4ea92 gnome-pilot-0.1.71.ebuild 1360
+MD5 7c7ee2b3759d2152afeb0afc9fcf1300 ChangeLog 5654
 MD5 9ded78d9d2412aa21752c81f86023812 gnome-pilot-0.1.65-r5.ebuild 1208
-MD5 07156c106f0c77c3bc0e989148ef73da gnome-pilot-2.0.10-r1.ebuild 1441
-MD5 246c69992e27a3c1e3cecfcb8b589b0f ChangeLog 5510
-MD5 1e1031eae2f36a13b2cd73550a31d03d metadata.xml 175
+MD5 db26cab929faaf5210f81f6ff7b4ea92 gnome-pilot-0.1.71.ebuild 1360
+MD5 8cbaa71304679ee37f831b7ec7ec7d5e gnome-pilot-2.0.10-r1.ebuild 1503
 MD5 0b777060568b9f9957a70d18039ce5bc gnome-pilot-2.0.9.ebuild 1317
-MD5 df4f6d9882436059cee414d0fb7d91ae files/gnome-pilot-0.1.70-usb.patch 1122
+MD5 1e1031eae2f36a13b2cd73550a31d03d metadata.xml 175
+MD5 6dd42dbe52e081c7ac130b8303cd84ac files/digest-gnome-pilot-0.1.65-r5 71
 MD5 327dd488b418afec2cac40f6b8bbbcd7 files/digest-gnome-pilot-0.1.71 71
-MD5 f50c6d977f5c1c3729bb88a763356de4 files/gnome-pilot-gentoo.diff 4186
-MD5 d8281597713f41bcc2f8d66d72c64a5c files/gnome-pilot-2.0.10-treo600.patch 670
-MD5 3720cf4f610ccbcdfce32c5c540d1076 files/gnome-pilot-2.0.10-missing_proc.patch 440
-MD5 ba03ae634fb8f71f80715cdfea0ba409 files/gnome-pilot-2.0.10-clie.patch 638
 MD5 4c1bf3e985e3e12a7196902b013f314c files/digest-gnome-pilot-2.0.10-r1 71
-MD5 6dd42dbe52e081c7ac130b8303cd84ac files/digest-gnome-pilot-0.1.65-r5 71
 MD5 7283428c0134d68479d562b313752de6 files/digest-gnome-pilot-2.0.9 70
-MD5 0e6853fd3f1027a38152ea0085dc8f6e files/gnome-pilot-2.0.10-memofile.patch 16432
+MD5 df4f6d9882436059cee414d0fb7d91ae files/gnome-pilot-0.1.70-usb.patch 1122
 MD5 de42a13e198e82cd8d8c5f77bc1a1705 files/gnome-pilot-2.0.1-pisock.patch 450
+MD5 0e6853fd3f1027a38152ea0085dc8f6e files/gnome-pilot-2.0.10-memofile.patch 16432
+MD5 d8281597713f41bcc2f8d66d72c64a5c files/gnome-pilot-2.0.10-treo600.patch 670
+MD5 f50c6d977f5c1c3729bb88a763356de4 files/gnome-pilot-gentoo.diff 4186
+MD5 3720cf4f610ccbcdfce32c5c540d1076 files/gnome-pilot-2.0.10-missing_proc.patch 440
+MD5 ba03ae634fb8f71f80715cdfea0ba409 files/gnome-pilot-2.0.10-clie.patch 638
+MD5 d71fa7fb9a612045e458172470410404 files/gnome-pilot-2.0.10-gcc34.patch 3031
diff --git a/app-pda/gnome-pilot/files/gnome-pilot-2.0.10-gcc34.patch b/app-pda/gnome-pilot/files/gnome-pilot-2.0.10-gcc34.patch
new file mode 100644
index 000000000000..dd9c6809befe
--- /dev/null
+++ b/app-pda/gnome-pilot/files/gnome-pilot-2.0.10-gcc34.patch
@@ -0,0 +1,93 @@
+diff -Naur gnome-pilot-2.0.10.orig/capplet/gnome-pilot-capplet.c gnome-pilot-2.0.10/capplet/gnome-pilot-capplet.c
+--- gnome-pilot-2.0.10.orig/capplet/gnome-pilot-capplet.c	2003-05-02 06:55:39.000000000 -0700
++++ gnome-pilot-2.0.10/capplet/gnome-pilot-capplet.c	2004-06-11 09:15:37.394071424 -0700
+@@ -171,18 +171,16 @@
+ 	priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "CappletMain", NULL);
+ 	if (!priv->xml) {
+ 		g_message ("gnome-pilot-capplet init(): Could not load the Glade XML file!");
+-		goto error;
++		return;
+ 	}
+ 	
+ 	if (!get_widgets (gpcap)) {
+ 		g_message ("gnome-pilot-capplet init(): Could not find all widgets in the XML file!");
+-		goto error;
++		return;
+ 	}
+ 	
+ 	fill_widgets (gpcap);
+ 	init_widgets (gpcap);
+-
+- error:
+ }
+ 
+ GnomePilotCapplet *
+diff -Naur gnome-pilot-2.0.10.orig/capplet/gnome-pilot-cdialog.c gnome-pilot-2.0.10/capplet/gnome-pilot-cdialog.c
+--- gnome-pilot-2.0.10.orig/capplet/gnome-pilot-cdialog.c	2003-04-22 13:51:06.000000000 -0700
++++ gnome-pilot-2.0.10/capplet/gnome-pilot-cdialog.c	2004-06-11 09:15:37.413068536 -0700
+@@ -112,17 +112,16 @@
+ 	priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "ConduitSettings", NULL);
+ 	if (!priv->xml) {
+ 		g_message ("gnome-pilot-cdialog init(): Could not load the Glade XML file!");
+-		goto error;
++		return;
+ 	}
+ 
+ 	if (!get_widgets (gpcd)) {
+ 		g_message ("gnome-pilot-cdialog init(): Could not find all widgets in the XML file!");
+-		goto error;
++		return;
+ 	}
+ 	
+ 	gnome_dialog_close_hides (GNOME_DIALOG (priv->dialog), TRUE);
+ 	
+- error:
+ }
+ 
+ 
+diff -Naur gnome-pilot-2.0.10.orig/capplet/gnome-pilot-ddialog.c gnome-pilot-2.0.10/capplet/gnome-pilot-ddialog.c
+--- gnome-pilot-2.0.10.orig/capplet/gnome-pilot-ddialog.c	2003-04-22 14:12:36.000000000 -0700
++++ gnome-pilot-2.0.10/capplet/gnome-pilot-ddialog.c	2004-06-11 09:15:37.413068536 -0700
+@@ -114,15 +114,14 @@
+ 	priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "DeviceSettings", NULL);
+ 	if (!priv->xml) {
+ 		g_message ("gnome-pilot-ddialog init(): Could not load the Glade XML file!");
+-		goto error;
++		return;
+ 	}
+ 
+ 	if (!get_widgets (gpdd)) {
+ 		g_message ("gnome-pilot-ddialog init(): Could not find all widgets in the XML file!");
+-		goto error;
++		return;
+ 	}
+ 
+- error:
+ }
+ 
+ 
+diff -Naur gnome-pilot-2.0.10.orig/capplet/gnome-pilot-druid.c gnome-pilot-2.0.10/capplet/gnome-pilot-druid.c
+--- gnome-pilot-2.0.10.orig/capplet/gnome-pilot-druid.c	2003-05-13 10:29:59.000000000 -0700
++++ gnome-pilot-2.0.10/capplet/gnome-pilot-druid.c	2004-06-11 09:15:37.414068384 -0700
+@@ -168,19 +168,17 @@
+ 	priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", NULL, NULL);
+ 	if (!priv->xml) {
+ 		g_message ("gnome-pilot-druid init(): Could not load the Glade XML file!");
+-		goto error;
++		return;
+ 	}
+ 
+ 	if (!get_widgets (gpd)) {
+ 		g_message ("gnome-pilot-druid init(): Could not find all widgets in the XML file!");
+-		goto error;
++		return;
+ 	}
+ 
+ 	map_widgets (gpd);
+ 	fill_widgets (gpd);
+ 	init_widgets (gpd);
+-
+- error:
+ }
+ 
+ 
diff --git a/app-pda/gnome-pilot/gnome-pilot-2.0.10-r1.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.0.10-r1.ebuild
index 6f63bfd2ffae..4d2e4c458e6b 100644
--- a/app-pda/gnome-pilot/gnome-pilot-2.0.10-r1.ebuild
+++ b/app-pda/gnome-pilot/gnome-pilot-2.0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.10-r1.ebuild,v 1.9 2004/06/27 02:13:33 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.10-r1.ebuild,v 1.10 2004/07/12 18:59:03 eradicator Exp $
 
 inherit gnome2 eutils
 
@@ -45,4 +45,7 @@ src_unpack() {
 
 	# http://bugs.gentoo.org/show_bug.cgi?id=52550 -- add new clie model
 	epatch ${FILESDIR}/${P}-clie.patch
-}
\ No newline at end of file
+
+	# gcc-3.4 patches
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}