summaryrefslogtreecommitdiff
path: root/devel/glib20/files/patch-glib_gutils.c
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2005-04-07 05:12:31 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2005-04-07 05:12:31 +0000
commit33dc5a461c907bf72f4b7d1e34f33496faa0bf45 (patch)
tree29849f01b33a4038263ed5b2f329d460068dd65b /devel/glib20/files/patch-glib_gutils.c
parent- update to 0.23 (diff)
Update to 2.6.4.
Diffstat (limited to 'devel/glib20/files/patch-glib_gutils.c')
-rw-r--r--devel/glib20/files/patch-glib_gutils.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c
index d32b910ad8ca..ad4210c2526f 100644
--- a/devel/glib20/files/patch-glib_gutils.c
+++ b/devel/glib20/files/patch-glib_gutils.c
@@ -1,20 +1,20 @@
---- glib/gutils.c.orig Sat Sep 4 15:49:27 2004
-+++ glib/gutils.c Sat Sep 4 15:55:24 2004
-@@ -1466,7 +1466,7 @@
+--- glib/gutils.c.orig Wed Mar 23 09:55:02 2005
++++ glib/gutils.c Thu Apr 7 01:06:16 2005
+@@ -1929,7 +1929,7 @@ g_get_system_data_dirs (void)
data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
if (!data_dirs || !data_dirs[0])
- data_dirs = "/usr/local/share/:/usr/share/";
+ data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
- #endif
- data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
-@@ -1509,7 +1509,7 @@
+ data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
+ #endif
+@@ -1983,7 +1983,7 @@ g_get_system_config_dirs (void)
conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
if (!conf_dirs || !conf_dirs[0])
- conf_dirs = "/etc/xdg";
+ conf_dirs = "%%X11BASE%%/etc/xdg:/usr/local/etc/xdg:/etc/xdg";
- #endif
+
conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
- }
+ #endif