tjh.dev
1--- a/icon-validator/validate-icon.c
2+++ b/icon-validator/validate-icon.c
3@@ -163,7 +163,7 @@ rerun_in_sandbox (const char *arg_width,
4 const char *arg_height,
5 const char *filename)
6 {
7- const char * const usrmerged_dirs[] = { "bin", "lib32", "lib64", "lib", "sbin" };
8+ const char * const usrmerged_dirs[] = { };
9 int i;
10 g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);
11 char validate_icon[PATH_MAX + 1];
12@@ -183,8 +183,7 @@ rerun_in_sandbox (const char *arg_width,
13 "--unshare-ipc",
14 "--unshare-net",
15 "--unshare-pid",
16- "--ro-bind", "/usr", "/usr",
17- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
18+ "--ro-bind", "@storeDir@", "@storeDir@",
19 "--ro-bind", validate_icon, validate_icon,
20 NULL);
21
22@@ -227,6 +226,9 @@ rerun_in_sandbox (const char *arg_width,
23 add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL);
24 if (g_getenv ("G_MESSAGES_PREFIXED"))
25 add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL);
26+ if (g_getenv ("GDK_PIXBUF_MODULE_FILE"))
27+ add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL);
28+
29
30 add_args (args, validate_icon, arg_width, arg_height, filename, NULL);
31 g_ptr_array_add (args, NULL);