diff -r ff06037ec39c -r 0f6539389500 mozilla-shared-nss-db.patch
--- a/mozilla-shared-nss-db.patch	Mon Jul 23 06:33:59 2012 +0200
+++ b/mozilla-shared-nss-db.patch	Wed Jul 25 11:15:27 2012 +0200
@@ -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
-@@ -573,16 +573,20 @@ MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNO
+@@ -540,16 +540,20 @@ MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNO
  
  MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
  MOZ_ALSA_CFLAGS         = @MOZ_ALSA_CFLAGS@
@@ -20,9 +20,9 @@
 +NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@
 +NSSHELPER_LIBS = @NSSHELPER_LIBS@
 +
- MOZ_NATIVE_MAKEDEPEND	= @SYSTEM_MAKEDEPEND@
+ MOZ_NATIVE_MAKEDEPEND	= @MOZ_NATIVE_MAKEDEPEND@
  
- export CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@
+ CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@
  
  MOZ_AUTO_DEPS	= @MOZ_AUTO_DEPS@
  COMPILER_DEPEND = @COMPILER_DEPEND@
@@ -31,7 +31,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8270,16 +8270,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8052,16 +8052,31 @@ AC_SUBST(QCMS_LIBS)
  
  dnl ========================================================
  dnl HarfBuzz
@@ -66,11 +66,11 @@
 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
-@@ -86,12 +86,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS)
- DEFINES += \
-   -DNSS_ENABLE_ECC \
-   -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
-   -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
+@@ -90,12 +90,14 @@ DEFINES += \
+   $(NULL)
+ 
+ EXPORTS += \
+   nsNSSShutDown.h \
    $(NULL)
  
  # Use local includes because they are inserted before INCLUDES
@@ -107,7 +107,7 @@
  #include "nsNetUtil.h"
  #include "nsAppDirectoryServiceDefs.h"
  #include "nsDirectoryService.h"
-@@ -1738,18 +1745,34 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1740,18 +1747,34 @@ nsNSSComponent::InitializeNSS(bool showW
      ConfigureInternalPKCS11Token();
  
      // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -147,7 +147,7 @@
 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
 --- a/toolkit/library/Makefile.in
 +++ b/toolkit/library/Makefile.in
-@@ -446,17 +446,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+@@ -441,17 +441,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
  endif
  endif
  endif
@@ -163,6 +163,6 @@
  CXXFLAGS += $(TK_CFLAGS)
  OS_LIBS += \
    -framework SystemConfiguration \
-   -framework QuickTime \
+   -framework QTKit \
    -framework IOKit \
    -F/System/Library/PrivateFrameworks -framework CoreUI \