5 References: |
5 References: |
6 |
6 |
7 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
7 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
8 --- a/config/autoconf.mk.in |
8 --- a/config/autoconf.mk.in |
9 +++ b/config/autoconf.mk.in |
9 +++ b/config/autoconf.mk.in |
10 @@ -590,16 +590,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO |
10 @@ -573,16 +573,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO |
11 |
11 |
12 MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ |
12 MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ |
13 MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ |
13 MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ |
14 |
14 |
15 GLIB_CFLAGS = @GLIB_CFLAGS@ |
15 GLIB_CFLAGS = @GLIB_CFLAGS@ |
29 MDDEPDIR := @MDDEPDIR@ |
29 MDDEPDIR := @MDDEPDIR@ |
30 CC_WRAPPER = @CC_WRAPPER@ |
30 CC_WRAPPER = @CC_WRAPPER@ |
31 diff --git a/configure.in b/configure.in |
31 diff --git a/configure.in b/configure.in |
32 --- a/configure.in |
32 --- a/configure.in |
33 +++ b/configure.in |
33 +++ b/configure.in |
34 @@ -8180,16 +8180,31 @@ AC_SUBST(QCMS_LIBS) |
34 @@ -8270,16 +8270,31 @@ AC_SUBST(QCMS_LIBS) |
35 |
35 |
36 dnl ======================================================== |
36 dnl ======================================================== |
37 dnl HarfBuzz |
37 dnl HarfBuzz |
38 dnl ======================================================== |
38 dnl ======================================================== |
39 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
39 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
64 MOZ_GRAPHITE_LIBS= |
64 MOZ_GRAPHITE_LIBS= |
65 fi |
65 fi |
66 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
66 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
67 --- a/security/manager/ssl/src/Makefile.in |
67 --- a/security/manager/ssl/src/Makefile.in |
68 +++ b/security/manager/ssl/src/Makefile.in |
68 +++ b/security/manager/ssl/src/Makefile.in |
69 @@ -119,12 +119,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) |
69 @@ -86,12 +86,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) |
70 DEFINES += \ |
70 DEFINES += \ |
71 -DNSS_ENABLE_ECC \ |
71 -DNSS_ENABLE_ECC \ |
72 -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ |
72 -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ |
73 -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ |
73 -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ |
74 $(NULL) |
74 $(NULL) |
83 include $(topsrcdir)/config/rules.mk |
83 include $(topsrcdir)/config/rules.mk |
84 |
84 |
85 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
85 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
86 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
86 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
87 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |
87 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |
88 @@ -39,16 +39,23 @@ |
88 @@ -1,14 +1,21 @@ |
89 * use your version of this file under the terms of the MPL, indicate your |
89 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- |
90 * decision by deleting the provisions above and replace them with the notice |
|
91 * and other provisions required by the GPL or the LGPL. If you do not delete |
|
92 * the provisions above, a recipient may use your version of this file under |
|
93 * the terms of any one of the MPL, the GPL or the LGPL. |
|
94 * |
90 * |
95 * ***** END LICENSE BLOCK ***** */ |
91 * This Source Code Form is subject to the terms of the Mozilla Public |
|
92 * License, v. 2.0. If a copy of the MPL was not distributed with this |
|
93 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
96 |
94 |
97 +#ifdef MOZ_ENABLE_NSSHELPER |
95 +#ifdef MOZ_ENABLE_NSSHELPER |
98 +#pragma GCC visibility push(default) |
96 +#pragma GCC visibility push(default) |
99 +#include <nss-shared-helper.h> |
97 +#include <nss-shared-helper.h> |
100 +#pragma GCC visibility pop |
98 +#pragma GCC visibility pop |
107 #include "nsCertVerificationThread.h" |
105 #include "nsCertVerificationThread.h" |
108 |
106 |
109 #include "nsNetUtil.h" |
107 #include "nsNetUtil.h" |
110 #include "nsAppDirectoryServiceDefs.h" |
108 #include "nsAppDirectoryServiceDefs.h" |
111 #include "nsDirectoryService.h" |
109 #include "nsDirectoryService.h" |
112 @@ -1776,18 +1783,34 @@ nsNSSComponent::InitializeNSS(bool showW |
110 @@ -1738,18 +1745,34 @@ nsNSSComponent::InitializeNSS(bool showW |
113 ConfigureInternalPKCS11Token(); |
111 ConfigureInternalPKCS11Token(); |
114 |
112 |
115 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
113 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
116 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
114 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
117 // later. It also allows us to work around a bug in the system NSS in |
115 // later. It also allows us to work around a bug in the system NSS in |
147 } |
145 } |
148 else { |
146 else { |
149 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
147 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
150 --- a/toolkit/library/Makefile.in |
148 --- a/toolkit/library/Makefile.in |
151 +++ b/toolkit/library/Makefile.in |
149 +++ b/toolkit/library/Makefile.in |
152 @@ -439,17 +439,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
150 @@ -446,17 +446,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
153 endif |
151 endif |
154 endif |
152 endif |
155 endif |
153 endif |
156 |
154 |
157 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |
155 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |