diff -r 0dd4ede5105c -r 73640b76d6c3 mozilla-shared-nss-db.patch --- a/mozilla-shared-nss-db.patch Tue Mar 19 09:18:24 2013 +0100 +++ b/mozilla-shared-nss-db.patch Mon Mar 25 23:57:09 2013 +0100 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8275,16 +8275,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8191,16 +8191,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -42,13 +42,13 @@ 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 -@@ -92,16 +92,19 @@ DEFINES += \ - $(NULL) +@@ -97,16 +97,19 @@ DEFINES += \ EXPORTS += \ CryptoTask.h \ nsNSSShutDown.h \ ScopedNSSTypes.h \ + nsRandomGenerator.h \ $(NULL) +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) @@ -89,7 +89,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryService.h" -@@ -1682,18 +1689,34 @@ nsNSSComponent::InitializeNSS(bool showW +@@ -1679,18 +1686,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -129,7 +129,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -500,17 +500,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -504,17 +504,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif