Attachment 202212 Details for Bug 225378 – [patch] v3: fix mime search patch for non-default LOCALBASE

[patch] [patch] v3: fix mime search patch for non-default LOCALBASE

pr-glib20-xdg-localbase.v3.diff (text/plain), 3.24 KB, created by John Hein on 2019-02-21 02:28:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2019-02-21 02:28:40 UTC

Size: 3.24 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 488708)
>+++ Makefile	(working copy)
>@@ -92,6 +92,10 @@
> 	@${REINPLACE_CMD} -e 's|inotify_support=yes|inotify_support=no| ; \
> 		s|-Werror|| ; \
> 		s|#define HAVE_SYS_INOTIFY_H 1||' ${WRKSRC}/configure
>+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
>+		${WRKSRC}/gio/xdgmime/xdgmime.c \
>+		${WRKSRC}/glib/gutils.c \
>+		${WRKSRC}/glib/tests/utils.c
> 
> do-build-MANPAGES-on:
> .for m in glib gio gobject
>Index: files/patch-gio_xdgmime_xdgmime.c
>===================================================================
>--- files/patch-gio_xdgmime_xdgmime.c	(revision 488708)
>+++ files/patch-gio_xdgmime_xdgmime.c	(working copy)
>@@ -1,11 +1,11 @@
>---- gio/xdgmime/xdgmime.c.orig	Mon Nov  8 22:25:27 2004
>-+++ gio/xdgmime/xdgmime.c	Sat Nov 13 10:27:22 2004
>-@@ -204,7 +204,7 @@
>+--- gio/xdgmime/xdgmime.c.orig	2018-09-21 09:29:23 UTC
>++++ gio/xdgmime/xdgmime.c
>+@@ -253,7 +253,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun
>  
>    xdg_data_dirs = getenv ("XDG_DATA_DIRS");
>    if (xdg_data_dirs == NULL)
> -    xdg_data_dirs = "/usr/local/share/:/usr/share/";
>-+    xdg_data_dirs = "/usr/local/share/";
>++    xdg_data_dirs = "%%LOCALBASE%%/share/";
>  
>    ptr = xdg_data_dirs;
>  
>Index: files/patch-glib_gutils.c
>===================================================================
>--- files/patch-glib_gutils.c	(revision 488708)
>+++ files/patch-glib_gutils.c	(working copy)
>@@ -1,20 +1,20 @@
>---- 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");
>+--- glib/gutils.c.orig	2018-09-21 09:29:23 UTC
>++++ glib/gutils.c
>+@@ -2040,7 +2040,7 @@ g_get_system_data_dirs (void)
>  
>+ #ifndef G_OS_WIN32
>        if (!data_dirs || !data_dirs[0])
> -          data_dirs = "/usr/local/share/:/usr/share/";
>-+          data_dirs = "/usr/local/share/";
>++          data_dirs = "%%LOCALBASE%%/share/";
>  
>        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");
>- 
>+ #else
>+@@ -2116,7 +2116,7 @@ g_get_system_config_dirs (void)
>+ 	}
>+ #else
>        if (!conf_dirs || !conf_dirs[0])
> -          conf_dirs = "/etc/xdg";
>-+          conf_dirs = "/usr/local/etc/xdg:/etc/xdg";
>++          conf_dirs = "%%LOCALBASE%%/etc/xdg:/etc/xdg";
>  
>        conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
>  #endif
>Index: files/patch-glib_tests_utils.c
>===================================================================
>--- files/patch-glib_tests_utils.c	(revision 488708)
>+++ files/patch-glib_tests_utils.c	(working copy)
>@@ -1,11 +1,11 @@
>---- glib/tests/utils.c.orig	2012-09-24 02:19:54.000000000 +0000
>-+++ glib/tests/utils.c	2012-09-24 02:20:48.000000000 +0000
>-@@ -416,7 +416,7 @@
>+--- glib/tests/utils.c.orig	2018-09-21 09:29:23 UTC
>++++ glib/tests/utils.c
>+@@ -441,7 +441,7 @@ test_xdg_dirs (void)
>  
>    xdg = (gchar *)g_getenv ("XDG_CONFIG_DIRS");
>    if (!xdg)
> -    xdg = "/etc/xdg";
>-+    xdg = "/usr/local/etc/xdg:/etc/xdg";
>++    xdg = "%%LOCALBASE%%/etc/xdg:/etc/xdg";
>  
>    dirs = g_get_system_config_dirs ();
>

Actions: View | Diff

Attachments on bug 225378: 189964 | 202168 | 202212 | 222005