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

1 files changed, 47 insertions, 18 deletions

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