xscreensaver: drop trusted extensions support

Alexander Pyhalov

2017-12-05 972af49ee44247b32870a8da6225a8eb48566d0c

xscreensaver: drop trusted extensions support

 components/desktop/xscreensaver/Makefile

@@ -18,7 +18,7 @@

COMPONENT_NAME=        xscreensaver
COMPONENT_VERSION=    5.37
COMPONENT_REVISION=    1
COMPONENT_REVISION=    2
COMPONENT_PROJECT_URL=    http://www.jwz.org/xscreensaver/
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz

 components/desktop/xscreensaver/patches/06-gtk-lock.patch

@@ -271,7 +271,7 @@
 xscreensaver: $(SAVER_OBJS)
-    $(CC) $(LDFLAGS) -o $@ $(SAVER_OBJS) $(SAVER_LIBS) $(INTL_LIBS)
+    $(CC) $(LDFLAGS) -o $@ $(SAVER_OBJS) $(SAVER_LIBS) $(INTL_LIBS) \
+    -lgconf-2 -lgobject-2.0
+    -lgconf-2 -lgobject-2.0 -lglib-2.0
 
 xscreensaver-command: $(CMD_OBJS)
     $(CC) $(LDFLAGS) -o $@ $(CMD_OBJS) $(CMD_LIBS)
@@ -3533,7 +3533,7 @@
        { NULL, NULL } /* Must be last to terminate list */
       };
     const struct atom_request *atom_lists[3] = { NULL, NULL, NULL };
@@ -1163,8 +1186,36 @@
@@ -1163,8 +1186,30 @@
 main_loop (saver_info *si)
 {
   saver_preferences *p = &si->prefs;
@@ -3547,12 +3547,6 @@
+** voice for each type-in char in the password field of
+** pop-up dialog
+*/
+
+  /* BUG #6573182
+  ** g_type_init should be done before calling gconf_client routines
+  ** so that xscreensaver does not dump core if gconf daemon is not running.
+  */
+  g_type_init ();
+
+  /*
+  ** 6395649 at-spi-registryd starts when screen is locked even

 components/desktop/xscreensaver/patches/10-trusted.patch

File was deleted

 components/desktop/xscreensaver/patches/11-pam_audit.patch

@@ -36,9 +36,9 @@
diff --git driver/Makefile.in driver/Makefile.in
--- driver/Makefile.in.~6~    2017-10-06 09:21:27.619470801 +0000
+++ driver/Makefile.in    2017-10-06 09:22:34.765399528 +0000
@@ -107,8 +107,8 @@
 TRUSTED_SRCS    = trusted-utils.c
 TRUSTED_OBJS    = trusted-utils.o
@@ -103,8 +103,8 @@
 GTK_LOCK_SRCS    = lock-Gtk.c atoms.c remote.c
 GTK_LOCK_OBJS    = lock-Gtk.o atoms.o remote.o
 
-PWENT_SRCS    = passwd-pwent.c
-PWENT_OBJS    = passwd-pwent.o
@@ -47,7 +47,7 @@
 
 KERBEROS_SRCS    = passwd-kerberos.c
 KERBEROS_OBJS    = passwd-kerberos.o
@@ -216,7 +216,7 @@
@@ -212,7 +212,7 @@
 SAVER_LIBS    = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
           $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
           -lXt -lX11 -lXext $(X_EXTRA_LIBS) \