# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1328686460 -3600
# Node ID 67f876aafae88ebcb2ff451144182e415e19796b
# Parent  0887a88b1e8536c19616537f72a484c72abb8cd5
lift up to Gecko 11beta

diff -r 0887a88b1e85 -r 67f876aafae8 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Feb 08 08:31:42 2012 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Feb 08 08:34:20 2012 +0100
@@ -18,7 +18,7 @@
 
 
 %define major 10
-%define mainver %major.0
+%define mainver %major.99
 
 Name:           MozillaFirefox
 BuildRequires:  Mesa-devel
@@ -42,12 +42,12 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.8.9
-BuildRequires:  mozilla-nss-devel >= 3.13.1
+BuildRequires:  mozilla-nspr-devel >= 4.9.0
+BuildRequires:  mozilla-nss-devel >= 3.13.2
 BuildRequires:  nss-shared-helper-devel
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012012900
+%define         releasedate 2012020300
 Provides:       web_browser
 Provides:       firefox = %{version}-%{release}
 Provides:       firefox = %{mainver}
@@ -86,10 +86,8 @@
 Patch10:        mozilla-dump_syms-static.patch
 Patch11:        mozilla-sle11.patch
 Patch12:        mozilla-linux3.patch
-Patch13:        mozilla-a11y.patch
 Patch14:        mozilla-disable-neon-option.patch
-Patch15:        mozilla-bmo703534.patch
-Patch16:        mozilla-yarr-pcre.patch
+Patch15:        mozilla-yarr-pcre.patch
 # Firefox/browser
 Patch31:        firefox-browser-css.patch
 Patch32:        firefox-cross-desktop.patch
@@ -216,10 +214,8 @@
 %patch11 -p1
 %endif
 %patch12 -p1
-%patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
 #
 %patch31 -p1
 %patch32 -p1
@@ -282,7 +278,7 @@
 ac_add_options --disable-debug
 ac_add_options --enable-startup-notification
 #ac_add_options --enable-chrome-format=jar
-ac_add_options --enable-update-channel=release
+ac_add_options --enable-update-channel=beta
 EOF
 %if %suse_version > 1130
 cat << EOF >> $MOZCONFIG
diff -r 0887a88b1e85 -r 67f876aafae8 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Wed Feb 08 08:31:42 2012 +0100
+++ b/MozillaFirefox/create-tar.sh	Wed Feb 08 08:34:20 2012 +0100
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="release"
+CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_10_0_RELEASE"
-VERSION="10.0"
+RELEASE_TAG="FIREFOX_11_0b1_RELEASE"
+VERSION="10.99"
 
 # mozilla
 hg clone http://hg.mozilla.org/$BRANCH mozilla
diff -r 0887a88b1e85 -r 67f876aafae8 MozillaFirefox/mozilla-a11y.patch
--- a/MozillaFirefox/mozilla-a11y.patch	Wed Feb 08 08:31:42 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-a11y.patch
\ No newline at end of file
diff -r 0887a88b1e85 -r 67f876aafae8 MozillaFirefox/mozilla-bmo703534.patch
--- a/MozillaFirefox/mozilla-bmo703534.patch	Wed Feb 08 08:31:42 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-bmo703534.patch
\ No newline at end of file
diff -r 0887a88b1e85 -r 67f876aafae8 firefox-branded-icons.patch
--- a/firefox-branded-icons.patch	Wed Feb 08 08:31:42 2012 +0100
+++ b/firefox-branded-icons.patch	Wed Feb 08 08:34:20 2012 +0100
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent 87462739809ad0f41fd335f9a68203fd70f9883c
+# Parent efffa19fa0b2530d2aca1ebd5b885a6fc68e51de
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -194,16 +194,21 @@ DEFINES += -DMOZILLA_OFFICIAL
- endif
+@@ -169,16 +169,21 @@ endif # LIBXUL_SDK
+ DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
  libs::
@@ -54,7 +54,7 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -415,18 +415,21 @@
+@@ -424,18 +424,21 @@
  #ifdef SHIP_FEEDBACK
  @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
  #endif
diff -r 0887a88b1e85 -r 67f876aafae8 firefox-browser-css.patch
--- a/firefox-browser-css.patch	Wed Feb 08 08:31:42 2012 +0100
+++ b/firefox-browser-css.patch	Wed Feb 08 08:34:20 2012 +0100
@@ -6,10 +6,10 @@
 wr: changed because of
 https://bugzilla.novell.com/show_bug.cgi?id=561027
 
-diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
---- a/browser/themes/gnomestripe/browser/browser.css
-+++ b/browser/themes/gnomestripe/browser/browser.css
-@@ -954,16 +954,30 @@ toolbar[iconsize="small"] #feed-button {
+diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css
+--- a/browser/themes/gnomestripe/browser.css
++++ b/browser/themes/gnomestripe/browser.css
+@@ -1018,16 +1018,30 @@ toolbar[iconsize="small"] #feed-button {
  }
  
  #urlbar-display {
@@ -33,10 +33,10 @@
 +}
 +
  /* Favicon */
- #page-proxy-favicon,
- #urlbar-throbber {
+ #page-proxy-favicon {
    width: 16px;
    height: 16px;
  }
  
  #page-proxy-stack {
+   width: 24px;
diff -r 0887a88b1e85 -r 67f876aafae8 firefox-libxulsdk-locales.patch
--- a/firefox-libxulsdk-locales.patch	Wed Feb 08 08:31:42 2012 +0100
+++ b/firefox-libxulsdk-locales.patch	Wed Feb 08 08:34:20 2012 +0100
@@ -1,19 +1,19 @@
 # HG changeset patch
