--- a/mozilla-shared-nss-db.patch Wed Oct 24 10:25:01 2012 +0200
+++ b/mozilla-shared-nss-db.patch Fri Oct 26 13:01:33 2012 +0200
@@ -7,7 +7,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -7987,16 +7987,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8089,16 +8089,31 @@ AC_SUBST(QCMS_LIBS)
dnl ========================================================
dnl HarfBuzz
@@ -42,11 +42,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
-@@ -90,12 +90,14 @@ DEFINES += \
- $(NULL)
+@@ -91,12 +91,14 @@ DEFINES += \
EXPORTS += \
nsNSSShutDown.h \
+ ScopedNSSTypes.h \
$(NULL)
# Use local includes because they are inserted before INCLUDES
@@ -83,7 +83,7 @@
#include "nsNetUtil.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsDirectoryService.h"
-@@ -1731,18 +1738,34 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1730,18 +1737,34 @@ nsNSSComponent::InitializeNSS(bool showW
ConfigureInternalPKCS11Token();
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -123,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
-@@ -443,17 +443,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+@@ -484,17 +484,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
endif
endif
endif