diff -r c2e88e5c7aab -r ab297940ae8a mozilla-shared-nss-db.patch --- a/mozilla-shared-nss-db.patch Mon Jun 08 13:58:06 2015 +0200 +++ b/mozilla-shared-nss-db.patch Mon Jun 08 23:11:32 2015 +0200 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8207,16 +8207,31 @@ if test "$MOZ_ENABLE_SKIA"; then +@@ -8247,16 +8247,31 @@ if test "$MOZ_ENABLE_SKIA"; then MOZ_ENABLE_SKIA_GPU=1 AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) @@ -42,9 +42,9 @@ diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build --- a/security/manager/ssl/src/moz.build +++ b/security/manager/ssl/src/moz.build -@@ -77,16 +77,19 @@ SOURCES += [ - 'nsNSSVersion.cpp', - 'PSMContentListener.cpp', +@@ -74,16 +74,19 @@ UNIFIED_SOURCES += [ + SOURCES += [ + 'nsNSSCertificateDB.cpp', ] LOCAL_INCLUDES += [ @@ -87,7 +87,7 @@ #include "nsAppDirectoryServiceDefs.h" #include "nsCertVerificationThread.h" #include "nsAppDirectoryServiceDefs.h" -@@ -996,17 +1003,31 @@ nsNSSComponent::InitializeNSS() +@@ -997,17 +1004,31 @@ nsNSSComponent::InitializeNSS() if (NS_FAILED(rv)) { nsPSMInitPanic::SetPanic(); return NS_ERROR_NOT_AVAILABLE; @@ -123,7 +123,7 @@ diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build -@@ -208,16 +208,18 @@ if CONFIG['MOZ_B2G_CAMERA']: +@@ -207,16 +207,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG[' 'stagefright_omx', ]