forked from Mirrors/flatpak-builder
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
parent
77ae6b1df0
commit
927e3cab48
|
@ -998,6 +998,7 @@ extract_unix_path_from_dbus_address (const char *address)
|
||||||
return g_strndup (path, path_end - path);
|
return g_strndup (path, path_end - path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef ENABLE_XAUTH
|
||||||
static gboolean auth_streq (char *str,
|
static gboolean auth_streq (char *str,
|
||||||
char *au_str,
|
char *au_str,
|
||||||
int au_len)
|
int au_len)
|
||||||
|
@ -1049,6 +1050,7 @@ write_xauth (char *number, FILE *output)
|
||||||
|
|
||||||
fclose (f);
|
fclose (f);
|
||||||
}
|
}
|
||||||
|
#endif /* ENABLE_XAUTH */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
xdg_app_run_add_x11_args (GPtrArray *argv_array)
|
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;
|
const char *display_nr_end = display_nr;
|
||||||
g_autofree char *d = NULL;
|
g_autofree char *d = NULL;
|
||||||
g_autofree char *tmp_path = NULL;
|
g_autofree char *tmp_path = NULL;
|
||||||
int fd;
|
|
||||||
FILE *output;
|
|
||||||
|
|
||||||
while (g_ascii_isdigit (*display_nr_end))
|
while (g_ascii_isdigit (*display_nr_end))
|
||||||
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, g_strdup ("-x"));
|
||||||
g_ptr_array_add (argv_array, x11_socket);
|
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);
|
fd = g_file_open_tmp ("xdg-app-xauth-XXXXXX", &tmp_path, NULL);
|
||||||
if (fd >= 0)
|
if (fd >= 0)
|
||||||
{
|
{
|
||||||
output = fdopen (fd, "wb");
|
FILE *output = fdopen (fd, "wb");
|
||||||
if (output != NULL)
|
if (output != NULL)
|
||||||
{
|
{
|
||||||
write_xauth (d, output);
|
write_xauth (d, output);
|
||||||
|
@ -1089,6 +1091,7 @@ xdg_app_run_add_x11_args (GPtrArray *argv_array)
|
||||||
else
|
else
|
||||||
close (fd);
|
close (fd);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
16
configure.ac
16
configure.ac
|
@ -82,9 +82,19 @@ AC_SUBST(BASE_LIBS)
|
||||||
PKG_CHECK_MODULES(SOUP, [libsoup-2.4])
|
PKG_CHECK_MODULES(SOUP, [libsoup-2.4])
|
||||||
AC_SUBST(SOUP_CFLAGS)
|
AC_SUBST(SOUP_CFLAGS)
|
||||||
AC_SUBST(SOUP_LIBS)
|
AC_SUBST(SOUP_LIBS)
|
||||||
PKG_CHECK_MODULES(XAUTH, [xau])
|
|
||||||
AC_SUBST(XAUTH_CFLAGS)
|
AC_ARG_ENABLE([xauth],
|
||||||
AC_SUBST(XAUTH_LIBS)
|
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])
|
PKG_CHECK_MODULES(OSTREE, [libgsystem >= 2015.1 ostree-1 >= 2015.3])
|
||||||
AC_SUBST(OSTREE_CFLAGS)
|
AC_SUBST(OSTREE_CFLAGS)
|
||||||
|
|
Loading…
Reference in New Issue