--- a/mozilla-shared-nss-db.patch Wed Feb 08 08:31:42 2012 +0100
+++ b/mozilla-shared-nss-db.patch Wed Feb 08 08:34:20 2012 +0100
@@ -7,7 +7,7 @@
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
-@@ -567,16 +567,20 @@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS
+@@ -581,16 +581,20 @@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS
MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@
MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@
@@ -31,7 +31,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8093,16 +8093,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8213,16 +8213,31 @@ AC_SUBST(QCMS_LIBS)
dnl ========================================================
dnl HarfBuzz
@@ -55,23 +55,23 @@
+AC_SUBST(NSSHELPER_LIBS)
+
+dnl ========================================================
- dnl OTS
+ dnl SIL Graphite
dnl ========================================================
- MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)'
- AC_SUBST(MOZ_OTS_LIBS)
-
- dnl ========================================================
- dnl Skia
- 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
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
-@@ -114,12 +114,14 @@ CSRCS += md4.c
-
-
- EXTRA_DEPS = $(NSS_DEP_LIBS)
-
- DEFINES += -DNSS_ENABLE_ECC
+@@ -118,12 +118,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS)
+ DEFINES += \
+ -DNSS_ENABLE_ECC \
+ -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
+ -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
+ $(NULL)
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
@@ -104,12 +104,12 @@
#include "nsNSSComponent.h"
#include "nsNSSCallbacks.h"
#include "nsNSSIOLayer.h"
- #include "nsSSLThread.h"
#include "nsCertVerificationThread.h"
#include "nsNetUtil.h"
#include "nsAppDirectoryServiceDefs.h"
-@@ -1725,18 +1732,34 @@ nsNSSComponent::InitializeNSS(bool showW
+ #include "nsDirectoryService.h"
+@@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(bool showW
ConfigureInternalPKCS11Token();
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -149,7 +149,7 @@
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
-@@ -126,17 +126,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+@@ -471,17 +471,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
endif
endif
endif
@@ -162,9 +162,9 @@
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS)
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
- CXXFLAGS += $(TK_CFLAGS)
+ CXXFLAGS += $(TK_CFLAGS)
OS_LIBS += \
- -framework SystemConfiguration \
- -framework QuickTime \
- -framework IOKit \
- -F/System/Library/PrivateFrameworks -framework CoreUI \
+ -framework SystemConfiguration \
+ -framework QuickTime \
+ -framework IOKit \
+ -F/System/Library/PrivateFrameworks -framework CoreUI \