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

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

pr-glib20-xdg-localbase.diff (text/plain), 2.19 KB, created by John Hein on 2019-02-19 17:49:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2019-02-19 17:49:59 UTC

Size: 2.19 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 491554)
>+++ 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 491554)
>+++ files/patch-gio_xdgmime_xdgmime.c	(working copy)
>@@ -5,7 +5,7 @@
>    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 491554)
>+++ files/patch-glib_gutils.c	(working copy)
>@@ -5,7 +5,7 @@
>  
>        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
>@@ -14,7 +14,7 @@
>  
>        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 491554)
>+++ files/patch-glib_tests_utils.c	(working copy)
>@@ -5,7 +5,7 @@
>    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:

koobs: maintainer-approval+

Actions: View | Diff

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