Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock the wl-beta package (priority: extra) to fix the important bug #768910. See also below changelog and debdiff. changelog: > wl-beta (2.15.9+0.20141019-4) unstable; urgency=medium > > * Update 40_idle-timer.patch from upstream to really fix wl-biff > > -- Tatsuya Kinoshita <tats@debian.org> Sat, 15 Nov 2014 06:48:02 +0900 > > wl-beta (2.15.9+0.20141019-3) unstable; urgency=medium > > * New patch 40_idle-timer.patch to fix timer arguments (closes: #768910) > > -- Tatsuya Kinoshita <tats@debian.org> Wed, 12 Nov 2014 07:54:35 +0900 unblock wl-beta/2.15.9+0.20141019-4 Thanks, -- Tatsuya Kinoshita
diffstat for wl-beta-2.15.9+0.20141019 wl-beta-2.15.9+0.20141019 changelog | 12 ++++++ patches/40_idle-timer.patch | 79 ++++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 3 files changed, 92 insertions(+) diff -Nru wl-beta-2.15.9+0.20141019/debian/changelog wl-beta-2.15.9+0.20141019/debian/changelog --- wl-beta-2.15.9+0.20141019/debian/changelog 2014-10-25 16:10:24.000000000 +0900 +++ wl-beta-2.15.9+0.20141019/debian/changelog 2014-11-15 06:48:05.000000000 +0900 @@ -1,3 +1,15 @@ +wl-beta (2.15.9+0.20141019-4) unstable; urgency=medium + + * Update 40_idle-timer.patch from upstream to really fix wl-biff + + -- Tatsuya Kinoshita <tats@debian.org> Sat, 15 Nov 2014 06:48:02 +0900 + +wl-beta (2.15.9+0.20141019-3) unstable; urgency=medium + + * New patch 40_idle-timer.patch to fix timer arguments (closes: #768910) + + -- Tatsuya Kinoshita <tats@debian.org> Wed, 12 Nov 2014 07:54:35 +0900 + wl-beta (2.15.9+0.20141019-2) unstable; urgency=medium * New patch 10_docfix.patch from upstream diff -Nru wl-beta-2.15.9+0.20141019/debian/patches/40_idle-timer.patch wl-beta-2.15.9+0.20141019/debian/patches/40_idle-timer.patch --- wl-beta-2.15.9+0.20141019/debian/patches/40_idle-timer.patch 1970-01-01 09:00:00.000000000 +0900 +++ wl-beta-2.15.9+0.20141019/debian/patches/40_idle-timer.patch 2014-11-15 03:12:32.000000000 +0900 @@ -0,0 +1,79 @@ +Subject: Do not fail when idle-timer for wl-biff +Origin: upstream, https://github.com/wanderlust/wanderlust/commit/f230993c50203fafc02b0b6200d514e85195570d +Bug: https://github.com/wanderlust/wanderlust/pull/52 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768910 + +diff --git a/wl/ChangeLog b/wl/ChangeLog +index 83d1b99..438a143 100644 +--- a/wl/ChangeLog ++++ b/wl/ChangeLog +@@ -0,0 +1,9 @@ ++2014-11-14 Kazuhiro Ito <kzhr@d1.dion.ne.jp> ++ ++ * wl-util.el (wl-biff-event-handler): Do not skip idle-timer. ++ Avoid direct access for timer's parameter if possible. ++ ++ Cf. https://github.com/wanderlust/wanderlust/pull/52 ++ https://github.com/wanderlust/wanderlust/pull/84 ++ https://github.com/wanderlust/wanderlust/pull/85 ++ +diff --git a/wl/wl-util.el b/wl/wl-util.el +index 1fcc31f..29d4b91 100644 +--- a/wl/wl-util.el ++++ b/wl/wl-util.el +@@ -830,26 +830,35 @@ This function is imported from Emacs 20.7." + (wl-biff-check-folders) + ;; Do redisplay right now, if no input pending. + (sit-for 0) +- (let* ((current (current-time)) +- (timer (get 'wl-biff 'timer)) +- ;; Compute the time when this timer will run again, next. +- (next-time (timer-relative-time +- (list (aref timer 1) (aref timer 2) (aref timer 3)) +- (* 5 (aref timer 4)) 0))) +- ;; If the activation time is far in the past, +- ;; skip executions until we reach a time in the future. +- ;; This avoids a long pause if Emacs has been suspended for hours. +- (or (> (nth 0 next-time) (nth 0 current)) +- (and (= (nth 0 next-time) (nth 0 current)) +- (> (nth 1 next-time) (nth 1 current))) +- (and (= (nth 0 next-time) (nth 0 current)) +- (= (nth 1 next-time) (nth 1 current)) +- (> (nth 2 next-time) (nth 2 current))) +- (progn +- (timer-set-time timer (timer-next-integral-multiple-of-time +- current wl-biff-check-interval) +- wl-biff-check-interval) +- (timer-activate timer))))))) ++ (let ((timer (get 'wl-biff 'timer)) ++ (access-functions (eval-when-compile (fboundp 'timer--time)))) ++ ;; Only normal timer should be checked for skipping. ++ (unless (if access-functions ++ (timer--idle-delay timer) ++ (aref timer 7)) ++ (let ((current (current-time)) ++ (next-time ++ ;; Compute the time when this timer will run again, next. ++ (if access-functions ++ (timer-relative-time ++ (timer--time timer) (* 5 (timer--repeat-delay timer))) ++ (timer-relative-time ++ (list (aref timer 1) (aref timer 2) (aref timer 3)) ++ (* 5 (aref timer 4)))))) ++ ;; If the activation time is far in the past, ++ ;; skip executions until we reach a time in the future. ++ ;; This avoids a long pause if Emacs has been suspended for hours. ++ (or (> (nth 0 next-time) (nth 0 current)) ++ (and (= (nth 0 next-time) (nth 0 current)) ++ (> (nth 1 next-time) (nth 1 current))) ++ (and (= (nth 0 next-time) (nth 0 current)) ++ (= (nth 1 next-time) (nth 1 current)) ++ (> (nth 2 next-time) (nth 2 current))) ++ (progn ++ (timer-set-time timer (timer-next-integral-multiple-of-time ++ current wl-biff-check-interval) ++ wl-biff-check-interval) ++ (timer-activate timer))))))))) + + (defsubst wl-biff-notify (new-mails notify-minibuf) + (when (and (not wl-modeline-biff-status) (> new-mails 0)) diff -Nru wl-beta-2.15.9+0.20141019/debian/patches/series wl-beta-2.15.9+0.20141019/debian/patches/series --- wl-beta-2.15.9+0.20141019/debian/patches/series 2014-10-25 16:00:24.000000000 +0900 +++ wl-beta-2.15.9+0.20141019/debian/patches/series 2014-11-10 22:14:43.000000000 +0900 @@ -1,3 +1,4 @@ 10_docfix.patch 20_ssl-cert-info.patch 30_epg-config.patch +40_idle-timer.patch
Attachment:
pgpZf0lKzsAIV.pgp
Description: PGP signature