- Fix build with gcc 4.2

PR:		118475
Submitted by:	Pietro Cerutti <gahr@gahr.ch>
Approved by:	portmgr (erwin)

5 files changed, 164 insertions, 7 deletions

diff --git a/x11-fm/gnome-commander/Makefile b/x11-fm/gnome-commander/Makefile
index b950f6c1caf5..c80cb654b3eb 100644
--- a/x11-fm/gnome-commander/Makefile
+++ b/x11-fm/gnome-commander/Makefile
@@ -31,12 +31,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
 pre-everything::
 .if !defined(WITH_FAM)
 	@${ECHO} ""
@@ -45,4 +39,4 @@ pre-everything::
 	@${ECHO} ""
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/gnome-commander/files/patch-src_gnome-cmd-advrename-lexer.l b/x11-fm/gnome-commander/files/patch-src_gnome-cmd-advrename-lexer.l
new file mode 100644
index 000000000000..8e471ec0af9c
--- /dev/null
+++ b/x11-fm/gnome-commander/files/patch-src_gnome-cmd-advrename-lexer.l
@@ -0,0 +1,95 @@
+--- src/gnome-cmd-advrename-lexer.l.orig	2007-12-07 01:47:10.000000000 +0100
++++ src/gnome-cmd-advrename-lexer.l	2007-12-07 01:49:09.000000000 +0100
+@@ -85,8 +85,8 @@
+                                         case 'p' : *s++ = PARENT_DIR; break;
+                                       }
+                                     
+-                                      *((int *) s)++ = --from;
+-                                      *((int *) s)++ = length;
++                                      *s++ = --from;
++                                      *s++ = length;
+                                     }
+ 
+                                     fname_template_size -= sizeof(char)+2*sizeof(int);
+@@ -99,7 +99,7 @@
+ 				    precision = -1;
+                                     sscanf(yytext+3,"%d",&precision);
+                                     *s++ = COUNTER;
+-                                    *((int *) s)++ = precision<MAX_PRECISION ? precision : MAX_PRECISION;
++                                    *s++ = precision<MAX_PRECISION ? precision : MAX_PRECISION;
+                                     fname_template_size -= sizeof(char)+sizeof(int);
+                                   }
+                                 }
+@@ -117,8 +117,8 @@
+                                       case 'p' : *s++ = PARENT_DIR; break;
+                                     }
+                                     
+-                                    *((int *) s)++ = 0;
+-                                    *((int *) s)++ = -1;
++                                    *s++ = 0;
++                                    *s++ = -1;
+ 
+                                     fname_template_size -= sizeof(char)+2*sizeof(int);
+                                   }
+@@ -128,7 +128,7 @@
+                                   if (fname_template_size>1+sizeof(int))
+                                   {
+                                     *s++ = COUNTER;
+-                                    *((int *) s)++ = -1;
++                                    *s++ = -1;
+                                     fname_template_size -= sizeof(char)+sizeof(int);
+                                   }
+                                 }
+@@ -260,8 +260,8 @@
+     switch (*src)
+     {
+       case NAME      : ++src;
+-                       from = *((int *) src)++;
+-		       length = *((int *) src)++;
++                       from = *src++;
++		       length = *src++;
+ 		       mksubstr(name_len,&from,&length);
+ 		       if (length<=NAME_MAX-(dest-fmt))
+ 		       {
+@@ -271,8 +271,8 @@
+ 		       break;
+ 
+       case EXTENSION : ++src;
+-                       from = *((int *) src)++;
+-		       length = *((int *) src)++;
++                       from = *src++;
++		       length = *src++;
+ 		       mksubstr(ext_len,&from,&length);
+ 		       if (length<=NAME_MAX-(dest-fmt))
+ 		       {
+@@ -282,8 +282,8 @@
+ 		       break;
+ 
+       case FULL_NAME : ++src;
+-                       from = *((int *) src)++;
+-		       length = *((int *) src)++;
++                       from = *src++;
++		       length = *src++;
+ 		       mksubstr(full_name_len,&from,&length);
+ 		       if (length<=NAME_MAX-(dest-fmt))
+ 		       {
+@@ -293,8 +293,8 @@
+ 		       break;
+ 
+       case PARENT_DIR: ++src;
+-                       from = *((int *) src)++;
+-		       length = *((int *) src)++;
++                       from = *src++;
++		       length = *src++;
+ 		       mksubstr(parent_dir_len,&from,&length);
+ 		       if (length<=NAME_MAX-(dest-fmt))
+ 		       {
+@@ -304,7 +304,7 @@
+ 		       break;
+ 
+       case COUNTER   : ++src;
+-                       precision = *((int *) src)++;
++                       precision = *src++;
+ 		       if (precision!=-1)
+ 		         sprintf(custom_counter_fmt,"%%0%ilu",precision);
+                        dest += snprintf(dest,NAME_MAX-(dest-fmt),(precision==-1 ? counter_fmt : custom_counter_fmt),counter);
diff --git a/x11-fm/gnome-commander/files/patch-src_gnome-cmd-data.c b/x11-fm/gnome-commander/files/patch-src_gnome-cmd-data.c
new file mode 100644
index 000000000000..624ee5491131
--- /dev/null
+++ b/x11-fm/gnome-commander/files/patch-src_gnome-cmd-data.c
@@ -0,0 +1,28 @@
+--- src/gnome-cmd-data.c.orig	2007-12-07 01:52:03.000000000 +0100
++++ src/gnome-cmd-data.c	2007-12-07 01:55:02.000000000 +0100
+@@ -557,10 +557,10 @@
+ 			 data->priv->advrename_defaults->height);
+ 
+ 	write_int_array ("/gnome-commander/advrename/pat_col_widths%d",
+-					 advrename_dialog_default_pat_column_width,
++					 (gint *) &advrename_dialog_default_pat_column_width,
+ 					 ADVRENAME_DIALOG_PAT_NUM_COLUMNS);
+ 	write_int_array ("/gnome-commander/advrename/res_col_widths%d",
+-					 advrename_dialog_default_res_column_width,
++					 (gint *)&advrename_dialog_default_res_column_width,
+ 					 ADVRENAME_DIALOG_RES_NUM_COLUMNS);
+ 	
+ 	set_int ("/gnome-commander/advrename/sep_value",
+@@ -688,10 +688,10 @@
+ 		"/gnome-commander/advrename/height", 400);
+ 
+ 	load_int_array ("/gnome-commander/advrename/pat_col_widths%d",
+-					advrename_dialog_default_pat_column_width,
++					(gint *)&advrename_dialog_default_pat_column_width,
+ 					ADVRENAME_DIALOG_PAT_NUM_COLUMNS);
+ 	load_int_array ("/gnome-commander/advrename/res_col_widths%d",
+-					advrename_dialog_default_res_column_width,
++					(gint *)&advrename_dialog_default_res_column_width,
+ 					ADVRENAME_DIALOG_RES_NUM_COLUMNS);
+ 	
+ 	data->priv->advrename_defaults->sep_value = get_int (
diff --git a/x11-fm/gnome-commander/files/patch-src_gnome-cmd-file-list.c b/x11-fm/gnome-commander/files/patch-src_gnome-cmd-file-list.c
new file mode 100644
index 000000000000..003ae7dcc86c
--- /dev/null
+++ b/x11-fm/gnome-commander/files/patch-src_gnome-cmd-file-list.c
@@ -0,0 +1,20 @@
+--- src/gnome-cmd-file-list.c.orig	2007-12-07 01:55:47.000000000 +0100
++++ src/gnome-cmd-file-list.c	2007-12-07 01:58:30.000000000 +0100
+@@ -57,7 +57,7 @@
+ };
+ 
+ 
+-static GtkTargetEntry drag_types [] = {
++GtkTargetEntry drag_types [] = {
+ 	{ TARGET_URI_LIST_TYPE, 0, TARGET_URI_LIST },
+ 	{ TARGET_TEXT_PLAIN_TYPE, 0, TARGET_TEXT_PLAIN },
+ 	{ TARGET_URL_TYPE, 0, TARGET_URL }
+@@ -574,7 +574,7 @@
+ 	switch (info){
+ 		case TARGET_URI_LIST:
+ 		case TARGET_TEXT_PLAIN:
+-			gtk_selection_data_set (selection_data, selection_data->target, 8, data, len);
++			gtk_selection_data_set (selection_data, selection_data->target, 8, (guchar *)data, len);
+ 			break;
+ 
+ 		case TARGET_URL:
diff --git a/x11-fm/gnome-commander/files/patch-src_gnome-cmd-file-selector.c b/x11-fm/gnome-commander/files/patch-src_gnome-cmd-file-selector.c
new file mode 100644
index 000000000000..86e120123ff4
--- /dev/null
+++ b/x11-fm/gnome-commander/files/patch-src_gnome-cmd-file-selector.c
@@ -0,0 +1,20 @@
+--- src/gnome-cmd-file-selector.c.orig	2007-12-07 01:59:14.000000000 +0100
++++ src/gnome-cmd-file-selector.c	2007-12-07 02:00:52.000000000 +0100
+@@ -42,7 +42,7 @@
+ 
+ #define AUTOSCROLL_INTERVAL 100
+ 
+-static GtkTargetEntry drop_types [] = {
++GtkTargetEntry drop_types [] = {
+ 	{ TARGET_URI_LIST_TYPE, 0, TARGET_URI_LIST },
+ 	{ TARGET_URL_TYPE, 0, TARGET_URL }
+ };
+@@ -405,7 +405,7 @@
+ 	/* Transform the drag data to a list with uris
+ 	 *
+ 	 */
+-	uri_list = strings_to_uris (selection_data->data);
++	uri_list = strings_to_uris ((gchar *)selection_data->data);
+ 
+ 	if (g_list_length (uri_list) == 1) {
+ 		GnomeVFSURI *uri = (GnomeVFSURI*)uri_list->data;