-# Parent 2f2f266d47e42bf9ff421deeeeea2dd1985b19b0
+# Parent f63659c5a2c060ac43bf681191d1432cbb7c3e54
 We need to package toolkit locales explicitely into firefox langpacks even in xulrunner based builds
 
 diff --git a/browser/makefiles.sh b/browser/makefiles.sh
 --- a/browser/makefiles.sh
 +++ b/browser/makefiles.sh
-@@ -74,16 +74,21 @@ browser/installer/windows/Makefile
+@@ -77,16 +77,21 @@ browser/devtools/styleinspector/Makefile
+ browser/devtools/webconsole/Makefile
+ browser/fuel/Makefile
+ browser/fuel/public/Makefile
+ browser/fuel/src/Makefile
+ browser/installer/Makefile
  browser/locales/Makefile
+ browser/modules/Makefile
  browser/themes/Makefile
- browser/themes/pinstripe/browser/Makefile
- browser/themes/pinstripe/communicator/Makefile
- browser/themes/pinstripe/Makefile
- browser/themes/winstripe/browser/Makefile
- browser/themes/winstripe/communicator/Makefile
- browser/themes/winstripe/Makefile
 +netwerk/locales/Makefile
 +dom/locales/Makefile
 +security/manager/locales/Makefile
@@ -24,6 +24,6 @@
  $MOZ_BRANDING_DIRECTORY/locales/Makefile
  "
  
- if [ "$ENABLE_TESTS" ]; then
+ if [ "$MOZ_SAFE_BROWSING" ]; then
    add_makefiles "
