summaryrefslogtreecommitdiffstats
path: root/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-09-01 20:16:14 +0000
committer Eric Hameleers <alien@slackware.com>2023-09-01 23:02:29 +0200
commitfc45e1f612005e305ecbbfd5b4cdd62c26619ebc (patch)
tree0864242b2d8bad00f9024117af69128a28edc4ec /source/xap/xscreensaver/xscreensaver.no.expiration.date.diff
parent75bbced9d4f24d3d6de07344bbe4b88cb393f809 (diff)
downloadcurrent-fc45e1f612005e305ecbbfd5b4cdd62c26619ebc.tar.gz
current-fc45e1f612005e305ecbbfd5b4cdd62c26619ebc.tar.xz
Fri Sep 1 20:16:14 UTC 202320230901201614
a/btrfs-progs-6.5-x86_64-1.txz: Upgraded. kde/kimageformats-5.109.0-x86_64-2.txz: Rebuilt. Recompiled against openexr-3.2.0. kde/kio-extras-23.08.0-x86_64-2.txz: Rebuilt. Recompiled against openexr-3.2.0. kde/krita-5.1.5-x86_64-13.txz: Rebuilt. Recompiled against openexr-3.2.0. l/brotli-1.1.0-x86_64-1.txz: Upgraded. l/gegl-0.4.46-x86_64-2.txz: Rebuilt. Recompiled against openexr-3.2.0. l/glib2-2.76.5-x86_64-1.txz: Upgraded. l/gst-plugins-bad-free-1.22.5-x86_64-2.txz: Rebuilt. Recompiled against openexr-3.2.0. l/imagemagick-7.1.1_15-x86_64-2.txz: Rebuilt. Recompiled against openexr-3.2.0. l/libdeflate-1.18-x86_64-1.txz: Added. This is needed for openexr-3.2.0. l/mozilla-nss-3.93-x86_64-1.txz: Upgraded. l/opencv-4.8.0-x86_64-2.txz: Rebuilt. Recompiled against openexr-3.2.0. l/openexr-3.2.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. n/php-8.2.10-x86_64-1.txz: Upgraded. n/wget2-2.1.0-x86_64-1.txz: Upgraded. x/libwacom-2.8.0-x86_64-1.txz: Upgraded. xap/gimp-2.10.34-x86_64-6.txz: Rebuilt. Recompiled against openexr-3.2.0. xap/xscreensaver-6.07-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xap/xscreensaver/xscreensaver.no.expiration.date.diff')
-rw-r--r--source/xap/xscreensaver/xscreensaver.no.expiration.date.diff47
1 files changed, 21 insertions, 26 deletions
diff --git a/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff b/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff
index 5929e91c0..fc4af25ac 100644
--- a/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff
+++ b/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff
@@ -1,30 +1,25 @@
---- ./driver/dialog.c.orig 2021-10-04 17:18:28.000000000 -0500
-+++ ./driver/dialog.c 2023-03-05 14:03:13.158084489 -0600
-@@ -1333,6 +1333,15 @@
- lines[i].align = CENTER;
- i++;
-
-+/*
-+ NOTE: This feature is disabled by Slackware... we do not ship multi-year
-+ old versions, nor do we think it is a good idea to include nag screens
-+ that activate when an expiration date is reached. In this case, the
-+ nag screen was activated after only one year, which practically insures
-+ that this will be seen before the next stable Slackware release.
-+ If there's a problem that needs fixing, we'll issue a fix.
-+ No nag screens please. Thanks for possibly reconsidering this!
+--- ./driver/dialog.c.orig 2023-05-05 20:19:20.000000000 -0500
++++ ./driver/dialog.c 2023-09-01 14:00:50.664648227 -0500
+@@ -1454,18 +1454,10 @@
+ disrespect the wishes of the person who wrote all of this software for
+ you -- you are a terrible person. Kindly go fuck yourself.
+ */
+- if (time ((time_t *) 0) - XSCREENSAVER_RELEASED > 60*60*24*30*17)
+- {
+- lines[i].text = _("Update available!\nThis version is very old.\n");
+- lines[i].font = ws->error_font;
+- lines[i].fg = ws->xft_error_foreground;
+- lines[i].fg2 = lines[i].fg;
+- lines[i].bg = ws->background;
+- lines[i].type = LABEL;
+- lines[i].align = CENTER;
+- i++;
+- }
+- else if (strstr (ws->version, "a") || strstr (ws->version, "b"))
+
- if (time ((time_t *) 0) - XSCREENSAVER_RELEASED > 60*60*24*30*17)
- {
- lines[i].text = _("Update available!\nThis version is very old.\n");
-@@ -1343,7 +1352,10 @@
- lines[i].align = CENTER;
- i++;
- }
-- else if (strstr (ws->version, "a") ||
-+ else
-+*/
++ /* Downstream note: tough shit, buddy. */
+
-+ if (strstr (ws->version, "a") ||
- strstr (ws->version, "b"))
++ if (strstr (ws->version, "a") || strstr (ws->version, "b"))
{
lines[i].text = _("PRE-RELEASE VERSION");
+ lines[i].font = ws->error_font;