$NetBSD: patch-ah,v 1.11 2013/04/25 12:10:48 joerg Exp $

--- glib/gutils.c.orig	2013-04-15 21:27:24.000000000 +0000
+++ glib/gutils.c
@@ -2008,7 +2008,7 @@ g_get_system_data_dirs (void)
       gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
 
       if (!data_dirs || !data_dirs[0])
-          data_dirs = "/usr/local/share/:/usr/share/";
+          data_dirs = PREFIX "/share/";
 
       data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
 #endif
@@ -2070,7 +2070,7 @@ g_get_system_config_dirs (void)
       conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
 
       if (!conf_dirs || !conf_dirs[0])
-          conf_dirs = "/etc/xdg";
+          conf_dirs = PKG_SYSCONFDIR "/xdg";
 
       conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
 #endif
@@ -2167,6 +2167,8 @@ g_format_size (guint64 size)
  *
  * Since: 2.30
  */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 gchar *
 g_format_size_full (guint64          size,
                     GFormatSizeFlags flags)
@@ -2284,6 +2286,7 @@ g_format_size_full (guint64          siz
 
   return g_string_free (string, FALSE);
 }
+#pragma GCC diagnostic pop
 
 /**
  * g_format_size_for_display: