rpms/gnome-screensaver/devel gnome-screensaver-2.15.4-securitytoken.patch, 1.5, 1.6

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4651

Modified Files:
	gnome-screensaver-2.15.4-securitytoken.patch 
Log Message:
try again to remove GNOME_COMPILE_WARNINGS


gnome-screensaver-2.15.4-securitytoken.patch:
 configure.ac                           |   16 
 src/Makefile.am                        |    1 
 src/cut-n-paste/Makefile.am            |   13 
 src/cut-n-paste/securitytoken.c        |  602 +++++++++++++++++++++++
 src/cut-n-paste/securitytoken.h        |  101 +++
 src/cut-n-paste/securitytokenmonitor.c |  840 +++++++++++++++++++++++++++++++++
 src/cut-n-paste/securitytokenmonitor.h |   81 +++
 src/gs-monitor.c                       |  118 +++-
 8 files changed, 1747 insertions(+), 25 deletions(-)

Index: gnome-screensaver-2.15.4-securitytoken.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver-2.15.4-securitytoken.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-screensaver-2.15.4-securitytoken.patch	17 Jul 2006 18:04:47 -0000	1.5
+++ gnome-screensaver-2.15.4-securitytoken.patch	17 Jul 2006 18:16:27 -0000	1.6
@@ -1,5 +1,5 @@
 --- gnome-screensaver-2.15.4/src/gs-monitor.c.securitytoken	2006-07-05 20:59:14.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/gs-monitor.c	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/gs-monitor.c	2006-07-17 14:02:26.000000000 +0200
 @@ -41,10 +41,15 @@
  #include "gs-prefs.h"
  #include "gs-debug.h"
@@ -190,7 +190,7 @@
 +        }
 +}
 --- gnome-screensaver-2.15.4/src/Makefile.am.securitytoken	2006-06-28 01:37:57.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/Makefile.am	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/Makefile.am	2006-07-17 14:02:26.000000000 +0200
 @@ -207,6 +207,7 @@ gnome_screensaver_gl_helper_SOURCES =	\
  gnome_screensaver_LDADD =		\
  	$(SAVER_LIBS)			\
@@ -200,7 +200,7 @@
  
  gnome_screensaver_LDFLAGS = -export-dynamic
 --- /dev/null	2006-07-17 09:19:31.432009322 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.c	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.c	2006-07-17 14:02:26.000000000 +0200
 @@ -0,0 +1,840 @@
 +/* securitytokenmonitor.c - monitor for security token insertion and
 + *                          removal events
@@ -1043,7 +1043,7 @@
 +}
 +#endif
 --- /dev/null	2006-07-17 09:19:31.432009322 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.c	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.c	2006-07-17 14:02:26.000000000 +0200
 @@ -0,0 +1,602 @@
 +/* securitytoken.c - security token
 + * 
@@ -1648,7 +1648,7 @@
 +}
 +#endif
 --- /dev/null	2006-07-17 09:19:31.432009322 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.h	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.h	2006-07-17 14:02:26.000000000 +0200
 @@ -0,0 +1,101 @@
 +/* securitytoken.h - api for reading and writing data to a security token 
 + *
@@ -1752,7 +1752,7 @@
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_H */
 --- /dev/null	2006-07-17 09:19:31.432009322 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.h	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.h	2006-07-17 14:02:26.000000000 +0200
 @@ -0,0 +1,81 @@
 +/* securitytokenmonitor.h - monitor for security token insertion and
 + *                          removal events
@@ -1836,7 +1836,7 @@
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_MONITOR_H */
 --- gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am.securitytoken	2005-04-14 21:59:44.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am	2006-07-17 14:02:26.000000000 +0200
 @@ -10,7 +10,18 @@ MAINTAINERCLEANFILES =                  
          Makefile.in
  
@@ -1858,7 +1858,7 @@
  libfast_user_switch_a_CPPFLAGS =				\
  	-DDATADIR=\""$(datadir)"\"				\
 --- gnome-screensaver-2.15.4/configure.ac.securitytoken	2006-06-17 03:31:47.000000000 +0200
-+++ gnome-screensaver-2.15.4/configure.ac	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/configure.ac	2006-07-17 14:15:33.000000000 +0200
 @@ -42,6 +42,7 @@ GLADE_REQUIRED_VERSION=2.5.0
  LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
  LIBEXIF_REQUIRED_VERSION=0.6.12
@@ -1877,7 +1877,16 @@
  AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
  AC_SUBST(GNOME_SCREENSAVER_LIBS)
  
-@@ -229,6 +231,16 @@ fi
+@@ -89,8 +91,6 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
+ 
+ AM_GCONF_SOURCE_2
+ 
+-GNOME_COMPILE_WARNINGS(yes)
+-
+ # Solaris requires libresolv for daemon()
+ AC_CHECK_LIB(resolv, daemon, [GNOME_SCREENSAVER_LIBS="$GNOME_SCREENSAVER_LIBS -lresolv"])
+  
+@@ -229,6 +229,16 @@ fi
  AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes)
  AC_SUBST(HAVE_USER_SWITCHING)