# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1332423432 -3600
# Node ID 88a71e90303864a3c9c62078693a382e84fb8ae4
# Parent  974b8a3e2d55b3ce84c0d1e2f447e9ce601bbc10
update to 12.0b2
added mozilla-libnotify.patch to fix xul fallback for system-alert-service

diff -r 974b8a3e2d55 -r 88a71e903038 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Tue Mar 20 08:18:12 2012 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Thu Mar 22 14:37:12 2012 +0100
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Mar 22 09:27:26 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 12.0b2
+  * rebased patches
+- added mozilla-libnotify.patch to allow fallback from libnotify
+  to xul based events if no notification-daemon is running
+
 -------------------------------------------------------------------
 Fri Mar  9 21:47:07 UTC 2012 - wr@rosenauer.org
 
diff -r 974b8a3e2d55 -r 88a71e903038 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Mar 20 08:18:12 2012 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Mar 22 14:37:12 2012 +0100
@@ -49,7 +49,7 @@
 BuildRequires:  nss-shared-helper-devel
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012031400
+%define         releasedate 2012032100
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -92,6 +92,7 @@
 Patch14:        mozilla-disable-neon-option.patch
 Patch15:        mozilla-yarr-pcre.patch
 Patch16:        mozilla-revert_621446.patch
+Patch17:        mozilla-libnotify.patch
 # Firefox/browser
 Patch31:        firefox-browser-css.patch
 Patch32:        firefox-cross-desktop.patch
@@ -222,6 +223,7 @@
 %patch14 -p1
 #%patch15 -p1
 %patch16 -p1
+%patch17 -p1
 #
 %patch31 -p1
 %patch32 -p1
diff -r 974b8a3e2d55 -r 88a71e903038 MozillaFirefox/mozilla-libnotify.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-libnotify.patch	Thu Mar 22 14:37:12 2012 +0100
@@ -0,0 +1,1 @@
+../mozilla-libnotify.patch
\ No newline at end of file
diff -r 974b8a3e2d55 -r 88a71e903038 mozilla-libnotify.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-libnotify.patch	Thu Mar 22 14:37:12 2012 +0100
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+# Parent 629ea8797e7393eb6e9add489db2c5636516b305
+Bug 737646 - no biff notification if notification-daemon not running
+
+diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp
+--- a/toolkit/system/gnome/nsAlertsIconListener.cpp
++++ b/toolkit/system/gnome/nsAlertsIconListener.cpp
+@@ -346,16 +346,21 @@ nsAlertsIconListener::InitAlertAsync(con
+       for (GList* cap = server_caps; cap != NULL; cap = cap->next) {
+         if (!strcmp((char*) cap->data, "actions")) {
+           gHasActions = true;
+           break;
+         }
+       }
+       g_list_foreach(server_caps, (GFunc)g_free, NULL);
+       g_list_free(server_caps);
++    } else {
++      // notify_get_server_caps() is expected to return something
++      // otherwise we need to assume there is no notification-server
++      // to display anything
++      return NS_ERROR_FAILURE;
+     }
+   }
+ 
+   if (!gHasActions && aAlertTextClickable)
+     return NS_ERROR_FAILURE; // No good, fallback to XUL
+ 
+   nsCOMPtr<nsIObserverService> obsServ =
+       do_GetService("@mozilla.org/observer-service;1");
diff -r 974b8a3e2d55 -r 88a71e903038 series
--- a/series	Tue Mar 20 08:18:12 2012 +0100
+++ b/series	Thu Mar 22 14:37:12 2012 +0100
@@ -19,6 +19,7 @@
 mozilla-arm-cpu-detection.patch
 mozilla-disable-neon-option.patch
 mozilla-revert_621446.patch
+mozilla-libnotify.patch
 #mozilla-yarr-pcre.patch
 
 # Firefox patches
diff -r 974b8a3e2d55 -r 88a71e903038 xulrunner/mozilla-libnotify.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xulrunner/mozilla-libnotify.patch	Thu Mar 22 14:37:12 2012 +0100
@@ -0,0 +1,1 @@
+../mozilla-libnotify.patch
\ No newline at end of file
diff -r 974b8a3e2d55 -r 88a71e903038 xulrunner/xulrunner.spec
--- a/xulrunner/xulrunner.spec	Tue Mar 20 08:18:12 2012 +0100
+++ b/xulrunner/xulrunner.spec	Thu Mar 22 14:37:12 2012 +0100
@@ -46,7 +46,7 @@
 BuildRequires:  mozilla-nss-devel >= 3.13.3
 Version:        11.99
 Release:        0
-%define         releasedate 2012031400
+%define         releasedate 2012032100
 %define         version_internal 12.0
 %define         apiversion 12
 %define         uaweight 1200000
@@ -81,6 +81,7 @@
 Patch15:        mozilla-arm-cpu-detection.patch
 Patch16:        mozilla-revert_621446.patch
 Patch17:        mozilla-yarr-pcre.patch
+Patch18:        mozilla-libnotify.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       mozilla-js = %{version}
 Requires(post):  update-alternatives coreutils
@@ -201,6 +202,7 @@
 %patch15 -p1
 %patch16 -p1
 #%patch17 -p1
+%patch18 -p1
 
 %build
 # no need to add build time to binaries