--- a/components/desktop/xscreensaver/patches/0005-gtk-lock.patch	Wed Mar 29 13:16:33 2017 -0700
+++ b/components/desktop/xscreensaver/patches/0005-gtk-lock.patch	Thu Mar 30 13:00:52 2017 -0700
@@ -1,4 +1,4 @@
-From 8c50007e132d474a772ac456786342c0fe7fe189 Mon Sep 17 00:00:00 2001
+From a5e9aa2e68624b0162e69829bfc5a633e5cf8b79 Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <[email protected]>
 Date: Sat, 2 Jan 2016 20:36:57 -0800
 Subject: [PATCH] gtk-lock
@@ -109,18 +109,18 @@
  #undef HAVE_XSHM_EXTENSION
  
 diff --git a/configure.in b/configure.in
-index 4c4dee5..eb753a3 100644
+index 5ff8aea..dea1f6a 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2666,6 +2666,7 @@ if test "$with_gtk" = yes; then
-   pkg_check_version        libglade-2.0  1.99.0
+@@ -2665,6 +2665,7 @@ if test "$with_gtk" = yes; then
+   pkg_check_version          libxml-2.0  2.4.6
    pkg_check_version      gdk-pixbuf-2.0  2.0.0
    pkg_check_version gdk-pixbuf-xlib-2.0  2.0.0
 +  pkg_check_version           gconf-2.0  2.6.1
    have_gtk="$ok"
  
    if test "$have_gtk" = no; then
-@@ -2681,6 +2682,9 @@ if test "$with_gtk" = yes; then
+@@ -2680,6 +2681,9 @@ if test "$with_gtk" = yes; then
    fi
  
    if test "$have_gtk" = yes; then
@@ -130,7 +130,7 @@
      AC_CACHE_CHECK([for Gtk includes], ac_cv_gtk_config_cflags,
                     [ac_cv_gtk_config_cflags=`$pkg_config --cflags $pkgs`])
      AC_CACHE_CHECK([for Gtk libs], ac_cv_gtk_config_libs,
-@@ -3933,6 +3937,16 @@ if test "$have_gtk" = yes; then
+@@ -3932,6 +3936,16 @@ if test "$have_gtk" = yes; then
    ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS"
  fi
  
@@ -147,7 +147,7 @@
  
  if test "$have_kerberos" = yes; then
    PASSWD_SRCS="$PASSWD_SRCS \$(KERBEROS_SRCS)"
-@@ -4077,6 +4091,11 @@ AC_SUBST(INCLUDES)
+@@ -4076,6 +4090,11 @@ AC_SUBST(INCLUDES)
  
  AC_SUBST(PREFERRED_DEMO_PROGRAM)
  AC_SUBST(ALL_DEMO_PROGRAMS)
@@ -159,7 +159,7 @@
  AC_SUBST(SAVER_LIBS)
  AC_SUBST(MOTIF_LIBS)
  AC_SUBST(GTK_LIBS)
-@@ -4598,7 +4617,8 @@ HACK_CONF_DIR=`echo "${HACK_CONF_DIR}" | sed 's@/$@@;s@//*@/@g'`
+@@ -4597,7 +4616,8 @@ HACK_CONF_DIR=`echo "${HACK_CONF_DIR}" | sed 's@/$@@;s@//*@/@g'`
  
  
  # Sanity check the hackdir
@@ -170,7 +170,7 @@
      echo ""
      AC_MSG_ERROR([\"--with-hackdir=${bindir}/${bad_choice}\" won't work.
 diff --git a/driver/Makefile.in b/driver/Makefile.in
-index 90ef1d2..a44e312 100644
+index 5f269df..22c486f 100644
 --- a/driver/Makefile.in
 +++ b/driver/Makefile.in
 @@ -29,6 +29,7 @@ GTK_APPDIR	= $(GTK_DATADIR)/applications
@@ -367,10 +367,10 @@
 +
  #endif
 diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c
-index 3fa27c3..ece3c44 100644
+index 6457d15..d62152c 100644
 --- a/driver/demo-Gtk.c
 +++ b/driver/demo-Gtk.c
-@@ -98,6 +98,8 @@
+@@ -97,6 +97,8 @@
  # define G_MODULE_EXPORT /**/
  #endif /* !HAVE_GTK2 */
  
@@ -379,7 +379,7 @@
  #if defined(DEFAULT_ICONDIR) && !defined(GLADE_DIR)
  # define GLADE_DIR DEFAULT_ICONDIR
  #endif
-@@ -5042,6 +5044,22 @@ main (int argc, char **argv)
+@@ -5038,6 +5040,22 @@ main (int argc, char **argv)
    load_init_file (dpy, p);
    initialize_sort_map (s);