Attachment #82861 for bug #118475

View | Details | Raw Unified | Return to bug 118475
Collapse All | Expand All




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} ""

	@${ECHO} ""
.endif

.include <bsd.port.mk>




--- 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);




--- 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 (




--- 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:




--- 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;

Return to bug 118475

Lines 31-42 Link Here

(-)Makefile (-7 / +1 lines)
31	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	31	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
32	LIBS="-L${LOCALBASE}/lib -lintl"	32	LIBS="-L${LOCALBASE}/lib -lintl"
33		33
34	.include <bsd.port.pre.mk>
35
36	.if ${OSVERSION} >= 700042
37	BROKEN= Broken with gcc 4.2
38	.endif
39
40	pre-everything::	34	pre-everything::
41	.if !defined(WITH_FAM)	35	.if !defined(WITH_FAM)
42	@${ECHO} ""	36	@${ECHO} ""
Lines 45-48 Link Here
45	@${ECHO} ""	39	@${ECHO} ""
46	.endif	40	.endif
47		41
48	.include <bsd.port.post.mk>	42	.include <bsd.port.mk>

Added Link Here

(-)files/patch-src_gnome-cmd-advrename-lexer.l (+95 lines)
1	--- src/gnome-cmd-advrename-lexer.l.orig 2007-12-07 01:47:10.000000000 +0100
2	+++ src/gnome-cmd-advrename-lexer.l 2007-12-07 01:49:09.000000000 +0100
3	@@ -85,8 +85,8 @@
4	case 'p' : *s++ = PARENT_DIR; break;
5	}
6
7	- ((int ) s)++ = --from;
8	- ((int ) s)++ = length;
9	+ *s++ = --from;
10	+ *s++ = length;
11	}
12
13	fname_template_size -= sizeof(char)+2*sizeof(int);
14	@@ -99,7 +99,7 @@
15	precision = -1;
16	sscanf(yytext+3,"%d",&precision);
17	*s++ = COUNTER;
18	- ((int ) s)++ = precision<MAX_PRECISION ? precision : MAX_PRECISION;
19	+ *s++ = precision<MAX_PRECISION ? precision : MAX_PRECISION;
20	fname_template_size -= sizeof(char)+sizeof(int);
21	}
22	}
23	@@ -117,8 +117,8 @@
24	case 'p' : *s++ = PARENT_DIR; break;
25	}
26
27	- ((int ) s)++ = 0;
28	- ((int ) s)++ = -1;
29	+ *s++ = 0;
30	+ *s++ = -1;
31
32	fname_template_size -= sizeof(char)+2*sizeof(int);
33	}
34	@@ -128,7 +128,7 @@
35	if (fname_template_size>1+sizeof(int))
36	{
37	*s++ = COUNTER;
38	- ((int ) s)++ = -1;
39	+ *s++ = -1;
40	fname_template_size -= sizeof(char)+sizeof(int);
41	}
42	}
43	@@ -260,8 +260,8 @@
44	switch (*src)
45	{
46	case NAME : ++src;
47	- from = ((int ) src)++;
48	- length = ((int ) src)++;
49	+ from = *src++;
50	+ length = *src++;
51	mksubstr(name_len,&from,&length);
52	if (length<=NAME_MAX-(dest-fmt))
53	{
54	@@ -271,8 +271,8 @@
55	break;
56
57	case EXTENSION : ++src;
58	- from = ((int ) src)++;
59	- length = ((int ) src)++;
60	+ from = *src++;
61	+ length = *src++;
62	mksubstr(ext_len,&from,&length);
63	if (length<=NAME_MAX-(dest-fmt))
64	{
65	@@ -282,8 +282,8 @@
66	break;
67
68	case FULL_NAME : ++src;
69	- from = ((int ) src)++;
70	- length = ((int ) src)++;
71	+ from = *src++;
72	+ length = *src++;
73	mksubstr(full_name_len,&from,&length);
74	if (length<=NAME_MAX-(dest-fmt))
75	{
76	@@ -293,8 +293,8 @@
77	break;
78
79	case PARENT_DIR: ++src;
80	- from = ((int ) src)++;
81	- length = ((int ) src)++;
82	+ from = *src++;
83	+ length = *src++;
84	mksubstr(parent_dir_len,&from,&length);
85	if (length<=NAME_MAX-(dest-fmt))
86	{
87	@@ -304,7 +304,7 @@
88	break;
89
90	case COUNTER : ++src;
91	- precision = ((int ) src)++;
92	+ precision = *src++;
93	if (precision!=-1)
94	sprintf(custom_counter_fmt,"%%0%ilu",precision);
95	dest += snprintf(dest,NAME_MAX-(dest-fmt),(precision==-1 ? counter_fmt : custom_counter_fmt),counter);

Added Link Here

(-)files/patch-src_gnome-cmd-data.c (+28 lines)
1	--- src/gnome-cmd-data.c.orig 2007-12-07 01:52:03.000000000 +0100
2	+++ src/gnome-cmd-data.c 2007-12-07 01:55:02.000000000 +0100
3	@@ -557,10 +557,10 @@
4	data->priv->advrename_defaults->height);
5
6	write_int_array ("/gnome-commander/advrename/pat_col_widths%d",
7	- advrename_dialog_default_pat_column_width,
8	+ (gint *) &advrename_dialog_default_pat_column_width,
9	ADVRENAME_DIALOG_PAT_NUM_COLUMNS);
10	write_int_array ("/gnome-commander/advrename/res_col_widths%d",
11	- advrename_dialog_default_res_column_width,
12	+ (gint *)&advrename_dialog_default_res_column_width,
13	ADVRENAME_DIALOG_RES_NUM_COLUMNS);
14
15	set_int ("/gnome-commander/advrename/sep_value",
16	@@ -688,10 +688,10 @@
17	"/gnome-commander/advrename/height", 400);
18
19	load_int_array ("/gnome-commander/advrename/pat_col_widths%d",
20	- advrename_dialog_default_pat_column_width,
21	+ (gint *)&advrename_dialog_default_pat_column_width,
22	ADVRENAME_DIALOG_PAT_NUM_COLUMNS);
23	load_int_array ("/gnome-commander/advrename/res_col_widths%d",
24	- advrename_dialog_default_res_column_width,
25	+ (gint *)&advrename_dialog_default_res_column_width,
26	ADVRENAME_DIALOG_RES_NUM_COLUMNS);
27
28	data->priv->advrename_defaults->sep_value = get_int (

Added Link Here

(-)files/patch-src_gnome-cmd-file-list.c (+20 lines)
1	--- src/gnome-cmd-file-list.c.orig 2007-12-07 01:55:47.000000000 +0100
2	+++ src/gnome-cmd-file-list.c 2007-12-07 01:58:30.000000000 +0100
3	@@ -57,7 +57,7 @@
4	};
5
6
7	-static GtkTargetEntry drag_types [] = {
8	+GtkTargetEntry drag_types [] = {
9	{ TARGET_URI_LIST_TYPE, 0, TARGET_URI_LIST },
10	{ TARGET_TEXT_PLAIN_TYPE, 0, TARGET_TEXT_PLAIN },
11	{ TARGET_URL_TYPE, 0, TARGET_URL }
12	@@ -574,7 +574,7 @@
13	switch (info){
14	case TARGET_URI_LIST:
15	case TARGET_TEXT_PLAIN:
16	- gtk_selection_data_set (selection_data, selection_data->target, 8, data, len);
17	+ gtk_selection_data_set (selection_data, selection_data->target, 8, (guchar *)data, len);
18	break;
19
20	case TARGET_URL:

Added Link Here

(-)files/patch-src_gnome-cmd-file-selector.c (+20 lines)
1	--- src/gnome-cmd-file-selector.c.orig 2007-12-07 01:59:14.000000000 +0100
2	+++ src/gnome-cmd-file-selector.c 2007-12-07 02:00:52.000000000 +0100
3	@@ -42,7 +42,7 @@
4
5	#define AUTOSCROLL_INTERVAL 100
6
7	-static GtkTargetEntry drop_types [] = {
8	+GtkTargetEntry drop_types [] = {
9	{ TARGET_URI_LIST_TYPE, 0, TARGET_URI_LIST },
10	{ TARGET_URL_TYPE, 0, TARGET_URL }
11	};
12	@@ -405,7 +405,7 @@
13	/* Transform the drag data to a list with uris
14	*
15	*/
16	- uri_list = strings_to_uris (selection_data->data);
17	+ uri_list = strings_to_uris ((gchar *)selection_data->data);
18
19	if (g_list_length (uri_list) == 1) {
20	GnomeVFSURI uri = (GnomeVFSURI)uri_list->data;