--- a/patches/xscreensaver-10-i18n.diff	Wed Jun 02 03:23:43 2010 +0000
+++ b/patches/xscreensaver-10-i18n.diff	Wed Jun 02 03:25:58 2010 +0000
@@ -24,9 +24,9 @@
 Fixes for bugs that cause problems localizing xscreensaver:
 6203951 xscreensaver-lock was not properly l10ned
 
-diff -Nurp -x '*~' -x '*.orig' xscreensaver-5.11/driver/xscreensaver.c xscreensaver-5.11/driver/xscreensaver.c
---- xscreensaver-5.11/driver/xscreensaver.c	2009-05-27 17:18:24.824116000 -0700
-+++ xscreensaver-5.11/driver/xscreensaver.c	2009-05-27 17:18:42.011082000 -0700
+diff --git xscreensaver-5.11/driver/xscreensaver.c xscreensaver-5.11/driver/xscreensaver.c
+--- xscreensaver-5.11/driver/xscreensaver.c
++++ xscreensaver-5.11/driver/xscreensaver.c
 @@ -144,6 +144,9 @@
  #include <ctype.h>
  #include <X11/Xlib.h>
@@ -37,7 +37,7 @@
  #include <X11/Xlibint.h>
  
  #include <X11/Xatom.h>
-@@ -1443,6 +1446,15 @@ main (int argc, char **argv)
+@@ -1465,6 +1468,15 @@ main (int argc, char **argv)
    struct passwd *spasswd;
    int i;
  
@@ -52,4 +52,5 @@
 +
    memset(si, 0, sizeof(*si));
  
- /* Initialize and point si to pw_data i.e. the lock dialog struct */
+ #ifdef HAVE_XSCREENSAVER_LOCK
+