diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2006-02-11 12:38:41 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-02-11 12:38:41 +0000 |
| commit | 3eff45f37e4cd21649b831adecb3640986541780 (patch) | |
| tree | eaef82775d28e7203e0b839d08e0c6e93197c3ab /x11-misc/xscreensaver/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-3eff45f37e4cd21649b831adecb3640986541780.tar.gz gentoo-2-3eff45f37e4cd21649b831adecb3640986541780.tar.bz2 gentoo-2-3eff45f37e4cd21649b831adecb3640986541780.zip | |
Revision bump to test a patch for bug #113951.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'x11-misc/xscreensaver/files')
| -rw-r--r-- | x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r2 | 3 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-4.23-dpms.patch | 42 |
2 files changed, 45 insertions, 0 deletions
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r2 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r2 new file mode 100644 index 000000000000..53fe2665124c --- /dev/null +++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r2 @@ -0,0 +1,3 @@ +MD5 27491d117a8f7ae57d1fdf5f15d61ac6 xscreensaver-4.23.tar.gz 4939070 +RMD160 b18c2e45fca132e017bd24e6e8fca91154fa03db xscreensaver-4.23.tar.gz 4939070 +SHA256 9ac90aba624d2c39b62ac72815b16d404eec43d232feadea940c4c705ebb3dd7 xscreensaver-4.23.tar.gz 4939070 diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.23-dpms.patch b/x11-misc/xscreensaver/files/xscreensaver-4.23-dpms.patch new file mode 100644 index 000000000000..a01bb34f6f21 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-4.23-dpms.patch @@ -0,0 +1,42 @@ +diff -Nru xscreensaver-4.23.vanilla/driver/prefs.c xscreensaver-4.23/driver/prefs.c +--- xscreensaver-4.23.vanilla/driver/prefs.c 2006-02-11 13:29:49.000000000 +0100 ++++ xscreensaver-4.23/driver/prefs.c 2006-02-11 13:31:13.000000000 +0100 +@@ -1583,15 +1583,11 @@ + p->dpms_off < 10 * 1000) + p->dpms_off = 4 * 60 * 60 * 1000; /* 4 hours */ + +- /* suspend may not be greater than off, unless off is 0. +- standby may not be greater than suspend, unless suspend is 0. ++ /* standby may not be greater than suspend. ++ suspend may not be greater than off. + */ +- if (p->dpms_off != 0 && +- p->dpms_suspend > p->dpms_off) +- p->dpms_suspend = p->dpms_off; +- if (p->dpms_suspend != 0 && +- p->dpms_standby > p->dpms_suspend) +- p->dpms_standby = p->dpms_suspend; ++ if (p->dpms_standby > p->dpms_suspend) p->dpms_standby = p->dpms_suspend; ++ if (p->dpms_suspend > p->dpms_off) p->dpms_suspend = p->dpms_off; + + + if (p->dpms_standby == 0 && /* if *all* are 0, then DPMS is disabled */ +diff -Nru xscreensaver-4.23.vanilla/driver/timers.c xscreensaver-4.23/driver/timers.c +--- xscreensaver-4.23.vanilla/driver/timers.c 2006-02-11 13:29:49.000000000 +0100 ++++ xscreensaver-4.23/driver/timers.c 2006-02-11 13:31:56.000000000 +0100 +@@ -332,15 +332,6 @@ + + si->last_activity_time = time ((time_t *) 0); + +- /* This will (hopefully, supposedly) tell the server to re-set its +- DPMS timer. Without this, the -deactivate clientmessage would +- prevent xscreensaver from blanking, but would not prevent the +- monitor from powering down. */ +- XForceScreenSaver (si->dpy, ScreenSaverReset); +- +- /* And if the monitor is already powered off, turn it on. +- You'd think the above would do that, but apparently not? */ +- monitor_power_on (si); + } + + |