Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-shared-nss-db.patch
changeset 340 aabcc7895695
parent 294 5330447b83a3
child 356 30a00f382aed 
--- a/mozilla-shared-nss-db.patch	Wed Oct 05 13:40:30 2011 +0200
+++ b/mozilla-shared-nss-db.patch	Wed Oct 05 16:01:57 2011 +0200
@@ -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
-@@ -579,16 +579,20 @@ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS
+@@ -577,16 +577,20 @@ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS
  
  GLIB_CFLAGS	= @GLIB_CFLAGS@
  GLIB_LIBS	= @GLIB_LIBS@
@@ -31,7 +31,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8625,16 +8625,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8680,16 +8680,31 @@ AC_SUBST(QCMS_LIBS)
  
  dnl ========================================================
  dnl HarfBuzz
@@ -109,7 +109,7 @@
  
  #include "nsNetUtil.h"
  #include "nsAppDirectoryServiceDefs.h"
-@@ -1761,18 +1768,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
+@@ -1748,18 +1755,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
      ConfigureInternalPKCS11Token();
  
      // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -167,4 +167,4 @@
  	-framework SystemConfiguration \
  	-framework QuickTime \
  	-framework IOKit \
- 	-lcrypto \
+ 	-F/System/Library/PrivateFrameworks -framework CoreUI \
mozilla