[73496] trunk/dports/games/xqf/files
and.damore at macports.org
and.damore at macports.org
Mon Nov 15 04:10:11 PST 2010
Revision: 73496
http://trac.macports.org/changeset/73496
Author: and.damore at macports.org
Date: 2010-11-15 04:10:09 -0800 (Mon, 15 Nov 2010)
Log Message:
-----------
split patch file in separate files, renamed patch files
Modified Paths:
--------------
trunk/dports/games/xqf/files/patch-Makefile.am.diff
trunk/dports/games/xqf/files/patch-Makefile.in.diff
Added Paths:
-----------
trunk/dports/games/xqf/files/patch-src-game_c.diff
trunk/dports/games/xqf/files/patch-src-launch_c.diff
trunk/dports/games/xqf/files/patch-src-loadpixmap_c.diff
Removed Paths:
-------------
trunk/dports/games/xqf/files/patch-loadpixmap.c.diff
trunk/dports/games/xqf/files/patch-xqf-space.diff
Modified: trunk/dports/games/xqf/files/patch-Makefile.am.diff
===================================================================
--- trunk/dports/games/xqf/files/patch-Makefile.am.diff 2010-11-15 11:10:03 UTC (rev 73495)
+++ trunk/dports/games/xqf/files/patch-Makefile.am.diff 2010-11-15 12:10:09 UTC (rev 73496)
@@ -1,6 +1,5 @@
-diff -u -r xqf-1.0.5/src/Makefile.am xqf-1.0.5-patch/src/Makefile.am
---- xqf-1.0.5/src/Makefile.am 2006-10-28 15:12:09.000000000 +0200
-+++ xqf-1.0.5-patch/src/Makefile.am 2007-05-20 22:59:23.000000000 +0200
+--- src/Makefile.am.orig 2006-10-28 15:12:09.000000000 +0200
++++ src/Makefile.am 2007-05-20 22:59:23.000000000 +0200
@@ -34,7 +34,7 @@
$(GDK_PIXBUF_LIBS) \
-lz
Modified: trunk/dports/games/xqf/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/games/xqf/files/patch-Makefile.in.diff 2010-11-15 11:10:03 UTC (rev 73495)
+++ trunk/dports/games/xqf/files/patch-Makefile.in.diff 2010-11-15 12:10:09 UTC (rev 73496)
@@ -1,6 +1,5 @@
-diff -u -r xqf-1.0.5/src/Makefile.in xqf-1.0.5-patch/src/Makefile.in
---- xqf-1.0.5/src/Makefile.in 2006-11-04 13:44:12.000000000 +0100
-+++ xqf-1.0.5-patch/src/Makefile.in 2007-05-20 22:59:44.000000000 +0200
+--- src/Makefile.in.orig 2006-11-04 13:44:12.000000000 +0100
++++ src/Makefile.in 2007-05-20 22:59:44.000000000 +0200
@@ -313,7 +313,7 @@
$(GDK_PIXBUF_LIBS) \
-lz
Deleted: trunk/dports/games/xqf/files/patch-loadpixmap.c.diff
===================================================================
--- trunk/dports/games/xqf/files/patch-loadpixmap.c.diff 2010-11-15 11:10:03 UTC (rev 73495)
+++ trunk/dports/games/xqf/files/patch-loadpixmap.c.diff 2010-11-15 12:10:09 UTC (rev 73496)
@@ -1,12 +0,0 @@
-diff -u -r xqf-1.0.5/src/loadpixmap.c xqf-1.0.5-patch/src/loadpixmap.c
---- xqf-1.0.5/src/loadpixmap.c 2005-07-03 19:51:08.000000000 +0200
-+++ xqf-1.0.5-patch/src/loadpixmap.c 2007-05-19 16:38:37.000000000 +0200
-@@ -184,7 +184,7 @@
- *p++ = '_';
- }
-
-- xpm = dlsym(NULL, found_filename);
-+ xpm = dlsym(RTLD_DEFAULT, found_filename);
- if(xpm)
- {
- colormap = gtk_widget_get_colormap (widget);
Added: trunk/dports/games/xqf/files/patch-src-game_c.diff
===================================================================
--- trunk/dports/games/xqf/files/patch-src-game_c.diff (rev 0)
+++ trunk/dports/games/xqf/files/patch-src-game_c.diff 2010-11-15 12:10:09 UTC (rev 73496)
@@ -0,0 +1,61 @@
+--- src/game.c.orig 2010-11-15 12:54:01.000000000 +0100
++++ src/game.c 2010-11-15 12:54:10.000000000 +0100
+@@ -189,6 +189,45 @@
+ { NULL, UNKNOWN_SERVER }
+ };
+
++/* space name in executable fix */
++gchar ** space_fix_strsplit( const gchar *string,
++ const gchar *delimiter,
++ gint max_tokens )
++{
++ int i,k,len,
++ hit = 0;
++ gchar * localstring = NULL;
++ gchar ** retvalue = NULL;
++
++ /* make a local copy of string to manipulate it
++ we'll free the region just before leaving the main if */
++ len = strlen(string);
++ localstring = (char *) malloc(len+1);
++ if ( localstring ) {
++ strcpy(localstring, string);
++ i=0;
++ while ( i<len-2-hit) {
++ if ( (localstring[i] == '\\') && (localstring[i+1] == ' ') ) {
++ localstring[i] = '\254';
++ for ( k=i+1; k<=len-1; k++)
++ localstring[k]=localstring[k+1];
++ hit += 1;
++ }
++ i += 1;
++ }
++ retvalue = g_strsplit( localstring, delimiter, max_tokens);
++ if (retvalue)
++ if (retvalue[0]) {
++ len = strlen(retvalue[0]);
++ for ( i=0; i<len-1; i++)
++ if ( retvalue[0][i] == '\254' )
++ retvalue[0][i] = ' ';
++ }
++ free(localstring);
++ }
++ return retvalue;
++}
++
+ void init_games()
+ {
+ unsigned i, j;
+@@ -2331,10 +2370,10 @@
+ enable_console = str2bool(game_get_attribute(g->type,"enable_console"));
+ pass_memory_options = str2bool(game_get_attribute(g->type,"pass_memory_options"));
+
+- cmdtokens = g_strsplit(g->cmd," ",0);
++ cmdtokens = space_fix_strsplit(g->cmd," ",0);
+
+ if(cmdtokens && *cmdtokens[cmdi])
+- cmd=cmdtokens[cmdi++];
++ cmd=cmdtokens[cmdi++];
+
+ /*
+ Figure out what protocal the server is running so we can try to connect
Added: trunk/dports/games/xqf/files/patch-src-launch_c.diff
===================================================================
--- trunk/dports/games/xqf/files/patch-src-launch_c.diff (rev 0)
+++ trunk/dports/games/xqf/files/patch-src-launch_c.diff 2010-11-15 12:10:09 UTC (rev 73496)
@@ -0,0 +1,11 @@
+--- src/launch.c.orig 2010-11-15 12:54:05.000000000 +0100
++++ src/launch.c 2010-11-15 12:54:10.000000000 +0100
+@@ -285,7 +285,7 @@
+
+ execvp (argv[0], argv);
+
+- g_snprintf (msg, CLIENT_ERROR_BUFFER, "%sexec(%s) failed: %s",
++ g_snprintf (msg, CLIENT_ERROR_BUFFER, "%sexec(\"%s\") failed: %s",
+ CLIENT_ERROR_MSG_HEAD, argv[0], g_strerror (errno));
+
+ error_out:
Copied: trunk/dports/games/xqf/files/patch-src-loadpixmap_c.diff (from rev 73286, trunk/dports/games/xqf/files/patch-loadpixmap.c.diff)
===================================================================
--- trunk/dports/games/xqf/files/patch-src-loadpixmap_c.diff (rev 0)
+++ trunk/dports/games/xqf/files/patch-src-loadpixmap_c.diff 2010-11-15 12:10:09 UTC (rev 73496)
@@ -0,0 +1,11 @@
+--- src/loadpixmap.c.orig 2010-11-15 13:03:52.000000000 +0100
++++ src/loadpixmap.c 2010-11-15 13:04:20.000000000 +0100
+@@ -184,7 +184,7 @@
+ *p++ = '_';
+ }
+
+- xpm = dlsym(NULL, found_filename);
++ xpm = dlsym(RTLD_DEFAULT, found_filename);
+ if(xpm)
+ {
+ colormap = gtk_widget_get_colormap (widget);
Deleted: trunk/dports/games/xqf/files/patch-xqf-space.diff
===================================================================
--- trunk/dports/games/xqf/files/patch-xqf-space.diff 2010-11-15 11:10:03 UTC (rev 73495)
+++ trunk/dports/games/xqf/files/patch-xqf-space.diff 2010-11-15 12:10:09 UTC (rev 73496)
@@ -1,77 +0,0 @@
-diff -u -r xqf-1.0.5/src/game.c xqf-1.0.5-patch/src/game.c
---- xqf-1.0.5/src/game.c 2006-06-18 15:15:18.000000000 +0200
-+++ xqf-1.0.5-patch/src/game.c 2007-05-20 10:59:32.000000000 +0200
-@@ -189,6 +189,45 @@
- { NULL, UNKNOWN_SERVER }
- };
-
-+/* space name in executable fix */
-+gchar ** space_fix_strsplit( const gchar *string,
-+ const gchar *delimiter,
-+ gint max_tokens )
-+{
-+ int i,k,len,
-+ hit = 0;
-+ gchar * localstring = NULL;
-+ gchar ** retvalue = NULL;
-+
-+ /* make a local copy of string to manipulate it
-+ we'll free the region just before leaving the main if */
-+ len = strlen(string);
-+ localstring = (char *) malloc(len+1);
-+ if ( localstring ) {
-+ strcpy(localstring, string);
-+ i=0;
-+ while ( i<len-2-hit) {
-+ if ( (localstring[i] == '\\') && (localstring[i+1] == ' ') ) {
-+ localstring[i] = '\254';
-+ for ( k=i+1; k<=len-1; k++)
-+ localstring[k]=localstring[k+1];
-+ hit += 1;
-+ }
-+ i += 1;
-+ }
-+ retvalue = g_strsplit( localstring, delimiter, max_tokens);
-+ if (retvalue)
-+ if (retvalue[0]) {
-+ len = strlen(retvalue[0]);
-+ for ( i=0; i<len-1; i++)
-+ if ( retvalue[0][i] == '\254' )
-+ retvalue[0][i] = ' ';
-+ }
-+ free(localstring);
-+ }
-+ return retvalue;
-+}
-+
- void init_games()
- {
- unsigned i, j;
-@@ -2331,10 +2370,10 @@
- enable_console = str2bool(game_get_attribute(g->type,"enable_console"));
- pass_memory_options = str2bool(game_get_attribute(g->type,"pass_memory_options"));
-
-- cmdtokens = g_strsplit(g->cmd," ",0);
-+ cmdtokens = space_fix_strsplit(g->cmd," ",0);
-
- if(cmdtokens && *cmdtokens[cmdi])
-- cmd=cmdtokens[cmdi++];
-+ cmd=cmdtokens[cmdi++];
-
- /*
- Figure out what protocal the server is running so we can try to connect
-diff -u -r xqf-1.0.5/src/launch.c xqf-1.0.5-patch/src/launch.c
---- xqf-1.0.5/src/launch.c 2005-10-07 14:55:15.000000000 +0200
-+++ xqf-1.0.5-patch/src/launch.c 2007-05-20 08:16:52.000000000 +0200
-@@ -285,9 +285,10 @@
-
- execvp (argv[0], argv);
-
-- g_snprintf (msg, CLIENT_ERROR_BUFFER, "%sexec(%s) failed: %s",
-+ g_snprintf (msg, CLIENT_ERROR_BUFFER, "%sexec(\"%s\") failed: %s",
- CLIENT_ERROR_MSG_HEAD, argv[0], g_strerror (errno));
-
-+
- error_out:
- write (pipefds[1], msg, strlen (msg) + 1);
- close (pipefds[1]);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101115/bded1d1c/attachment-0001.html>
More information about the macports-changes
mailing list