flatpak-run.c (flatpak-1.15.2.tar.xz) | : | flatpak-run.c (flatpak-1.15.3.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 611 | skipping to change at line 611 | |||
NULL); | NULL); | |||
} | } | |||
static void | static void | |||
flatpak_run_add_gpg_agent_args (FlatpakBwrap *bwrap) | flatpak_run_add_gpg_agent_args (FlatpakBwrap *bwrap) | |||
{ | { | |||
const char * agent_socket; | const char * agent_socket; | |||
g_autofree char * sandbox_agent_socket = NULL; | g_autofree char * sandbox_agent_socket = NULL; | |||
g_autoptr(GError) gpgconf_error = NULL; | g_autoptr(GError) gpgconf_error = NULL; | |||
g_autoptr(GSubprocess) process = NULL; | g_autoptr(GSubprocess) process = NULL; | |||
g_autoptr(GInputStream) base_stream = NULL; | GInputStream *base_stream = NULL; | |||
g_autoptr(GDataInputStream) data_stream = NULL; | g_autoptr(GDataInputStream) data_stream = NULL; | |||
process = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE, | process = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE, | |||
&gpgconf_error, | &gpgconf_error, | |||
"gpgconf", "--list-dir", "agent-socket", NULL); | "gpgconf", "--list-dir", "agent-socket", NULL); | |||
if (gpgconf_error) | if (gpgconf_error) | |||
{ | { | |||
g_info ("GPG-Agent directories: %s", gpgconf_error->message); | g_info ("GPG-Agent directories: %s", gpgconf_error->message); | |||
return; | return; | |||
skipping to change at line 1915 | skipping to change at line 1915 | |||
{"GST_PLUGIN_SCANNER", NULL}, | {"GST_PLUGIN_SCANNER", NULL}, | |||
{"GST_PLUGIN_SCANNER_1_0", NULL}, | {"GST_PLUGIN_SCANNER_1_0", NULL}, | |||
{"GST_PLUGIN_SYSTEM_PATH_1_0", NULL}, | {"GST_PLUGIN_SYSTEM_PATH_1_0", NULL}, | |||
{"GST_PRESET_PATH", NULL}, | {"GST_PRESET_PATH", NULL}, | |||
{"GST_PTP_HELPER", NULL}, | {"GST_PTP_HELPER", NULL}, | |||
{"GST_PTP_HELPER_1_0", NULL}, | {"GST_PTP_HELPER_1_0", NULL}, | |||
{"GST_INSTALL_PLUGINS_HELPER", NULL}, | {"GST_INSTALL_PLUGINS_HELPER", NULL}, | |||
{"KRB5CCNAME", NULL}, | {"KRB5CCNAME", NULL}, | |||
{"XKB_CONFIG_ROOT", NULL}, | {"XKB_CONFIG_ROOT", NULL}, | |||
{"GIO_EXTRA_MODULES", NULL}, | {"GIO_EXTRA_MODULES", NULL}, | |||
{"GDK_BACKEND", NULL}, | ||||
}; | }; | |||
static const ExportData no_ld_so_cache_exports[] = { | static const ExportData no_ld_so_cache_exports[] = { | |||
{"LD_LIBRARY_PATH", "/app/lib"}, | {"LD_LIBRARY_PATH", "/app/lib"}, | |||
}; | }; | |||
static const ExportData devel_exports[] = { | static const ExportData devel_exports[] = { | |||
{"ACLOCAL_PATH", "/app/share/aclocal"}, | {"ACLOCAL_PATH", "/app/share/aclocal"}, | |||
{"C_INCLUDE_PATH", "/app/include"}, | {"C_INCLUDE_PATH", "/app/include"}, | |||
{"CPLUS_INCLUDE_PATH", "/app/include"}, | {"CPLUS_INCLUDE_PATH", "/app/include"}, | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added |