-     browser/base/content/test/Makefile
+     browser/components/safebrowsing/Makefile
diff -r 0887a88b1e85 -r 67f876aafae8 mozilla-a11y.patch
--- a/mozilla-a11y.patch	Wed Feb 08 08:31:42 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,415 +0,0 @@
-# HG changeset patch
-# User Michael Gorse <mgorse@suse.com>
-# Parent 2c115988d04c0a0a8cb75b3a597ecdb2c4c001c9
-a11y only enabled from Gnome 2's GConf setting
-https://bugzilla.novell.com/show_bug.cgi?id=732898
-https://bugzilla.mozilla.org/show_bug.cgi?id=693343
-
-diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in
---- a/accessible/src/atk/Makefile.in
-+++ b/accessible/src/atk/Makefile.in
-@@ -87,15 +87,19 @@ EXPORTS = \
- # we want to force the creation of a static lib.
- FORCE_STATIC_LIB = 1
- 
- include $(topsrcdir)/config/rules.mk
- 
- CFLAGS		+= $(MOZ_GTK2_CFLAGS)
- CXXFLAGS	+= $(MOZ_GTK2_CFLAGS)
- 
-+ifdef MOZ_ENABLE_DBUS
-+CXXFLAGS += $(MOZ_DBUS_CFLAGS)
-+endif
-+
- LOCAL_INCLUDES += \
-   -I$(srcdir) \
-   -I$(srcdir)/../base \
-   -I$(srcdir)/../html \
-   -I$(srcdir)/../xul \
-   -I$(topsrcdir)/other-licenses/atk-1.0 \
-   $(NULL)
-diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src/atk/nsApplicationAccessibleWrap.cpp
---- a/accessible/src/atk/nsApplicationAccessibleWrap.cpp
-+++ b/accessible/src/atk/nsApplicationAccessibleWrap.cpp
-@@ -47,29 +47,29 @@
- #include "nsIPrefBranch.h"
- #include "nsIServiceManager.h"
- #include "nsAutoPtr.h"
- #include "nsAccessibilityService.h"
- #include "AtkSocketAccessible.h"
- 
- #include <gtk/gtk.h>
- #include <atk/atk.h>
-+#ifdef MOZ_ENABLE_DBUS
-+#include <dbus/dbus.h>
-+#endif
-+
-+using namespace mozilla::a11y;
- 
- typedef GType (* AtkGetTypeType) (void);
- GType g_atk_hyperlink_impl_type = G_TYPE_INVALID;
- static bool sATKChecked = false;
- static PRLibrary *sATKLib = nsnull;
- static const char sATKLibName[] = "libatk-1.0.so.0";
- static const char sATKHyperlinkImplGetTypeSymbol[] =
-     "atk_hyperlink_impl_get_type";
--static const char sAccEnv [] = "GNOME_ACCESSIBILITY";
--static const char sSysPrefService [] =
--    "@mozilla.org/system-preference-service;1";
--static const char sAccessibilityKey [] =
--    "config.use_system_prefs.accessibility";
- 
- /* gail function pointer */
- static guint (* gail_add_global_event_listener) (GSignalEmissionHook listener,
-                                                  const gchar *event_type);
- static void (* gail_remove_global_event_listener) (guint remove_listener);
- static void (* gail_remove_key_event_listener) (guint remove_listener);
- static AtkObject * (*gail_get_root) (void);
- 
-@@ -609,36 +609,17 @@ toplevel_event_watcher(GSignalInvocation
-   }
- 
-   return TRUE;
- }
- 
- bool
- nsApplicationAccessibleWrap::Init()
- {
--    // XXX following code is copied from widget/src/gtk2/nsWindow.cpp
--    // we should put it to somewhere that can be used from both modules
--    // see bug 390761
--
--    // check if accessibility enabled/disabled by environment variable
--    bool isGnomeATEnabled = false;
--    const char *envValue = PR_GetEnv(sAccEnv);
--    if (envValue) {
--        isGnomeATEnabled = !!atoi(envValue);
--    } else {
--        //check gconf-2 setting
--        nsresult rv;
--        nsCOMPtr<nsIPrefBranch> sysPrefService =
--            do_GetService(sSysPrefService, &rv);
--        if (NS_SUCCEEDED(rv) && sysPrefService) {
--            sysPrefService->GetBoolPref(sAccessibilityKey, &isGnomeATEnabled);
--        }
--    }
--
--    if (isGnomeATEnabled) {
-+    if (ShouldA11yBeEnabled()) {
-         // load and initialize gail library
-         nsresult rv = LoadGtkModule(sGail);
-         if (NS_SUCCEEDED(rv)) {
-             (*sGail.init)();
-         }
-         else {
-             MAI_LOG_DEBUG(("Fail to load lib: %s\n", sGail.libName));
-         }
-@@ -877,8 +858,129 @@ LoadGtkModule(GnomeAccessibilityModule& 
-                        aModule.init ? aModule.shutdownName : aModule.initName,
-                        aModule.libName));
-         PR_UnloadLibrary(aModule.lib);
-         aModule.lib = NULL;
-         return NS_ERROR_FAILURE;
-     }
-     return NS_OK;
- }
-+
-+namespace mozilla {
-+namespace a11y {
-+
-+#ifdef MOZ_ENABLE_DBUS
-+  static DBusPendingCall *a11yPendingCall = NULL;
-+#endif
-+
-+void
-+PreInit()
-+{
-+  static bool sChecked = false;
-+  if (sChecked)
-+    return;
-+  sChecked = true;
-+  DBusError error;
-+  dbus_error_init(&error);
-+  DBusConnection* bus = dbus_bus_get(DBUS_BUS_SESSION, &error);
-+  if (!bus)
-+    return;
-+  dbus_connection_set_exit_on_disconnect(bus, false);
-+
-+  DBusMessage *message;
-+  message = dbus_message_new_method_call("org.a11y.Bus", "/org/a11y/bus",
-+                                         "org.freedesktop.DBus.Properties",
-+                                         "Get");
-+  if (!message)
-+    goto dbus_done;
-+
-+  static const char* iface = "org.a11y.Status";
-+  static const char* member = "IsEnabled";
-+  dbus_message_append_args(message, DBUS_TYPE_STRING, &iface,
-+                           DBUS_TYPE_STRING, &member, DBUS_TYPE_INVALID);
-+  dbus_connection_send_with_reply(bus, message, &a11yPendingCall, 1000);
-+
-+dbus_done:
-+  if (message)
-+    dbus_message_unref(message);
-+  if (bus)
-+    dbus_connection_unref(bus);
-+  dbus_error_free(&error);
-+}
-+
-+bool
-+ShouldA11yBeEnabled()
-+{
-+  static bool sChecked = false, sShouldEnable = false;
-+  if (sChecked)
-+    return sShouldEnable;
-+
-+  sChecked = true;
-+
-+  // check if accessibility enabled/disabled by environment variable
-+  static const char sAccEnv [] = "GNOME_ACCESSIBILITY";
-+  const char* envValue = PR_GetEnv(sAccEnv);
-+  if (envValue)
-+    return sShouldEnable = !!atoi(envValue);
-+
-+#ifdef MOZ_ENABLE_DBUS
-+  PreInit();
-+  bool dbusSuccess = false;
-+  DBusMessage *reply = nsnull;
-+  if (a11yPendingCall) {
-+    dbus_pending_call_block(a11yPendingCall);
-+    reply = dbus_pending_call_steal_reply(a11yPendingCall);
-+    dbus_pending_call_unref(a11yPendingCall);
-+    a11yPendingCall = nsnull;
-+  }
-+  if (!reply ||
-+      dbus_message_get_type(reply) != DBUS_MESSAGE_TYPE_METHOD_RETURN ||
-+      strcmp(dbus_message_get_signature (reply), "v"))
-+    goto dbus_done;
-+
-+  DBusMessageIter iter, iter_variant, iter_struct;
-+  dbus_bool_t dResult;
-+  dbus_message_iter_init(reply, &iter);
-+  dbus_message_iter_recurse (&iter, &iter_variant);
-+  switch (dbus_message_iter_get_arg_type(&iter_variant)) {
-+    case DBUS_TYPE_STRUCT:
-+      // at-spi2-core 2.2.0-2.2.1 had a bug where it returned a struct
-+      dbus_message_iter_recurse(&iter_variant, &iter_struct);
-+      if (dbus_message_iter_get_arg_type(&iter_struct) == DBUS_TYPE_BOOLEAN) {
-+        dbus_message_iter_get_basic(&iter_struct, &dResult);
-+        sShouldEnable = dResult;
-+        dbusSuccess = true;
-+      }
-+
-+      break;
-+    case DBUS_TYPE_BOOLEAN:
-+      dbus_message_iter_get_basic(&iter_variant, &dResult);
-+      sShouldEnable = dResult;
-+      dbusSuccess = true;
-+      break;
-+    default:
-+      break;
-+  }
-+
-+  dbus_done:
-+  if (reply)
-+    dbus_message_unref(reply);
-+
-+  if (dbusSuccess)
-+    return sShouldEnable;
-+#endif
-+
-+  //check gconf-2 setting
-+  nsresult rv = NS_OK;
-+  static const char sSysPrefService [] =
-+    "@mozilla.org/system-preference-service;1";
-+  static const char sAccessibilityKey [] =
-+    "config.use_system_prefs.accessibility";
-+  nsCOMPtr<nsIPrefBranch> sysPrefService =
-+    do_GetService(sSysPrefService, &rv);
-+  if (NS_SUCCEEDED(rv) && sysPrefService)
-+    sysPrefService->GetBoolPref(sAccessibilityKey, &sShouldEnable);
-+
-+  return sShouldEnable;
-+}
-+} // namespace a11y
-+} // namespace mozilla
-+
-diff --git a/accessible/src/base/nsAccessibilityService.h b/accessible/src/base/nsAccessibilityService.h
---- a/accessible/src/base/nsAccessibilityService.h
-+++ b/accessible/src/base/nsAccessibilityService.h
-@@ -46,16 +46,33 @@
- 
- #include "mozilla/a11y/FocusManager.h"
- 
- #include "nsIObserver.h"
- 
- namespace mozilla {
- namespace a11y {
- 
-+#ifdef MOZ_ACCESSIBILITY_ATK
-+/**
-+ * + * Perform initialization that should be done as soon as possible, in
-+ * order
-+ * + * to minimize startup time.
-+ * + * XXX: this function and the next defined in
-+ * nsApplicationAccessibleWrap.cpp
-+ * + */
-+void PreInit();
-+
-+/**
-+ * + * Is platform accessibility enabled.
-+ * + * Only used on linux with atk for now.
-+ * + */
-+bool ShouldA11yBeEnabled();
-+#endif
-+
- /**
-  * Return focus manager.
-  */
- FocusManager* FocusMgr();
- 
- } // namespace a11y
- } // namespace mozilla
- 
-diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
---- a/widget/src/gtk2/nsWindow.cpp
-+++ b/widget/src/gtk2/nsWindow.cpp
-@@ -105,29 +105,21 @@
- #include "nsIStringBundle.h"
- #include "nsGfxCIID.h"
- #include "nsIObserverService.h"
- 
- #include "nsIdleService.h"
- #include "nsIPropertyBag2.h"
- 
- #ifdef ACCESSIBILITY
--#include "nsIAccessibilityService.h"
-+#include "nsAccessibilityService.h"
- #include "nsIAccessibleDocument.h"
--#include "prenv.h"
--#include "stdlib.h"
- 
- using namespace mozilla;
- 
--static bool sAccessibilityChecked = false;
--/* static */
--bool nsWindow::sAccessibilityEnabled = false;
--static const char sSysPrefService [] = "@mozilla.org/system-preference-service;1";
--static const char sAccEnv [] = "GNOME_ACCESSIBILITY";
--static const char sAccessibilityKey [] = "config.use_system_prefs.accessibility";
- #endif
- 
- /* For SetIcon */
- #include "nsAppDirectoryServiceDefs.h"
- #include "nsXPIDLString.h"
- #include "nsIFile.h"
- #include "nsILocalFile.h"
- 
-@@ -1111,19 +1103,18 @@ nsWindow::Show(bool aState)
-             NativeResize(mBounds.x, mBounds.y, mBounds.width, mBounds.height,
-                          false);
-         } else if (mNeedsResize) {
-             NativeResize(mBounds.width, mBounds.height, false);
-         }
-     }
- 
- #ifdef ACCESSIBILITY
--    if (aState && sAccessibilityEnabled) {
-+    if (aState && a11y::ShouldA11yBeEnabled())
-         CreateRootAccessible();
--    }
- #endif
- 
-     NativeShow(aState);
- 
-     return NS_OK;
- }
- 
- NS_IMETHODIMP
-@@ -3885,16 +3876,21 @@ nsWindow::Create(nsIWidget        *aPare
-     nsIWidget *baseParent = aInitData &&
-         (aInitData->mWindowType == eWindowType_dialog ||
-          aInitData->mWindowType == eWindowType_toplevel ||
-          aInitData->mWindowType == eWindowType_invisible) ?
-         nsnull : aParent;
- 
-     NS_ASSERTION(!mWindowGroup, "already have window group (leaking it)");
- 
-+#ifdef ACCESSIBILITY
-+    // Send a DBus message to check whether a11y is enabled
-+    a11y::PreInit();
-+#endif
-+
-     // Ensure that the toolkit is created.
-     nsGTKToolkit::GetToolkit();
- 
-     // initialize all the common bits of this class
-     BaseCreate(baseParent, aRect, aHandleEventFunction, aContext, aInitData);
- 
-     // Do we need to listen for resizes?
-     bool listenForResizes = false;;
-@@ -4278,43 +4274,16 @@ nsWindow::Create(nsIWidget        *aPare
-         LOG(("\tmGdkWindow %p %lx\n", (void *)mGdkWindow,
-              gdk_x11_window_get_xid(mGdkWindow)));
-     }
- 
-     // resize so that everything is set to the right dimensions
-     if (!mIsTopLevel)
-         Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, false);
- 
--#ifdef ACCESSIBILITY
--    nsresult rv;
--    if (!sAccessibilityChecked) {
--        sAccessibilityChecked = true;
--
--        //check if accessibility enabled/disabled by environment variable
--        const char *envValue = PR_GetEnv(sAccEnv);
--        if (envValue) {
--            sAccessibilityEnabled = atoi(envValue) != 0;
--            LOG(("Accessibility Env %s=%s\n", sAccEnv, envValue));
--        }
--        //check gconf-2 setting
--        else {
--            nsCOMPtr<nsIPrefBranch> sysPrefService =
--                do_GetService(sSysPrefService, &rv);
--            if (NS_SUCCEEDED(rv) && sysPrefService) {
--
--                // do the work to get gconf setting.
--                // will be done soon later.
--                sysPrefService->GetBoolPref(sAccessibilityKey,
--                                            &sAccessibilityEnabled);
--            }
--
--        }
--    }
--#endif
--
- #ifdef MOZ_DFB
-     if (!mDFB) {
-          DirectFBCreate( &mDFB );
- 
-          D_ASSUME( mDFB != NULL );
- 
-          if (mDFB)
-               mDFB->GetDisplayLayer( mDFB, DLID_PRIMARY, &mDFBLayer );
-@@ -6504,19 +6473,18 @@ nsWindow::DispatchAccessibleEvent()
-     DispatchEvent(&event, status);
- 
-     return event.mAccessible;
- }
- 
- void
- nsWindow::DispatchEventToRootAccessible(PRUint32 aEventType)
- {
--    if (!sAccessibilityEnabled) {
-+    if (!a11y::ShouldA11yBeEnabled())
-         return;
--    }
- 
-     nsCOMPtr<nsIAccessibilityService> accService =
-         do_GetService("@mozilla.org/accessibilityService;1");
-     if (!accService) {
-         return;
-     }
- 
-     // Get the root document accessible and fire event to it.
diff -r 0887a88b1e85 -r 67f876aafae8 mozilla-bmo703534.patch
--- a/mozilla-bmo703534.patch	Wed Feb 08 08:31:42 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1321613368 -3600
-# Node ID 15cf58eb7923d34de7e61df80fa5f8a18a995abf
-# Parent  aeb035da53283c56370992f254e4f79d7dd180f8
-Bug 703534 - Fix build failure on platforms without YARR JIT. r=luke
-target: M11
-
-diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
---- a/js/src/jscompartment.cpp
-+++ b/js/src/jscompartment.cpp
-@@ -45,17 +45,16 @@
- #include "jsiter.h"
- #include "jsmath.h"
- #include "jsproxy.h"
- #include "jsscope.h"
- #include "jstracer.h"
- #include "jswatchpoint.h"
- #include "jswrapper.h"
- #include "assembler/wtf/Platform.h"
--#include "assembler/jit/ExecutableAllocator.h"
- #include "yarr/BumpPointerAllocator.h"
- #include "methodjit/MethodJIT.h"
- #include "methodjit/PolyIC.h"
- #include "methodjit/MonoIC.h"
- #include "vm/Debugger.h"
- 
- #include "jsgcinlines.h"
- #include "jsscopeinlines.h"
diff -r 0887a88b1e85 -r 67f876aafae8 mozilla-disable-neon-option.patch
--- a/mozilla-disable-neon-option.patch	Wed Feb 08 08:31:42 2012 +0100
+++ b/mozilla-disable-neon-option.patch	Wed Feb 08 08:34:20 2012 +0100
@@ -1,12 +1,12 @@
 # HG changeset patch
 # User Joop Boonen <joop.boonen@opensuse.org>
-# Parent be20a0ae420eb2b3584ce2c5d241e2817bac8593
+# Parent 5f38d3aa0414fe0ac7ff1f0b47da44069e7ccdda
 Add configure option to allow disabling of neon.
 
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -1674,41 +1674,47 @@ if test -n "$all_flags"; then
+@@ -1726,41 +1726,47 @@ if test -n "$all_flags"; then
      ASFLAGS="$ASFLAGS $all_flags"
      if test -n "$thumb_flag"; then
          LDFLAGS="$LDFLAGS $thumb_flag"
@@ -20,26 +20,6 @@
 -  # We try to link so that this also fails when
 -  # building with LTO.
 -  AC_TRY_LINK([],
--                 [asm("uqadd8 r1, r1, r2");],
--                 result="yes", result="no")
--  AC_MSG_RESULT("$result")
--  if test "$result" = "yes"; then
--      AC_DEFINE(HAVE_ARM_SIMD)
--      HAVE_ARM_SIMD=1
--  fi
--
--  AC_MSG_CHECKING(for ARM NEON support in compiler)
--  # We try to link so that this also fails when
--  # building with LTO.
--  AC_TRY_LINK([],
--                 [asm(".fpu neon\n vadd.i8 d0, d0, d0");],
--                 result="yes", result="no")
--  AC_MSG_RESULT("$result")
--  if test "$result" = "yes"; then
--      AC_DEFINE(HAVE_ARM_NEON)
--      HAVE_ARM_NEON=1
--  fi
--fi # CPU_ARCH = arm
 +MOZ_ARG_DISABLE_BOOL(neon,
 +[  --disable-neon       Disable neon extensions],
 +    NS_DISABLE_NEON=1,
@@ -50,24 +30,36 @@
 +    # We try to link so that this also fails when
 +    # building with LTO.
 +    AC_TRY_LINK([],
-+                   [asm("uqadd8 r1, r1, r2");],
-+                   result="yes", result="no")
+                  [asm("uqadd8 r1, r1, r2");],
+                  result="yes", result="no")
+-  AC_MSG_RESULT("$result")
+-  if test "$result" = "yes"; then
 +    AC_MSG_RESULT("$result")
 +    if test "$result" = "yes"; then
-+        AC_DEFINE(HAVE_ARM_SIMD)
-+        HAVE_ARM_SIMD=1
+       AC_DEFINE(HAVE_ARM_SIMD)
+       HAVE_ARM_SIMD=1
+-  fi
+-
+-  AC_MSG_CHECKING(for ARM NEON support in compiler)
+-  # We try to link so that this also fails when
+-  # building with LTO.
+-  AC_TRY_LINK([],
 +    fi
 +
 +    AC_MSG_CHECKING(for ARM NEON support in compiler)
 +    # We try to link so that this also fails when
 +    # building with LTO.
 +    AC_TRY_LINK([],
-+                   [asm(".fpu neon\n vadd.i8 d0, d0, d0");],
-+                   result="yes", result="no")
+                  [asm(".fpu neon\n vadd.i8 d0, d0, d0");],
+                  result="yes", result="no")
+-  AC_MSG_RESULT("$result")
+-  if test "$result" = "yes"; then
 +    AC_MSG_RESULT("$result")
 +    if test "$result" = "yes"; then
-+        AC_DEFINE(HAVE_ARM_NEON)
-+        HAVE_ARM_NEON=1
+       AC_DEFINE(HAVE_ARM_NEON)
+       HAVE_ARM_NEON=1
+-  fi
+-fi # CPU_ARCH = arm
 +    fi
 +  fi # CPU_ARCH = arm
 +fi
@@ -75,14 +67,14 @@
  AC_SUBST(HAVE_ARM_SIMD)
  AC_SUBST(HAVE_ARM_NEON)
  
- dnl ========================================================
- dnl Android libstdc++, placed here so it can use MOZ_ARCH
- dnl computed above.
- dnl ========================================================
+ dnl =================================================================
+ dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
+ dnl which is bad when cross compiling.
+ dnl =================================================================
 diff --git a/js/src/configure.in b/js/src/configure.in
 --- a/js/src/configure.in
 +++ b/js/src/configure.in
-@@ -1604,41 +1604,47 @@ if test -n "$all_flags"; then
+@@ -1664,41 +1664,47 @@ if test -n "$all_flags"; then
      ASFLAGS="$ASFLAGS $all_flags"
      if test -n "$thumb_flag"; then
          LDFLAGS="$LDFLAGS $thumb_flag"
@@ -96,26 +88,6 @@
 -  # We try to link so that this also fails when
 -  # building with LTO.
 -  AC_TRY_LINK([],
--                 [asm("uqadd8 r1, r1, r2");],
--                 result="yes", result="no")
--  AC_MSG_RESULT("$result")
--  if test "$result" = "yes"; then
--      AC_DEFINE(HAVE_ARM_SIMD)
--      HAVE_ARM_SIMD=1
--  fi
--
--  AC_MSG_CHECKING(for ARM NEON support in compiler)
--  # We try to link so that this also fails when
--  # building with LTO.
--  AC_TRY_LINK([],
--                 [asm(".fpu neon\n vadd.i8 d0, d0, d0");],
--                 result="yes", result="no")
--  AC_MSG_RESULT("$result")
--  if test "$result" = "yes"; then
--      AC_DEFINE(HAVE_ARM_NEON)
--      HAVE_ARM_NEON=1
--  fi
--fi # CPU_ARCH = arm
 +MOZ_ARG_DISABLE_BOOL(neon,
 +[  --disable-neon       Disable neon extensions],
 +    NS_DISABLE_NEON=1,
@@ -126,24 +98,36 @@
 +    # We try to link so that this also fails when
 +    # building with LTO.
 +    AC_TRY_LINK([],
-+                   [asm("uqadd8 r1, r1, r2");],
-+                   result="yes", result="no")
+                  [asm("uqadd8 r1, r1, r2");],
+                  result="yes", result="no")
+-  AC_MSG_RESULT("$result")
+-  if test "$result" = "yes"; then
 +    AC_MSG_RESULT("$result")
 +    if test "$result" = "yes"; then
-+        AC_DEFINE(HAVE_ARM_SIMD)
-+        HAVE_ARM_SIMD=1
+       AC_DEFINE(HAVE_ARM_SIMD)
+       HAVE_ARM_SIMD=1
+-  fi
+-
+-  AC_MSG_CHECKING(for ARM NEON support in compiler)
+-  # We try to link so that this also fails when
+-  # building with LTO.
+-  AC_TRY_LINK([],
 +    fi
 +
 +    AC_MSG_CHECKING(for ARM NEON support in compiler)
 +    # We try to link so that this also fails when
 +    # building with LTO.
 +    AC_TRY_LINK([],
-+                   [asm(".fpu neon\n vadd.i8 d0, d0, d0");],
-+                   result="yes", result="no")
+                  [asm(".fpu neon\n vadd.i8 d0, d0, d0");],
+                  result="yes", result="no")
+-  AC_MSG_RESULT("$result")
+-  if test "$result" = "yes"; then
 +    AC_MSG_RESULT("$result")
 +    if test "$result" = "yes"; then
-+        AC_DEFINE(HAVE_ARM_NEON)
-+        HAVE_ARM_NEON=1
+       AC_DEFINE(HAVE_ARM_NEON)
+       HAVE_ARM_NEON=1
+-  fi
+-fi # CPU_ARCH = arm
 +    fi
 +  fi # CPU_ARCH = arm
 +fi
@@ -151,7 +135,7 @@
  AC_SUBST(HAVE_ARM_SIMD)
  AC_SUBST(HAVE_ARM_NEON)
  
- dnl ========================================================
- dnl Android libstdc++, placed here so it can use MOZ_ARCH
- dnl computed above.
- dnl ========================================================
+ dnl =================================================================
+ dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
+ dnl which is bad when cross compiling.
+ dnl =================================================================
diff -r 0887a88b1e85 -r 67f876aafae8 mozilla-dump_syms-static.patch
--- a/mozilla-dump_syms-static.patch	Wed Feb 08 08:31:42 2012 +0100
+++ b/mozilla-dump_syms-static.patch	Wed Feb 08 08:34:20 2012 +0100
@@ -1,16 +1,16 @@
 # HG changeset patch
-# Parent e589abb2c4d6aaa6083d254416211ac90360dbdd
+# Parent 364802dc5df3b480143a54d318ceef74f32453fb
 NO-BUG: Ignore a hack which is not needed in distribution build environments.
 
 diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
 --- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
 +++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
-@@ -59,11 +59,11 @@ HOST_LIBS += \
+@@ -58,11 +58,11 @@ HOST_LIBS += \
+   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/dwarf/$(LIB_PREFIX)host_breakpad_dwarf_s.$(LIB_SUFFIX) \
    $(NULL)
  
  # force C++ linking
  CPP_PROG_LINK = 1
- FORCE_USE_PIC = 1
  
  #XXX: bug 554854 causes us to be unable to run binaries on the build slaves
  # due to them having an older libstdc++
diff -r 0887a88b1e85 -r 67f876aafae8 mozilla-nongnome-proxies.patch
--- a/mozilla-nongnome-proxies.patch	Wed Feb 08 08:31:42 2012 +0100
+++ b/mozilla-nongnome-proxies.patch	Wed Feb 08 08:34:20 2012 +0100
@@ -9,7 +9,8 @@
 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -68,16 +68,23 @@ private:
+@@ -71,18 +71,24 @@ private:
+   nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult);
  };
  
  NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
