Update to 6.12

0001-Clear-blank-screen-on-monitor-power-on-also-when-no-.patch

@@ -29,21 +29,21 @@ index 6f67e138..9f8bef78 100644
 --- a/driver/windows.c
 +++ b/driver/windows.c
 @@ -970,7 +970,6 @@ watchdog_timer (XtPointer closure, XtIntervalId *id)
+ watchdog_timer (XtPointer closure, XtIntervalId *id)
  {
    saver_info *si = (saver_info *) closure;
-   saver_preferences *p = &si->prefs;
 -  Bool running_p, on_p, terminating_p;
 
    /* If the DPMS settings on the server have changed, change them back to
       what ~/.xscreensaver says they should be. */
 @@ -981,6 +980,20 @@ watchdog_timer (XtPointer closure, XtIntervalId *id)
-
-   raise_windows (si);
+   if (! si->auth_p)		/* Do not race with the password dialog */
+     raise_windows (si);
 
 +  refresh_windows (si);
 +
 +  /* Re-schedule this timer.  The watchdog timer defaults to a bit less
-+     than the hack cycle period, but is never longer than one hour.
++     than the hack cycle period, but is never longer than one minute.
 +   */
 +  si->watchdog_id = 0;
 +  reset_watchdog_timer (si);
@@ -55,7 +55,7 @@ index 6f67e138..9f8bef78 100644
 +  Bool running_p, on_p, terminating_p;
 +
    running_p = any_screenhacks_running_p (si);
-   on_p = monitor_powered_on_p (si->dpy);
+   on_p = monitor_powered_on_p (si);
    terminating_p = si->terminating_p;
 @@ -1018,13 +1031,24 @@ watchdog_timer (XtPointer closure, XtIntervalId *id)
            for (i = 0; i < si->nscreens; i++)
@@ -81,7 +81,7 @@ index 6f67e138..9f8bef78 100644
      }
 -
 -  /* Re-schedule this timer.  The watchdog timer defaults to a bit less
--     than the hack cycle period, but is never longer than one hour.
+-     than the hack cycle period, but is never longer than one minute.
 -   */
 -  si->watchdog_id = 0;
 -  reset_watchdog_timer (si);
@@ -94,39 +94,39 @@ index 870423c2..09315f7f 100644
 +++ b/driver/xscreensaver-gfx.c
 @@ -146,6 +146,7 @@ connect_to_server (saver_info *si)
    XrmOptionDescRec options;
-   char *p;
+   char *name;
    int ac = 1;
 +  int i;
    char *av[] = { "xscreensaver" };    /* For Xt and Xrm purposes */
 
-   XSetErrorHandler (saver_ehandler);
-@@ -178,6 +179,9 @@ connect_to_server (saver_info *si)
-       fprintf (stderr, "%s: xscreensaver does not seem to be running!\n",
-                blurb());
+   /* Make sure the X11 socket doesn't get allocated to stderr: >&- 2>&-.
+@@ -193,7 +193,8 @@ connect_to_server (saver_info *si)
+       /* For tracking changes to XA_SCREENSAVER_STATUS on the root. */
+       XGetWindowAttributes (si->dpy, root, &xgwa);
+       XSelectInput (si->dpy, root,
+-                    xgwa.your_event_mask | PropertyChangeMask);
++                    xgwa.your_event_mask | PropertyChangeMask |
++                    SubstructureNotifyMask);
      }
