Attachment #222005 for bug #225378

Lines 80-85 Link Here

(-)Makefile (+4 lines)
80	@${REINPLACE_CMD} -e '/inotify_init1/d' \	80	@${REINPLACE_CMD} -e '/inotify_init1/d' \
81	-e '/inotify.h/d' \	81	-e '/inotify.h/d' \
82	${WRKSRC}/meson.build	82	${WRKSRC}/meson.build
		83	${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' \
		84	${WRKSRC}/gio/xdgmime/xdgmime.c \
		85	${WRKSRC}/glib/gutils.c \
		86	${WRKSRC}/glib/tests/utils.c
83		87
84	CODEGENDIR= ${PREFIX}/share/glib-2.0/codegen	88	CODEGENDIR= ${PREFIX}/share/glib-2.0/codegen
85		89




--- gio/xdgmime/xdgmime.c.orig	2020-12-17 11:47:11 UTC
+++ gio/xdgmime/xdgmime.c
@@ -235,7 +235,7 @@ xdg_init_dirs (void)
   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
 
   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
   if (xdg_data_dirs == NULL)
-    xdg_data_dirs = "/usr/local/share/:/usr/share/";
+    xdg_data_dirs = "%%LOCALBASE%%/share/";
 
   /* Work out how many dirs we’re dealing with. */
   if (xdg_data_home != NULL || home != NULL)




--- glib/gutils.c.orig	2020-12-17 11:47:11 UTC
+++ glib/gutils.c
@@ -2500,7 +2500,7 @@ g_build_system_data_dirs (void)
    */
 #ifndef G_OS_WIN32
   if (!data_dirs || !data_dirs[0])
-    data_dirs = "/usr/local/share/:/usr/share/";
+    data_dirs = "%%LOCALBASE%%/share/:/usr/share/";
 
   data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
 #else
@@ -2594,7 +2594,7 @@ g_build_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 2020-12-17 11:47:11 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	@@ -485,7 +485,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-11 Link Here

(-)files/patch-gio_xdgmime_xdgmime.c (-7 / +7 lines)
1	--- gio/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004	1	--- gio/xdgmime/xdgmime.c.orig 2020-12-17 11:47:11 UTC
2	+++ gio/xdgmime/xdgmime.c Sat Nov 13 10:27:22 2004	2	+++ gio/xdgmime/xdgmime.c
3	@@ -204,7 +204,7 @@	3	@@ -235,7 +235,7 @@ xdg_init_dirs (void)
		4	xdg_data_dirs = getenv ("XDG_DATA_DIRS");
4		5
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	/* Work out how many dirs we’re dealing with. */
11		11	if (xdg_data_home != NULL \|\| home != NULL)

Lines 1-11 Link Here

(-)files/patch-glib_gutils.c (-4 / +13 lines)
1	--- glib/gutils.c.orig 2018-12-23 14:10:41.000000000 +0100	1	--- glib/gutils.c.orig 2020-12-17 11:47:11 UTC
2	+++ glib/gutils.c 2018-12-27 00:18:23.471950000 +0100	2	+++ glib/gutils.c
3	@@ -2219,7 +2219,7 @@	3	@@ -2500,7 +2500,7 @@ g_build_system_data_dirs (void)
		4	*/
		5	#ifndef G_OS_WIN32
		6	if (!data_dirs \|\| !data_dirs[0])
		7	- data_dirs = "/usr/local/share/:/usr/share/";
		8	+ data_dirs = "%%LOCALBASE%%/share/:/usr/share/";
		9
		10	data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
		11	#else
		12	@@ -2594,7 +2594,7 @@ g_build_system_config_dirs (void)
4	}	13	}
5	#else	14	#else
6	if (!conf_dirs \|\| !conf_dirs[0])	15	if (!conf_dirs \|\| !conf_dirs[0])
7	- conf_dirs = "/etc/xdg";	16	- conf_dirs = "/etc/xdg";
8	+ conf_dirs = "/usr/local/etc/xdg:/etc/xdg";	17	+ conf_dirs = "%%LOCALBASE%%/etc/xdg:/etc/xdg";
9		18
10	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);
11	#endif	20	#endif