Commit caeebd69 authored by Ernestas Kulik's avatar Ernestas Kulik 🦑

Update gnome-desktop code

parent c71adb97
Pipeline #75267 failed with stages
in 4 minutes and 24 seconds
......@@ -343,7 +343,7 @@ setup_seccomp (GPtrArray *argv_array,
{SCMP_SYS (clone), &SCMP_A0 (SCMP_CMP_MASKED_EQ, CLONE_NEWUSER, CLONE_NEWUSER)},
/* Don't allow faking input to the controlling tty (CVE-2017-5226) */
{SCMP_SYS (ioctl), &SCMP_A1(SCMP_CMP_EQ, (int)TIOCSTI)},
{SCMP_SYS (ioctl), &SCMP_A1(SCMP_CMP_MASKED_EQ, 0xFFFFFFFFu, (int)TIOCSTI)},
};
struct
......@@ -565,6 +565,10 @@ add_bwrap (GPtrArray *array,
}
}
/* fontconfig cache if necessary */
if (!g_str_has_prefix (FONTCONFIG_CACHE_PATH, "/usr/"))
  • This broke Continuous because nothing defines FONTCONFIG_CACHE_PATH:

    ../src/gnome-desktop/gnome-desktop-thumbnail-script.c: In function ‘add_bwrap’:
    ../src/gnome-desktop/gnome-desktop-thumbnail-script.c:569:26: error: ‘FONTCONFIG_CACHE_PATH’ undeclared (first use in this function)
       if (!g_str_has_prefix (FONTCONFIG_CACHE_PATH, "/usr/"))
                              ^
    ../src/gnome-desktop/gnome-desktop-thumbnail-script.c:569:26: note: each undeclared identifier is reported only once for each function it appears in
Please register or sign in to reply
add_args (array, "--ro-bind-try", FONTCONFIG_CACHE_PATH, FONTCONFIG_CACHE_PATH, NULL);
add_args (array,
"--proc", "/proc",
"--dev", "/dev",
......
......@@ -967,8 +967,10 @@ get_preview_thumbnail (const char *uri,
if (file_info == NULL)
return NULL;
object = g_object_ref (g_file_info_get_attribute_object (file_info,
G_FILE_ATTRIBUTE_PREVIEW_ICON));
object = g_file_info_get_attribute_object (file_info,
G_FILE_ATTRIBUTE_PREVIEW_ICON);
if (object)
g_object_ref (object);
g_object_unref (file_info);
if (!object)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment