diff -r 38c67b6b2f37 -r fa96cf6ffd14 mozilla-shared-nss-db.patch --- a/mozilla-shared-nss-db.patch Mon Jun 17 22:57:16 2013 +0200 +++ b/mozilla-shared-nss-db.patch Tue Jul 16 12:35:11 2013 +0200 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8309,16 +8309,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8330,16 +8330,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -42,7 +42,7 @@ 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 -@@ -87,10 +87,13 @@ endif +@@ -18,10 +18,13 @@ LIBXUL_LIBRARY = 1 CSRCS += md4.c DEFINES += \ @@ -78,12 +78,12 @@ #include "nsNSSComponent.h" #include "CertVerifier.h" - #include "nsNSSCallbacks.h" - #include "nsNSSIOLayer.h" #include "nsCertVerificationThread.h" - - #include "nsNetUtil.h" -@@ -1721,18 +1728,34 @@ nsNSSComponent::InitializeNSS(bool showW + #include "nsAppDirectoryServiceDefs.h" + #include "nsComponentManagerUtils.h" + #include "nsDirectoryServiceDefs.h" + #include "nsICertOverrideService.h" +@@ -1132,18 +1139,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -123,12 +123,12 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -510,17 +510,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -490,17 +490,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif - EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) + EXTRA_DSO_LDOPTS += $(LIBS_DIR) DEFINES += -DIMPL_XREAPI