[thunderbird-lightning] - Update to 1.9.1 - Add patch to fix alarm handling after suspend (bug #910976)

[Orion Poplawski]

commit 020b52b76cc80beb022579a79d15612ae259122a
Author: Orion Poplawski <orion at nwra.com>
Date:   Tue Mar 19 21:24:43 2013 -0600

    - Update to 1.9.1
    - Add patch to fix alarm handling after suspend (bug #910976)

 .gitignore                        |    2 +
 sources                           |    4 +-
 thunderbird-lightning-alarm.patch |   59 +++++++++++++++++++++++++++++++++++++
 thunderbird-lightning.spec        |   15 +++++++--
 4 files changed, 75 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 385f48b..714331a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@
 /lightning-1.8.source.tar.bz2
 /lightning-1.9.source.tar.bz2
 /l10n-1.9.tar.xz
+/lightning-1.9.1.source.tar.bz2
+/l10n-1.9.1.tar.xz
diff --git a/sources b/sources
index 3eedec4..53dedfb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2341ba00977f1db9c2e422636a33d527  lightning-1.9.source.tar.bz2
-4d111e65f3285ea9238d9b3f75c4fe5b  l10n-1.9.tar.xz
+fa4e24bffcc10d7c11f75f717b505850  lightning-1.9.1.source.tar.bz2
+837cabfda70191a646cf8b5c7cbd8236  l10n-1.9.1.tar.xz
diff --git a/thunderbird-lightning-alarm.patch b/thunderbird-lightning-alarm.patch
new file mode 100644
index 0000000..ad8d749
--- /dev/null
+++ b/thunderbird-lightning-alarm.patch
@@ -0,0 +1,59 @@
+--- comm-beta/calendar/base/src/calAlarmService.js.orig	2012-11-14 00:14:09.000000000 -0800
++++ comm-beta/calendar/base/src/calAlarmService.js	2013-02-13 13:58:49.283303171 -0800
+@@ -29,6 +29,38 @@ 
+     this.mTimerMap = {};
+     this.mObservers = new calListenerBag(Components.interfaces.calIAlarmServiceObserver);
+ 
++    this.mSleepMonitor = {
++        service: this,
++        interval: 60000,
++        timer: null,
++        expected: null,
++
++        checkExpected: function sm_checkExpected() {
++            let now = Date.now();
++            if (now - this.expected > 1000) {
++                cal.LOG("[calAlarmService] Sleep cycle detected, reloading alarms");
++                this.service.shutdown();
++                this.service.startup();
++            } else {
++                this.expected = now + this.interval;
++            }
++        },
++
++        start: function sm_start() {
++            this.stop();
++            this.expected = Date.now() + this.interval;
++            this.timer = newTimerWithCallback(this.checkExpected.bind(this),
++                                              this.interval, true);
++        },
++
++        stop: function sm_stop() {
++            if (this.timer) {
++                this.timer.cancel();
++                this.timer = null;
++            }
++        }
++    };
++
+     this.calendarObserver = {
+         alarmService: this,
+ 
+@@ -274,6 +306,8 @@ 
+ 
+         this.mUpdateTimer = newTimerWithCallback(timerCallback, kHoursBetweenUpdates * 3600000, true);
+ 
++        this.mSleepMonitor.start();
++
+         this.mStarted = true;
+     },
+ 
+@@ -309,6 +343,8 @@ 
+         observerSvc.removeObserver(this, "xpcom-shutdown");
+         observerSvc.removeObserver(this, "wake_notification");
+ 
++        this.mSleepMonitor.stop();
++
+         this.mStarted = false;
+     },
+ 
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 9f75c7d..500541f 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -20,15 +20,15 @@
 # IMPORTANT: If there is no top level directory, this should be
 # set to the cwd, ie: '.'
 #global tarballdir .
-%global tarballdir comm-beta
+%global tarballdir comm-esr17
 
 %global version_internal  2
 %global mozappdir         %{_libdir}/%{name}-%{version_internal}
 
 Name:           thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
-Version:        1.9
-Release:        2%{?dist}
+Version:        1.9.1
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/calendar/lightning/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Productivity
@@ -47,6 +47,10 @@ Patch0:         thunderbird-version.patch
 # Fix build on secondary arches (patches copied from xulrunner)
 Patch2:         xulrunner-10.0-secondary-ipc.patch
 
+# Lightning
+# Fix alarm handling after suspend (bug #910976)
+Patch10:        thunderbird-lightning-alarm.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
@@ -106,6 +110,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
 cd mozilla
 %patch2 -p3 -b .secondary-ipc
 cd ..
+%patch10 -p1 -b .alarm
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -199,6 +204,10 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
 #===============================================================================
 
 %changelog
+* Tue Mar 19 2013 Orion Poplawski <orion at cora.nwra.com> - 1.9.1-1
+- Update to 1.9.1
+- Add patch to fix alarm handling after suspend (bug #910976)
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild