Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 x11/xscreensaver/CONFIGURE |    2 ++
 x11/xscreensaver/DEPENDS   |    9 +++++++--
 x11/xscreensaver/DETAILS   |    4 ++--
 x11/xscreensaver/HISTORY   |    6 ++++++
 x11/xscreensaver/PRE_BUILD |   19 ++++++++++++++++++-
 5 files changed, 35 insertions(+), 5 deletions(-)

New commits:
commit 47117948a9a7626283a1cf2f83f422768504ac01
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    xscreensaver: update to 6.08, at patch for update nagging

diff --git a/x11/xscreensaver/CONFIGURE b/x11/xscreensaver/CONFIGURE
index 92bae29..a98e140 100755
--- a/x11/xscreensaver/CONFIGURE
+++ b/x11/xscreensaver/CONFIGURE
@@ -1,3 +1,5 @@
+config_query         XSCSV_NOTIMEBOMB \
+  "Are you a terrible person? (patch out time-based update warning)" n &&
 config_query_option  XSCSV_LOCK  "Enable screen locking?"  y \
                                  --enable-locking --disable-locking &&
 config_query_option  XSCSV_ROOT  "Enable unlocking with root passwd?"  y \
diff --git a/x11/xscreensaver/DEPENDS b/x11/xscreensaver/DEPENDS
index 2c1acce..f80d246 100755
--- a/x11/xscreensaver/DEPENDS
+++ b/x11/xscreensaver/DEPENDS
@@ -10,7 +10,7 @@ depends  libxt         &&
 depends  zlib          &&
 depends  freetype2 "--with-xft" &&
 
-depends  GTK2        "--with-gtk"    &&
+depends  gtk+3        "--with-gtk"    &&
 depends  gdk-pixbuf2 "--with-pixbuf" &&
 depends  gdk-pixbuf-xlib             &&
 
@@ -117,5 +117,10 @@ suggest_depends  electricsheep                           
       \
 optional_depends  systemd                                       \
                   "--with-systemd"                              \
                   "--without-systemd"                           \
-                  "build xscreensaver-systemd to lock on suspend"
+                  "build xscreensaver-systemd to lock on suspend" &&
+optional_depends  elogind                                       \
+                  "--with-elogind"                              \
+                  "--without-elogind"                           \
+                  "use elogin instead of systemd for lock on suspend"
+
 
diff --git a/x11/xscreensaver/DETAILS b/x11/xscreensaver/DETAILS
index ea70c06..ed212f5 100755
--- a/x11/xscreensaver/DETAILS
+++ b/x11/xscreensaver/DETAILS
@@ -1,12 +1,12 @@
            SPELL=xscreensaver
-         VERSION=6.04
+         VERSION=6.08
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.jwz.org/$SPELL/$SOURCE
         WEB_SITE=http://www.jwz.org/xscreensaver/
-     
SOURCE_HASH=sha512:7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071
+     
SOURCE_HASH=sha512:a333d4921ed3a8219f3b672dd68543aea31fcd64ea6766143f1c7f6e5ed3bc7122355635d5afba1632457ad71a11cabdc7b2756431e4f1dc7e0426ae0896e6db
          ENTERED=20010922
       LICENSE[0]=BSD
         KEYWORDS="x11"
diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY
index 903216e..fb0dcb5 100644
--- a/x11/xscreensaver/HISTORY
+++ b/x11/xscreensaver/HISTORY
@@ -1,3 +1,9 @@
+2024-01-03 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: version 6.08
+       * CONFIGURE, PRE_BUILD: Offer patch to disable the update
+         nagging, after all. It's really quite stable software.
+       * DEPENDS: Hard-depends on gtk+3 now, add elogind.
+
 2023-03-07 Thomas Orgis <sobukus AT sourcemage.org>
        * PRE_BUILD: hacked configure for non-PAM system
 
diff --git a/x11/xscreensaver/PRE_BUILD b/x11/xscreensaver/PRE_BUILD
index b6e1e30..5db0cf4 100755
--- a/x11/xscreensaver/PRE_BUILD
+++ b/x11/xscreensaver/PRE_BUILD
@@ -1,12 +1,29 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
+if [[ $XSCSV_NOTIMEBOMB == y ]]; then
+  message "${MESSAGE_COLOR}Patching out the update nag 
message.${DEFAULT_COLOR}" &&
+  patch -p1 <<EOT
+--- xscreensaver-6.08/driver/dialog.c.orig     2024-01-03 09:56:55.167407777 
+0100
++++ xscreensaver-6.08/driver/dialog.c  2024-01-03 10:48:19.227273017 +0100
+@@ -1456,3 +1456,3 @@
+   */
+-  if (time ((time_t *) 0) - XSCREENSAVER_RELEASED > 60*60*24*30*17)
++  /* if (time ((time_t *) 0) - XSCREENSAVER_RELEASED > 60*60*24*30*17)
+     {
+@@ -1467,3 +1467,3 @@
+     }
+-  else if (strstr (ws->version, "a") || strstr (ws->version, "b"))
++  else */ if (strstr (ws->version, "a") || strstr (ws->version, "b"))
+     {
+EOT
+fi &&
 # On Source Mage, /etc/pam.d gets populated regardless of linux-pam
 # being there. Upstream likely won't be sympathetic with this, so
 # keep a local hack.
 patch -p0 <<EOT
 --- configure.orig     2023-03-07 11:48:12.299643343 +0100
 +++ configure  2023-03-07 11:49:19.190672169 +0100
-@@ -22069,7 +22069,8 @@
+@@ -22370,7 +22370,8 @@
    if test -d /etc/pam.d -o -f /etc/pam.conf ; then
      warn  "Your system seems to have PAM, but PAM is not being used."
      warn2 "That is probably not going to work out well."