--- a/mozilla-shared-nss-db.patch	Wed Feb 05 07:13:27 2014 +0100
+++ b/mozilla-shared-nss-db.patch	Fri Feb 07 22:10:42 2014 +0100
@@ -7,13 +7,13 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -7999,16 +7999,31 @@ AC_SUBST(QCMS_LIBS)
- 
- dnl ========================================================
- dnl HarfBuzz
- dnl ========================================================
- MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
- AC_SUBST(MOZ_HARFBUZZ_LIBS)
+@@ -8042,16 +8042,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+     MOZ_ENABLE_SKIA_GPU=1
+     AC_DEFINE(USE_SKIA_GPU)
+     AC_SUBST(MOZ_ENABLE_SKIA_GPU)
+   fi
+ fi
+ AC_SUBST(MOZ_ENABLE_SKIA)
  
  dnl ========================================================
 +dnl Check for nss-shared-helper
@@ -31,26 +31,24 @@
 +AC_SUBST(NSSHELPER_LIBS)
 +
 +dnl ========================================================
- dnl SIL Graphite
+ dnl disable xul
  dnl ========================================================
- MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
- AC_SUBST(MOZ_GRAPHITE_LIBS)
- 
- dnl ========================================================
- dnl OTS
- dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(xul,
+ [  --disable-xul           Disable XUL],
+     MOZ_XUL= )
+ if test "$MOZ_XUL"; then
+   AC_DEFINE(MOZ_XUL)
+ else
 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
---- a/security/manager/ssl/src/Makefile.in
+new file mode 100644
+--- /dev/null
 +++ b/security/manager/ssl/src/Makefile.in
-@@ -4,8 +4,11 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- DEFINES += \
-   -DNSS_ENABLE_ECC \
-   -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
-   -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
-   $(NULL)
+@@ -0,0 +1,8 @@
++#! gmake
++# 
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 +
 +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS)
 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
@@ -81,7 +79,7 @@
  #include "nsAppDirectoryServiceDefs.h"
  #include "nsComponentManagerUtils.h"
  #include "nsDirectoryServiceDefs.h"
-@@ -1263,18 +1270,35 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1207,18 +1214,35 @@ nsNSSComponent::InitializeNSS()
      ConfigureInternalPKCS11Token();
  
      // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -115,14 +113,14 @@
      if (init_rv != SECSuccess) {
        PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get()));
  
-       if (suppressWarningPref) {
-         which_nss_problem = problem_none;
-       }
-       else {
+       // try to init r/o
+       init_flags |= NSS_INIT_READONLY;
+       init_rv = ::NSS_Initialize(profileStr.get(), "", "",
+                                  SECMOD_DB, init_flags);
 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
 --- a/toolkit/library/Makefile.in
 +++ b/toolkit/library/Makefile.in
-@@ -484,17 +484,17 @@ LOCAL_INCLUDES += -I$(topsrcdir)/intl/un
+@@ -245,17 +245,17 @@ endif
  ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
  SDK_LIBRARY = $(IMPORT_LIBRARY)
  else
@@ -140,4 +138,4 @@
    -framework SystemConfiguration \
    -framework QTKit \
    -framework IOKit \
-   -F/System/Library/PrivateFrameworks -framework CoreUI \
+   -F$(MACOS_PRIVATE_FRAMEWORKS_DIR) -framework CoreUI \