Attachment #202212 for bug #225378

Lines 92-97 Link Here

(-)Makefile (+4 lines)
92	@${REINPLACE_CMD} -e 's\|inotify_support=yes\|inotify_support=no\| ; \	92	@${REINPLACE_CMD} -e 's\|inotify_support=yes\|inotify_support=no\| ; \
93	s\|-Werror\|\| ; \	93	s\|-Werror\|\| ; \
94	s\|#define HAVE_SYS_INOTIFY_H 1\|\|' ${WRKSRC}/configure	94	s\|#define HAVE_SYS_INOTIFY_H 1\|\|' ${WRKSRC}/configure
		95	${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' \
		96	${WRKSRC}/gio/xdgmime/xdgmime.c \
		97	${WRKSRC}/glib/gutils.c \
		98	${WRKSRC}/glib/tests/utils.c
95		99
96	do-build-MANPAGES-on:	100	do-build-MANPAGES-on:
97	.for m in glib gio gobject	101	.for m in glib gio gobject

Lines 1-11 Link Here

(-)files/patch-gio_xdgmime_xdgmime.c (-4 / +4 lines)
1	--- gio/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004	1	--- gio/xdgmime/xdgmime.c.orig 2018-09-21 09:29:23 UTC
2	+++ gio/xdgmime/xdgmime.c Sat Nov 13 10:27:22 2004	2	+++ gio/xdgmime/xdgmime.c
3	@@ -204,7 +204,7 @@	3	@@ -253,7 +253,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun
4		4
5	xdg_data_dirs = getenv ("XDG_DATA_DIRS");	5	xdg_data_dirs = getenv ("XDG_DATA_DIRS");
6	if (xdg_data_dirs == NULL)	6	if (xdg_data_dirs == NULL)
7	- xdg_data_dirs = "/usr/local/share/:/usr/share/";	7	- xdg_data_dirs = "/usr/local/share/:/usr/share/";
8	+ xdg_data_dirs = "/usr/local/share/";	8	+ xdg_data_dirs = "%%LOCALBASE%%/share/";
9		9
10	ptr = xdg_data_dirs;	10	ptr = xdg_data_dirs;
11		11




--- glib/gutils.c.orig	2018-09-21 09:29:23 UTC
+++ glib/gutils.c
@@ -2040,7 +2040,7 @@ g_get_system_data_dirs (void)
       data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
 
 #ifndef G_OS_WIN32
       if (!data_dirs || !data_dirs[0])
-          data_dirs = "/usr/local/share/:/usr/share/";
+          data_dirs = "%%LOCALBASE%%/share/";
 
       data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
 #else
@@ -2116,7 +2116,7 @@ g_get_system_config_dirs (void)
 	}
 #else
       if (!conf_dirs || !conf_dirs[0])
-          conf_dirs = "/etc/xdg";
+          conf_dirs = "%%LOCALBASE%%/etc/xdg:/etc/xdg";
 
       conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
 #endif

Lines 1-11 Link Here

(-)files/patch-glib_tests_utils.c (-4 / +4 lines)
1	--- glib/tests/utils.c.orig 2012-09-24 02:19:54.000000000 +0000	1	--- glib/tests/utils.c.orig 2018-09-21 09:29:23 UTC
2	+++ glib/tests/utils.c 2012-09-24 02:20:48.000000000 +0000	2	+++ glib/tests/utils.c
3	@@ -416,7 +416,7 @@	3	@@ -441,7 +441,7 @@ test_xdg_dirs (void)
4		4
5	xdg = (gchar *)g_getenv ("XDG_CONFIG_DIRS");	5	xdg = (gchar *)g_getenv ("XDG_CONFIG_DIRS");
6	if (!xdg)	6	if (!xdg)
7	- xdg = "/etc/xdg";	7	- xdg = "/etc/xdg";
8	+ xdg = "/usr/local/etc/xdg:/etc/xdg";	8	+ xdg = "%%LOCALBASE%%/etc/xdg:/etc/xdg";
9		9
10	dirs = g_get_system_config_dirs ();	10	dirs = g_get_system_config_dirs ();
11		11

Return to bug 225378

Lines 1-20 Link Here

(-)files/patch-glib_gutils.c (-10 / +10 lines)
1	--- glib/gutils.c.orig Wed Mar 23 09:55:02 2005	1	--- glib/gutils.c.orig 2018-09-21 09:29:23 UTC
2	+++ glib/gutils.c Thu Apr 7 01:06:16 2005	2	+++ glib/gutils.c
3	@@ -1929,7 +1929,7 @@ g_get_system_data_dirs (void)	3	@@ -2040,7 +2040,7 @@ g_get_system_data_dirs (void)
4	data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
5		4
		5	#ifndef G_OS_WIN32
6	if (!data_dirs \|\| !data_dirs[0])	6	if (!data_dirs \|\| !data_dirs[0])
7	- data_dirs = "/usr/local/share/:/usr/share/";	7	- data_dirs = "/usr/local/share/:/usr/share/";
8	+ data_dirs = "/usr/local/share/";	8	+ data_dirs = "%%LOCALBASE%%/share/";
9		9
10	data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);	10	data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
11	#endif	11	#else
12	@@ -1983,7 +1983,7 @@ g_get_system_config_dirs (void)	12	@@ -2116,7 +2116,7 @@ g_get_system_config_dirs (void)
13	conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");	13	}
14		14	#else
15	if (!conf_dirs \|\| !conf_dirs[0])	15	if (!conf_dirs \|\| !conf_dirs[0])
16	- conf_dirs = "/etc/xdg";	16	- conf_dirs = "/etc/xdg";
17	+ conf_dirs = "/usr/local/etc/xdg:/etc/xdg";	17	+ conf_dirs = "%%LOCALBASE%%/etc/xdg:/etc/xdg";
18		18
19	conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);	19	conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
20	#endif	20	#endif