@@ -17,13 +18,15 @@
  nsresult
  nsUnixSystemProxySettings::Init()
  {
-   mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+-  mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+-  mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
 +  // If this is a GNOME session, load gconf and try to use its preferences.
 +  // If gconf is not available (which would be stupid) we'll proceed as if
 +  // this was not a GNOME session, using *_PROXY environment variables.
 +  const char* sessionType = PR_GetEnv("DESKTOP_SESSION");
 +  if (sessionType && !strcmp(sessionType, "gnome")) {
 +    mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
++    mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
 +  }
    return NS_OK;
  }
diff -r 0887a88b1e85 -r 67f876aafae8 mozilla-pkgconfig.patch
--- a/mozilla-pkgconfig.patch	Wed Feb 08 08:31:42 2012 +0100
+++ b/mozilla-pkgconfig.patch	Wed Feb 08 08:34:20 2012 +0100
@@ -4,17 +4,17 @@
 diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in
 --- a/xulrunner/installer/Makefile.in
 +++ b/xulrunner/installer/Makefile.in
-@@ -66,16 +66,19 @@ include $(topsrcdir)/config/rules.mk
- 
- INSTALL_SDK = 1
+@@ -68,16 +68,19 @@ INSTALL_SDK = 1
+ ifndef MOZ_PLATFORM_MAEMO
  GENERATE_CACHE = 1
+ endif
  
  include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
  
  # Add pkg-config files to the install:: target
  
 +# the apilibdir always ends with 1.9 as every patch update will provide a link
-+apilibdir = $(dir $(installdir))xulrunner-10
++apilibdir = $(dir $(installdir))xulrunner-11
 +
  pkg_config_files = \
  	libxul.pc \
@@ -24,7 +24,7 @@
  	$(NULL)
  
  ifdef MOZ_NATIVE_NSPR
-@@ -103,16 +106,17 @@ pkg_config_files += mozilla-nss.pc
+@@ -105,16 +108,17 @@ pkg_config_files += mozilla-nss.pc
  endif
  
  %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS)
diff -r 0887a88b1e85 -r 67f876aafae8 mozilla-repo.patch
--- a/mozilla-repo.patch	Wed Feb 08 08:31:42 2012 +0100
+++ b/mozilla-repo.patch	Wed Feb 08 08:34:20 2012 +0100
@@ -1,28 +1,28 @@
 # HG changeset patch
-# Parent 07dc7ea11c92368cb7c137a403feaaa6861abb3c
+# Parent e315e5900fa90c2183edccd211fbe1e81cdb4c5f
 
-diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
---- a/browser/app/Makefile.in
-+++ b/browser/app/Makefile.in
-@@ -68,17 +68,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc
+diff --git a/build/Makefile.in b/build/Makefile.in
+--- a/build/Makefile.in
++++ b/build/Makefile.in
+@@ -86,17 +86,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_
+ APP_INI_DEPS += $(DEPTH)/config/autoconf.mk
  
- DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
- 
- MOZ_SOURCE_STAMP ?= $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)
+ MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
  ifdef MOZ_SOURCE_STAMP
  DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)"
  endif
  
--SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
-+SOURCE_REPO ?= $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
+ _dollar=$$
+-SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
++SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
  ifdef SOURCE_REPO
  DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
  endif
  
- DEFINES += -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \
-            -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)"
- 
- ifdef MOZ_APP_PROFILE
+ DEFINES += \
+   -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \
+   -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" \
+   -DMOZ_APP_ID="$(MOZ_APP_ID)" \
 diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in
 --- a/toolkit/content/Makefile.in
 +++ b/toolkit/content/Makefile.in
@@ -48,7 +48,7 @@
 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
 --- a/toolkit/mozapps/installer/package-name.mk
 +++ b/toolkit/mozapps/installer/package-name.mk
-@@ -154,20 +154,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
+@@ -156,20 +156,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
  TEST_PACKAGE = $(PKG_BASENAME).tests.zip
  
  ifneq (,$(wildcard $(DIST)/bin/application.ini))
@@ -74,7 +74,7 @@
 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
 --- a/toolkit/xre/Makefile.in
 +++ b/toolkit/xre/Makefile.in
-@@ -227,17 +227,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
+@@ -235,17 +235,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
  endif
  endif
  
