diff -r de1740022f78 -r e8c83b144fd1 mozilla-shared-nss-db.patch --- a/mozilla-shared-nss-db.patch Thu May 30 09:22:10 2013 +0200 +++ b/mozilla-shared-nss-db.patch Wed Jun 12 21:15:08 2013 +0200 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8191,16 +8191,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8303,16 +8303,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -33,16 +33,16 @@ +dnl ======================================================== dnl SIL Graphite dnl ======================================================== - if test "$MOZ_GRAPHITE"; then - MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' - AC_DEFINE(MOZ_GRAPHITE) - else - MOZ_GRAPHITE_LIBS= - fi + MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' + AC_SUBST(MOZ_GRAPHITE_LIBS) + + dnl ======================================================== + dnl OTS + dnl ======================================================== 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 -@@ -97,16 +97,19 @@ DEFINES += \ +@@ -93,16 +93,19 @@ DEFINES += \ EXPORTS += \ CryptoTask.h \ @@ -89,7 +89,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryService.h" -@@ -1679,18 +1686,34 @@ nsNSSComponent::InitializeNSS(bool showW +@@ -1682,18 +1689,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 -@@ -504,17 +504,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -501,17 +501,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif