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 356 30a00f382aed
parent 340 aabcc7895695
child 357 db07eb421d6b 
--- a/mozilla-shared-nss-db.patch	Sat Nov 12 16:22:36 2011 +0100
+++ b/mozilla-shared-nss-db.patch	Fri Nov 18 07:36:46 2011 +0100
@@ -7,14 +7,14 @@
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -577,16 +577,20 @@ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS
+@@ -571,16 +571,20 @@ MOZ_LIBNOTIFY_LIBS	= @MOZ_LIBNOTIFY_LIBS
+ MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNOTIFY@
+ 
+ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
  
  GLIB_CFLAGS	= @GLIB_CFLAGS@
  GLIB_LIBS	= @GLIB_LIBS@
  GLIB_GMODULE_LIBS	= @GLIB_GMODULE_LIBS@
- LIBIDL_CFLAGS = @LIBIDL_CFLAGS@
- LIBIDL_LIBS = @LIBIDL_LIBS@
- STATIC_LIBIDL = @STATIC_LIBIDL@
  
 +MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@
 +NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@
@@ -31,7 +31,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8680,16 +8680,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8016,16 +8016,31 @@ AC_SUBST(QCMS_LIBS)
  
  dnl ========================================================
  dnl HarfBuzz
@@ -66,7 +66,7 @@
 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
+@@ -113,12 +113,14 @@ CSRCS += md4.c
  
  
  EXTRA_DEPS = $(NSS_DEP_LIBS)
@@ -109,7 +109,7 @@
  
  #include "nsNetUtil.h"
  #include "nsAppDirectoryServiceDefs.h"
-@@ -1748,18 +1755,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
+@@ -1727,18 +1734,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
      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
-@@ -139,17 +139,17 @@ ifdef MOZ_DEBUG
+@@ -138,17 +138,17 @@ ifdef MOZ_DEBUG
  EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
  endif
  endif
mozilla