diff -r 0887a88b1e85 -r 67f876aafae8 mozilla-shared-nss-db.patch
--- a/mozilla-shared-nss-db.patch	Wed Feb 08 08:31:42 2012 +0100
+++ b/mozilla-shared-nss-db.patch	Wed Feb 08 08:34:20 2012 +0100
@@ -7,7 +7,7 @@
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -567,16 +567,20 @@ MOZ_LIBNOTIFY_LIBS	= @MOZ_LIBNOTIFY_LIBS
+@@ -581,16 +581,20 @@ MOZ_LIBNOTIFY_LIBS	= @MOZ_LIBNOTIFY_LIBS
  MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNOTIFY@
  
  MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
@@ -31,7 +31,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8093,16 +8093,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8213,16 +8213,31 @@ AC_SUBST(QCMS_LIBS)
  
  dnl ========================================================
  dnl HarfBuzz
@@ -55,23 +55,23 @@
 +AC_SUBST(NSSHELPER_LIBS)
 +
 +dnl ========================================================
- dnl OTS
+ dnl SIL Graphite
  dnl ========================================================
- MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)'
- AC_SUBST(MOZ_OTS_LIBS)
- 
- dnl ========================================================
- dnl Skia 
- dnl ========================================================
+ if test "$MOZ_GRAPHITE"; then
+   MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
+   AC_DEFINE(MOZ_GRAPHITE)
+ else
+   MOZ_GRAPHITE_LIBS=
+ fi
 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
 --- a/security/manager/ssl/src/Makefile.in
 +++ b/security/manager/ssl/src/Makefile.in
