Attachment #202168 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 5-11 Link Here

(-)files/patch-gio_xdgmime_xdgmime.c (-1 / +1 lines)
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

Lines 5-11 Link Here

(-)files/patch-glib_gutils.c (-2 / +2 lines)
5		5
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	#endif
Lines 14-20 Link Here
14		14
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

Lines 5-11 Link Here

(-)files/patch-glib_tests_utils.c (-1 / +1 lines)
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