diff options
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 2 | ||||
-rw-r--r-- | disable_watchdog.patch | 98 |
3 files changed, 92 insertions, 10 deletions
@@ -35,7 +35,7 @@ pkgbase = gnome-screensaver-no-watchdog sha256sums = 7161ff962801d9e34ea564c372de4b5f93b30180b83c13aadbc9a8a1cd73ff65 sha256sums = 6c428b9296376e4b5e2aaf503a754a1ba58333aab50c82279b7c5615d8dd9e69 sha256sums = 412acd14cf665c43a6e2831ed9941fc034174b8beb454210bca8b6068e1239c3 - sha256sums = f849718a2927276840106a1d3d1bb3ffd713b7ddbe009311935d9ee8134da887 + sha256sums = 2c74942aca7e026053c822dbdc84b580e29dc9bb4e60d0b377813acff5c1f9a7 pkgname = gnome-screensaver-no-watchdog @@ -37,7 +37,7 @@ sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0' '7161ff962801d9e34ea564c372de4b5f93b30180b83c13aadbc9a8a1cd73ff65' '6c428b9296376e4b5e2aaf503a754a1ba58333aab50c82279b7c5615d8dd9e69' '412acd14cf665c43a6e2831ed9941fc034174b8beb454210bca8b6068e1239c3' - 'f849718a2927276840106a1d3d1bb3ffd713b7ddbe009311935d9ee8134da887') + '2c74942aca7e026053c822dbdc84b580e29dc9bb4e60d0b377813acff5c1f9a7') prepare() { cd gnome-screensaver-$pkgver diff --git a/disable_watchdog.patch b/disable_watchdog.patch index 407c96d8ca09..98f5e0fd9bfa 100644 --- a/disable_watchdog.patch +++ b/disable_watchdog.patch @@ -1,25 +1,107 @@ diff --git a/src/gs-watcher-x11.c b/src/gs-watcher-x11.c -index f0b0d83..89cfc66 100644 +index f0b0d83..407b4f6 100644 --- a/src/gs-watcher-x11.c +++ b/src/gs-watcher-x11.c -@@ -492,7 +492,7 @@ gs_watcher_init (GSWatcher *watcher) +@@ -491,8 +491,6 @@ gs_watcher_init (GSWatcher *watcher) + /* time before idle signal to send notice signal */ watcher->priv->delta_notice_timeout = 10000; - +- - add_watchdog_timer (watcher, 600000); -+ // add_watchdog_timer (watcher, 600000); } static void -@@ -606,7 +606,7 @@ static gboolean +@@ -524,90 +522,9 @@ gs_watcher_finalize (GObject *object) + G_OBJECT_CLASS (gs_watcher_parent_class)->finalize (object); + } + +-/* Figuring out what the appropriate XSetScreenSaver() parameters are +- (one wouldn't expect this to be rocket science.) +-*/ +-static void +-disable_builtin_screensaver (GSWatcher *watcher, +- gboolean unblank_screen) +-{ +- int current_server_timeout, current_server_interval; +- int current_prefer_blank, current_allow_exp; +- int desired_server_timeout, desired_server_interval; +- int desired_prefer_blank, desired_allow_exp; +- +- XGetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), +- ¤t_server_timeout, +- ¤t_server_interval, +- ¤t_prefer_blank, +- ¤t_allow_exp); +- +- desired_server_timeout = current_server_timeout; +- desired_server_interval = current_server_interval; +- desired_prefer_blank = current_prefer_blank; +- desired_allow_exp = current_allow_exp; +- +- desired_server_interval = 0; +- +- /* I suspect (but am not sure) that DontAllowExposures might have +- something to do with powering off the monitor as well, at least +- on some systems that don't support XDPMS? Who know... */ +- desired_allow_exp = AllowExposures; +- +- /* When we're not using an extension, set the server-side timeout to 0, +- so that the server never gets involved with screen blanking, and we +- do it all ourselves. (However, when we *are* using an extension, +- we tell the server when to notify us, and rather than blanking the +- screen, the server will send us an X event telling us to blank.) +- */ +- desired_server_timeout = 0; +- +- if (desired_server_timeout != current_server_timeout +- || desired_server_interval != current_server_interval +- || desired_prefer_blank != current_prefer_blank +- || desired_allow_exp != current_allow_exp) { +- +- gs_debug ("disabling server builtin screensaver:" +- " (xset s %d %d; xset s %s; xset s %s)", +- desired_server_timeout, +- desired_server_interval, +- (desired_prefer_blank ? "blank" : "noblank"), +- (desired_allow_exp ? "expose" : "noexpose")); +- +- XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), +- desired_server_timeout, +- desired_server_interval, +- desired_prefer_blank, +- desired_allow_exp); +- +- XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE); +- } +- +- if (unblank_screen) { +- /* Turn off the server builtin saver if it is now running. */ +- XForceScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), ScreenSaverReset); +- } +-} +- +- +-/* This timer goes off every few minutes, whether the user is idle or not, +- to try and clean up anything that has gone wrong. +- +- It calls disable_builtin_screensaver() so that if xset has been used, +- or some other program (like xlock) has messed with the XSetScreenSaver() +- settings, they will be set back to sensible values (if a server extension +- is in use, messing with xlock can cause the screensaver to never get a wakeup +- event, and could cause monitor power-saving to occur, and all manner of +- heinousness.) +- +- */ +- + static gboolean watchdog_timer (GSWatcher *watcher) { - +- - disable_builtin_screensaver (watcher, FALSE); -+ // disable_builtin_screensaver (watcher, FALSE); - +- return TRUE; } + -- 2.31.1 |