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

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

pr-glib20-xdg-localbase.v4 (text/plain), 3.05 KB, created by John Hein on 2021-01-29 13:02:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2021-01-29 13:02:49 UTC

Size: 3.05 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 563126)
>+++ Makefile	(working copy)
>@@ -80,6 +80,10 @@
> 	@${REINPLACE_CMD} -e '/inotify_init1/d' \
> 		-e '/inotify.h/d' \
> 		${WRKSRC}/meson.build
>+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
>+		${WRKSRC}/gio/xdgmime/xdgmime.c \
>+		${WRKSRC}/glib/gutils.c \
>+		${WRKSRC}/glib/tests/utils.c
> 
> CODEGENDIR=	${PREFIX}/share/glib-2.0/codegen
> 
>Index: files/patch-gio_xdgmime_xdgmime.c
>===================================================================
>--- files/patch-gio_xdgmime_xdgmime.c	(revision 563126)
>+++ 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	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 = "/usr/local/share/";
>++    xdg_data_dirs = "%%LOCALBASE%%/share/";
>  
>-   ptr = xdg_data_dirs;
>- 
>+   /* Work out how many dirs weâre dealing with. */
>+   if (xdg_data_home != NULL || home != NULL)
>Index: files/patch-glib_gutils.c
>===================================================================
>--- files/patch-glib_gutils.c	(revision 563126)
>+++ files/patch-glib_gutils.c	(working copy)
>@@ -1,11 +1,20 @@
>---- glib/gutils.c.orig	2018-12-23 14:10:41.000000000 +0100
>-+++ glib/gutils.c	2018-12-27 00:18:23.471950000 +0100
>-@@ -2219,7 +2219,7 @@
>+--- 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 = "/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 563126)
>+++ 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	2020-12-17 11:47:11 UTC
>++++ glib/tests/utils.c
>+@@ -485,7 +485,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 ();
>

Flags:

tcberner: maintainer-approval+

Actions: View | Diff

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