-@@ -114,12 +114,14 @@ CSRCS += md4.c
- 
- 
- EXTRA_DEPS = $(NSS_DEP_LIBS)
- 
- DEFINES += -DNSS_ENABLE_ECC
+@@ -118,12 +118,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS)
+ DEFINES += \
+   -DNSS_ENABLE_ECC \
+   -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
+   -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
+   $(NULL)
  
  # Use local includes because they are inserted before INCLUDES
  # so that Mozilla's nss.h is used, not glibc's
@@ -104,12 +104,12 @@
  #include "nsNSSComponent.h"
  #include "nsNSSCallbacks.h"
  #include "nsNSSIOLayer.h"
- #include "nsSSLThread.h"
  #include "nsCertVerificationThread.h"
  
  #include "nsNetUtil.h"
  #include "nsAppDirectoryServiceDefs.h"
-@@ -1725,18 +1732,34 @@ nsNSSComponent::InitializeNSS(bool showW
+ #include "nsDirectoryService.h"
+@@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(bool showW
      ConfigureInternalPKCS11Token();
  
      // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -149,7 +149,7 @@
 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
 --- a/toolkit/library/Makefile.in
 +++ b/toolkit/library/Makefile.in
-@@ -126,17 +126,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+@@ -471,17 +471,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
  endif
  endif
  endif
@@ -162,9 +162,9 @@
 +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS)
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
- CXXFLAGS	+= $(TK_CFLAGS)
+ CXXFLAGS += $(TK_CFLAGS)
  OS_LIBS += \
- 	-framework SystemConfiguration \
- 	-framework QuickTime \
- 	-framework IOKit \
- 	-F/System/Library/PrivateFrameworks -framework CoreUI \
+   -framework SystemConfiguration \
+   -framework QuickTime \
+   -framework IOKit \
+   -F/System/Library/PrivateFrameworks -framework CoreUI \
diff -r 0887a88b1e85 -r 67f876aafae8 mozilla-sle11.patch
--- a/mozilla-sle11.patch	Wed Feb 08 08:31:42 2012 +0100
+++ b/mozilla-sle11.patch	Wed Feb 08 08:34:20 2012 +0100
@@ -11,7 +11,7 @@
  // <intrin.h> conflicts with <windows.h> on MSVC 2005, and some files want to
  // include both SSE.h and <windows.h>.
  
- #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && (defined(__i386__) || defined(__x86_64__))
+ #ifdef HAVE_CPUID_H
  
  // cpuid.h is available on gcc 4.3 and higher on i386 and x86_64
 -#include <cpuid.h>
diff -r 0887a88b1e85 -r 67f876aafae8 series
--- a/series	Wed Feb 08 08:31:42 2012 +0100
+++ b/series	Wed Feb 08 08:34:20 2012 +0100
@@ -5,7 +5,7 @@
 mozilla-nongnome-proxies.patch
 mozilla-prefer_plugin_pref.patch
 mozilla-shared-nss-db.patch
-mozilla-kde.patch
+#mozilla-kde.patch
 mozilla-preferences.patch
 #mozilla-gconf-backend.patch
 #gecko-lockdown.patch
@@ -16,16 +16,14 @@
 mozilla-dump_syms-static.patch
 mozilla-sle11.patch
 mozilla-linux3.patch
-mozilla-a11y.patch
 mozilla-disable-neon-option.patch
-mozilla-bmo703534.patch
 mozilla-yarr-pcre.patch
 
 # Firefox patches
 firefox-browser-css.patch
 firefox-cross-desktop.patch
-firefox-kde.patch
-firefox-kde-114.patch
+#firefox-kde.patch
+#firefox-kde-114.patch
 #firefox-ui-lockdown.patch
 firefox-libxulsdk-locales.patch
 firefox-no-default-ualocale.patch
diff -r 0887a88b1e85 -r 67f876aafae8 xulrunner/mozilla-a11y.patch
--- a/xulrunner/mozilla-a11y.patch	Wed Feb 08 08:31:42 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-a11y.patch
\ No newline at end of file
diff -r 0887a88b1e85 -r 67f876aafae8 xulrunner/mozilla-bmo703534.patch
--- a/xulrunner/mozilla-bmo703534.patch	Wed Feb 08 08:31:42 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-bmo703534.patch
\ No newline at end of file
diff -r 0887a88b1e85 -r 67f876aafae8 xulrunner/xulrunner.spec
--- a/xulrunner/xulrunner.spec	Wed Feb 08 08:31:42 2012 +0100
+++ b/xulrunner/xulrunner.spec	Wed Feb 08 08:34:20 2012 +0100
@@ -41,14 +41,14 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.8.9
-BuildRequires:  mozilla-nss-devel >= 3.13.1
+BuildRequires:  mozilla-nspr-devel >= 4.9.0
+BuildRequires:  mozilla-nss-devel >= 3.13.2
 Version:        10.0
 Release:        0
-%define         releasedate 2012012900
-%define         version_internal 10.0
-%define         apiversion 10
-%define         uaweight 1000000
+%define         releasedate 2012020300
+%define         version_internal 11.0
+%define         apiversion 11
+%define         uaweight 1100000
 Summary:        Mozilla Runtime Environment
 License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
 Group:          Productivity/Other
@@ -77,10 +77,8 @@
 Patch12:        mozilla-dump_syms-static.patch
 Patch13:        mozilla-sle11.patch
 Patch14:        mozilla-linux3.patch
-Patch15:        mozilla-a11y.patch
 Patch16:        mozilla-disable-neon-option.patch
-Patch17:        mozilla-bmo703534.patch
-Patch18:        mozilla-yarr-pcre.patch
+Patch17:        mozilla-yarr-pcre.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       mozilla-js = %{version}
 Requires(post):  update-alternatives coreutils
@@ -198,10 +196,8 @@
 %patch13 -p1
 %endif
 %patch14 -p1
-%patch15 -p1
 %patch16 -p1
 %patch17 -p1
-%patch18 -p1
 
 %build
 # no need to add build time to binaries