diff -r 55fe9dc16b1f -r 830e50bbfc79 mozilla-shared-nss-db.patch
--- a/mozilla-shared-nss-db.patch	Tue Sep 11 19:27:36 2012 +0200
+++ b/mozilla-shared-nss-db.patch	Thu Sep 13 21:36:45 2012 +0200
@@ -4,34 +4,10 @@
          (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1)
 References:
 
-diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
---- a/config/autoconf.mk.in
-+++ b/config/autoconf.mk.in
-@@ -540,16 +540,20 @@ MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNO
- 
- MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
- MOZ_ALSA_CFLAGS         = @MOZ_ALSA_CFLAGS@
- 
- GLIB_CFLAGS	= @GLIB_CFLAGS@
- GLIB_LIBS	= @GLIB_LIBS@
- GLIB_GMODULE_LIBS	= @GLIB_GMODULE_LIBS@
- 
-+MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@
-+NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@
-+NSSHELPER_LIBS = @NSSHELPER_LIBS@
-+
- MOZ_NATIVE_MAKEDEPEND	= @MOZ_NATIVE_MAKEDEPEND@
- 
- CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@
- 
- MOZ_AUTO_DEPS	= @MOZ_AUTO_DEPS@
- COMPILER_DEPEND = @COMPILER_DEPEND@
- MDDEPDIR        := @MDDEPDIR@
- CC_WRAPPER = @CC_WRAPPER@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8052,16 +8052,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -7987,16 +7987,31 @@ AC_SUBST(QCMS_LIBS)
  
  dnl ========================================================
  dnl HarfBuzz
@@ -107,7 +83,7 @@
  #include "nsNetUtil.h"
  #include "nsAppDirectoryServiceDefs.h"
  #include "nsDirectoryService.h"
-@@ -1740,18 +1747,34 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1731,18 +1738,34 @@ nsNSSComponent::InitializeNSS(bool showW
      ConfigureInternalPKCS11Token();
  
      // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -115,7 +91,7 @@
      // later.  It also allows us to work around a bug in the system NSS in
      // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as
      // "/usr/lib/nss/libnssckbi.so".
-     PRUint32 init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;
+     uint32_t init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;
 -    SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "",
 -                                         SECMOD_DB, init_flags);
 +    SECStatus init_rv = SECFailure;
@@ -147,7 +123,7 @@
 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
 --- a/toolkit/library/Makefile.in
 +++ b/toolkit/library/Makefile.in
-@@ -441,17 +441,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+@@ -443,17 +443,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
  endif
  endif
  endif