diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-03-24 04:30:56 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-03-24 04:30:56 +0000 |
| commit | d07aa2e63d64faaa46ec110156cf8d225c348bd2 (patch) | |
| tree | e491b45c063bd4f9a2cd1c66021e79d68cc285c3 /x11 | |
| parent | upgrade to 2.11 (diff) | |
Fix build on 4.X.
Reported by: bento via kris
Notes
Notes:
svn path=/head/; revision=105097
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gcursor/files/patch-src::gcursor.c | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/x11/gcursor/files/patch-src::gcursor.c b/x11/gcursor/files/patch-src::gcursor.c index ba7c90f72599..2151097401fb 100644 --- a/x11/gcursor/files/patch-src::gcursor.c +++ b/x11/gcursor/files/patch-src::gcursor.c @@ -1,5 +1,5 @@ ---- src/gcursor.c.orig Mon Mar 8 01:16:17 2004 -+++ src/gcursor.c Mon Mar 8 01:16:51 2004 +--- src/gcursor.c.orig Tue Feb 24 04:49:10 2004 ++++ src/gcursor.c Tue Mar 23 23:30:06 2004 @@ -15,7 +15,7 @@ GConfClient *client; XcursorImage * cursor = NULL; @@ -16,7 +16,31 @@ - "/usr/share/cursors/xfree/", - "/usr/local/share/icons/", - "/usr/share/icons/", -+ "%%X11BASE%%/lib/X11/icons/", ++ "/usr/X11R6/lib/X11/icons/", "%s/.icons/" }; +@@ -177,8 +175,9 @@ + /* where gnome 2.5(.5) uses a gconf key */ + #ifdef GNOME_VERSION_2_4 + char *filepath; ++ FILE *fp; + filepath = g_strdup_printf("%s/.icons/default/index.theme", g_getenv("HOME")); +- FILE *fp = fopen(filepath, "w"); ++ fp = fopen(filepath, "w"); + if(fp != NULL) + { + fprintf(fp, "[Icon Theme]\nInherits=%s\n", name); +@@ -251,9 +250,10 @@ + int i = path_index; + while(i > 0) + { +- dirname = g_strdup_printf(paths[i-1], g_getenv("HOME")); +- GDir *directory = g_dir_open(dirname, 0, NULL); ++ GDir *directory; + const gchar *name = NULL; ++ dirname = g_strdup_printf(paths[i-1], g_getenv("HOME")); ++ directory = g_dir_open(dirname, 0, NULL); + while(directory != NULL && (name = g_dir_read_name(directory)) != NULL) + { + GdkPixbuf *pixbuf; |