marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make xauth use optional 

This is not needed on some Xservers, and not if you're only building stuff.
So, lets make it optional.
tingping/wmclass
Alexander Larsson 2016-01-28 12:01:08 +01:00
parent 77ae6b1df0
commit 927e3cab48
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/xdg-app-run.c
View File

@ -998,6 +998,7 @@ extract_unix_path_from_dbus_address (const char *address)
return g_strndup (path, path_end - path);
}
#ifdef ENABLE_XAUTH
static gboolean auth_streq (char *str,
char *au_str,
int au_len)
@ -1049,6 +1050,7 @@ write_xauth (char *number, FILE *output)
fclose (f);
}
#endif /* ENABLE_XAUTH */
static void
xdg_app_run_add_x11_args (GPtrArray *argv_array)
@ -1062,8 +1064,6 @@ xdg_app_run_add_x11_args (GPtrArray *argv_array)
const char *display_nr_end = display_nr;
g_autofree char *d = NULL;
g_autofree char *tmp_path = NULL;
int fd;
FILE *output;
while (g_ascii_isdigit (*display_nr_end))
display_nr_end++;
@ -1074,10 +1074,12 @@ xdg_app_run_add_x11_args (GPtrArray *argv_array)
g_ptr_array_add (argv_array, g_strdup ("-x"));
g_ptr_array_add (argv_array, x11_socket);
#ifdef ENABLE_XAUTH
int fd;
fd = g_file_open_tmp ("xdg-app-xauth-XXXXXX", &tmp_path, NULL);
if (fd >= 0)
{
output = fdopen (fd, "wb");
FILE *output = fdopen (fd, "wb");
if (output != NULL)
{
write_xauth (d, output);
@ -1089,6 +1091,7 @@ xdg_app_run_add_x11_args (GPtrArray *argv_array)
else
close (fd);
}
#endif
}
}

16
configure.ac
View File

@ -82,9 +82,19 @@ AC_SUBST(BASE_LIBS)
PKG_CHECK_MODULES(SOUP, [libsoup-2.4])
AC_SUBST(SOUP_CFLAGS)
AC_SUBST(SOUP_LIBS)
PKG_CHECK_MODULES(XAUTH, [xau])
AC_SUBST(XAUTH_CFLAGS)
AC_SUBST(XAUTH_LIBS)
AC_ARG_ENABLE([xauth],
AC_HELP_STRING([--disable-xauth],
[Disable Xauth use]),
[],
[enable_xauth=yes])
if test "x$enable_xauth" = "xyes"; then
PKG_CHECK_MODULES(XAUTH, [xau])
AC_SUBST(XAUTH_CFLAGS)
AC_SUBST(XAUTH_LIBS)
AC_DEFINE([ENABLE_XAUTH], [1],
[Define if using xauth])
fi
PKG_CHECK_MODULES(OSTREE, [libgsystem >= 2015.1 ostree-1 >= 2015.3])
AC_SUBST(OSTREE_CFLAGS)