--- a/mozilla-shared-nss-db.patch Sat Nov 15 20:13:46 2014 +0100
+++ b/mozilla-shared-nss-db.patch Sun Nov 16 20:54:39 2014 +0100
@@ -7,7 +7,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8199,16 +8199,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8302,16 +8302,31 @@ if test "$MOZ_ENABLE_SKIA"; then
MOZ_ENABLE_SKIA_GPU=1
AC_DEFINE(USE_SKIA_GPU)
AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@@ -42,7 +42,7 @@
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
-@@ -91,16 +91,19 @@ FAIL_ON_WARNINGS = True
+@@ -95,16 +95,19 @@ FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'xul'
@@ -65,15 +65,13 @@
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
-@@ -3,16 +3,23 @@
+@@ -1,14 +1,21 @@
+ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- #ifdef MOZ_LOGGING
- #define FORCE_PR_LOG 1
- #endif
-
+#ifdef MOZ_ENABLE_NSSHELPER
+#pragma GCC visibility push(default)
+#include <nss-shared-helper.h>
@@ -89,7 +87,7 @@
#include "nsCertVerificationThread.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsComponentManagerUtils.h"
-@@ -943,17 +950,31 @@ nsNSSComponent::InitializeNSS()
+@@ -945,17 +952,31 @@ nsNSSComponent::InitializeNSS()
if (NS_FAILED(rv)) {
nsPSMInitPanic::SetPanic();
return NS_ERROR_NOT_AVAILABLE;
@@ -122,25 +120,25 @@
if (init_rv != SECSuccess) {
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n"));
}
-diff --git a/toolkit/library/libxul.mozbuild b/toolkit/library/libxul.mozbuild
---- a/toolkit/library/libxul.mozbuild
-+++ b/toolkit/library/libxul.mozbuild
-@@ -22,16 +22,18 @@ DELAYLOAD_DLLS += [
- 'psapi.dll',
- 'rasapi32.dll',
- 'rasdlg.dll',
- 'secur32.dll',
- 'wininet.dll',
- 'winspool.drv'
- ]
+diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
+--- a/toolkit/library/moz.build
++++ b/toolkit/library/moz.build
+@@ -213,16 +213,18 @@ if CONFIG['MOZ_B2G_CAMERA']:
+ 'stagefright_omx',
+ ]
+
+ if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android':
+ OS_LIBS += [
+ 'rt',
+ ]
+OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS'])
+
- if CONFIG['MOZ_METRO']:
- DELAYLOAD_DLLS += [
- 'API-MS-WIN-CORE-WINRT-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL',
- 'API-MS-WIN-CORE-WINRT-STRING-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL',
- 'uiautomationcore.dll'
- ]
+ OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
+ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
- if CONFIG['ACCESSIBILITY']:
+ if CONFIG['MOZ_NATIVE_JPEG']:
+ OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
+
+ if CONFIG['MOZ_NATIVE_PNG']:
+ OS_LIBS += CONFIG['MOZ_PNG_LIBS']