better gcc 3.4 patch thanks to Matthew Baker <shadesfox@nightstar.net> (#60016)

3 files changed, 54 insertions, 21 deletions

diff --git a/app-pda/gnome-pilot/ChangeLog b/app-pda/gnome-pilot/ChangeLog
index 98046eff6728..21f1c3613420 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.14 2004/07/24 20:21:10 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.15 2004/08/14 03:16:43 liquidx Exp $
+
+  13 Aug 2004; Alastair Tse <liquidx@gentoo.org>
+  files/gnome-pilot-2.0.10-gcc34.patch:
+  better gcc 3.4 patch thanks to Matthew Baker <shadesfox@nightstar.net> (#60016)
 
   24 Jul 2004; Alastair Tse <liquidx@gentoo.org> gnome-pilot-2.0.10-r1.ebuild,
   -gnome-pilot-2.0.9.ebuild:
diff --git a/app-pda/gnome-pilot/Manifest b/app-pda/gnome-pilot/Manifest
index c4c2d76d1e1a..ea933d8082cd 100644
--- a/app-pda/gnome-pilot/Manifest
+++ b/app-pda/gnome-pilot/Manifest
@@ -1,13 +1,13 @@
 MD5 db26cab929faaf5210f81f6ff7b4ea92 gnome-pilot-0.1.71.ebuild 1360
 MD5 9ded78d9d2412aa21752c81f86023812 gnome-pilot-0.1.65-r5.ebuild 1208
 MD5 564ac50d807cb8c40ca8a2fcd0ebfca5 gnome-pilot-2.0.10-r1.ebuild 1509
-MD5 bf224e579a809ea266dc324001ccb1d8 ChangeLog 5783
+MD5 de81030a791f1778b4a57aea03f8145a ChangeLog 5955
 MD5 1e1031eae2f36a13b2cd73550a31d03d metadata.xml 175
 MD5 df4f6d9882436059cee414d0fb7d91ae files/gnome-pilot-0.1.70-usb.patch 1122
 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 d71fa7fb9a612045e458172470410404 files/gnome-pilot-2.0.10-gcc34.patch 3031
+MD5 0a9a340af87da627cb43fe7d0b3c5a3e files/gnome-pilot-2.0.10-gcc34.patch 4108
 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
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
index dd9c6809befe..a43ff101267e 100644
--- 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
@@ -1,7 +1,9 @@
-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 @@
+Files gnome-pilot-2.0.10.orig/capplet/gnome-palm-conduit.png and gnome-pilot-2.0.10/capplet/gnome-palm-conduit.png differ
+Files gnome-pilot-2.0.10.orig/capplet/gnome-palm.png and gnome-pilot-2.0.10/capplet/gnome-palm.png differ
+diff -urN 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 08:55:39.000000000 -0500
++++ gnome-pilot-2.0.10/capplet/gnome-pilot-capplet.c	2004-08-12 00:04:01.090633768 -0500
+@@ -171,18 +171,18 @@
  	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!");
@@ -17,15 +19,16 @@ diff -Naur gnome-pilot-2.0.10.orig/capplet/gnome-pilot-capplet.c gnome-pilot-2.0
  	
  	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 @@
+diff -urN 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 15:51:06.000000000 -0500
++++ gnome-pilot-2.0.10/capplet/gnome-pilot-cdialog.c	2004-08-12 00:04:01.096632856 -0500
+@@ -112,17 +112,17 @@
  	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!");
@@ -42,13 +45,14 @@ diff -Naur gnome-pilot-2.0.10.orig/capplet/gnome-pilot-cdialog.c gnome-pilot-2.0
  	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 @@
+diff -urN 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 16:12:36.000000000 -0500
++++ gnome-pilot-2.0.10/capplet/gnome-pilot-ddialog.c	2004-08-12 00:04:01.099632400 -0500
+@@ -114,15 +114,15 @@
  	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!");
@@ -63,13 +67,14 @@ diff -Naur gnome-pilot-2.0.10.orig/capplet/gnome-pilot-ddialog.c gnome-pilot-2.0
  	}
  
 - 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 @@
+diff -urN 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 12:29:59.000000000 -0500
++++ gnome-pilot-2.0.10/capplet/gnome-pilot-druid.c	2004-08-12 00:04:01.105631488 -0500
+@@ -168,19 +168,19 @@
  	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!");
@@ -86,8 +91,32 @@ diff -Naur gnome-pilot-2.0.10.orig/capplet/gnome-pilot-druid.c gnome-pilot-2.0.1
  	map_widgets (gpd);
  	fill_widgets (gpd);
  	init_widgets (gpd);
--
+ 
+- error:
++ 
+ }
+ 
+ 
+diff -urN gnome-pilot-2.0.10.orig/capplet/gnome-pilot-pdialog.c gnome-pilot-2.0.10/capplet/gnome-pilot-pdialog.c
+--- gnome-pilot-2.0.10.orig/capplet/gnome-pilot-pdialog.c	2003-04-23 10:39:44.000000000 -0500
++++ gnome-pilot-2.0.10/capplet/gnome-pilot-pdialog.c	2004-08-12 00:04:01.112630424 -0500
+@@ -135,15 +135,15 @@
+ 	priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "PilotSettings", NULL);
+ 	if (!priv->xml) {
+ 		g_message ("gnome-pilot-pdialog init(): Could not load the Glade XML file!");
+-		goto error;
++		return;
+ 	}
+ 
+ 	if (!get_widgets (gppd)) {
+ 		g_message ("gnome-pilot-pdialog init(): Could not find all widgets in the XML file!");
+-		goto error;
++		return;
+ 	}
+ 
 - error:
++ 
  }
  
  
+Files gnome-pilot-2.0.10.orig/capplet/gnome-pilot-watermark.png and gnome-pilot-2.0.10/capplet/gnome-pilot-watermark.png differ
\ No newline at end of file