-+
-+  for (i = 0; i < ScreenCount(si->dpy); i++)
-+    XSelectInput (si->dpy, RootWindow(si->dpy, i), SubstructureNotifyMask);
- }
-
-
+   else
+     {
 @@ -391,6 +395,8 @@ main_loop (saver_info *si, Bool init_p)
 
        if (event.x_event.xany.type == ClientMessage)
          handle_clientmessage (si, &event.x_event);
 +      else if (event.x_event.xany.type == MapNotify)
 +        refresh_windows (si);
- # ifdef HAVE_RANDR
-       else if (si->using_randr_extension &&
-                (event.x_event.type == 
+
+       else if (event.x_event.xany.type == PropertyNotify &&
+                event.x_event.xproperty.state == PropertyNewValue &&
 diff --git a/driver/xscreensaver.h b/driver/xscreensaver.h
 index 4bd84b47..b89ab87b 100644
 --- a/driver/xscreensaver.h
 +++ b/driver/xscreensaver.h
 @@ -53,6 +53,7 @@ extern void initialize_screensaver_window (saver_info *si);
- extern void blank_screen (saver_info *si);
  extern void unblank_screen (saver_info *si);
  extern void resize_screensaver_window (saver_info *si);
+ extern void reset_watchdog_timer (saver_info *);
 +extern void refresh_windows (saver_info *si);
 
  extern void get_screen_viewport (saver_screen_info *ssi,

0002-Bring-xscreensaver-gfx-above-other-applications-when.patch

@@ -79,7 +79,7 @@ index 9f8bef78..c5dbd476 100644
 +}
 +
 
- static void
+ void
  reset_watchdog_timer (saver_info *si)
 diff --git a/driver/xscreensaver-gfx.c b/driver/xscreensaver-gfx.c
 index 09315f7f..cd95301b 100644
@@ -94,16 +94,16 @@ index 09315f7f..cd95301b 100644
 +          refresh_windows (si);
 +          raise_windows_above(si, event.x_event.xmap.window);
 +        }
- # ifdef HAVE_RANDR
-       else if (si->using_randr_extension &&
-                (event.x_event.type == 
+
+       else if (event.x_event.xany.type == PropertyNotify &&
+                event.x_event.xproperty.state == PropertyNewValue &&
 diff --git a/driver/xscreensaver.h b/driver/xscreensaver.h
 index b89ab87b..d2df1135 100644
 --- a/driver/xscreensaver.h
 +++ b/driver/xscreensaver.h
 @@ -54,6 +54,7 @@ extern void blank_screen (saver_info *si);
- extern void unblank_screen (saver_info *si);
  extern void resize_screensaver_window (saver_info *si);
+ extern void reset_watchdog_timer (saver_info *);
  extern void refresh_windows (saver_info *si);
 +extern void raise_windows_above(saver_info *si, Window w);
 

Qubes-0007-utils.patch

@@ -13,7 +13,7 @@ index 28347f3..420919e 100644
 +++ b/utils/version.h
 @@ -1,4 +1,4 @@
  static const char screensaver_id[] =
--	"@(#)xscreensaver 6.10 (28-Apr-2025), by Jamie Zawinski (jwz@jwz.org)";
-+	"@(#)xscreensaver 6.10 (28-Apr-2025), by Jamie Zawinski";
- #define XSCREENSAVER_VERSION "6.10"
- #define XSCREENSAVER_RELEASED 1745866800
+-	"@(#)xscreensaver 6.12 (07-Jul-2025), by Jamie Zawinski (jwz@jwz.org)";
++	"@(#)xscreensaver 6.12 (07-Jul-2025), by Jamie Zawinski";
+ #define XSCREENSAVER_VERSION "6.12"
+ #define XSCREENSAVER_RELEASED 1751914800

version

@@ -1 +1 @@
-6.10.1
+6.12

xscreensaver-6.12.tar.gz.sha512

@@ -0,0 +1 @@
+df98e07fe66fd6ad1fd680c6790d66a160f146ff721f90a76c46142888a0d17f82f068343b1ac82aa4562385460da393dc4733abdb26f0cda0f2a8944a614497

xscreensaver.spec.in

@@ -169,6 +169,7 @@ BuildRequires:   bc
 BuildRequires:   desktop-file-utils
 BuildRequires:   gawk
 BuildRequires:   gettext
+BuildRequires:   gettext-devel
 BuildRequires:   libtool
 BuildRequires:   pam-devel > %{pam_ver}
 BuildRequires:   sed
@@ -589,6 +590,11 @@ sed -i.term \
 sed -i.rpmlint -n -e '1,5p' driver/xscreensaver.pam
 %endif
 
+# xscreensaver 6.12
+sed -i.auth driver/xscreensaver.pam.in \
+    -e '\@auth.*include.*system-auth@s|^#||'
+%__git commit -m "Use system-auth for auth again" -a
+
 if [ -x %{_datadir}/libtool/config.guess ]; then
   # use system-wide copy
    cp -p %{_datadir}/libtool/config.{sub,guess} .
@@ -628,6 +634,8 @@ sed -i configure.ac \
 %__git commit -m "Don't make configure fail with unrecognized option" -a
 
 touch config.rpath
+# Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708)
+export ACLOCAL_PATH=%{_datadir}/gettext/m4/
 aclocal
 autoconf
 autoheader