1 files changed, 0 insertions, 112 deletions
diff --git a/http/firefox/installer.patch b/http/firefox/installer.patch
deleted file mode 100644
index d3232b58ef..0000000000
--- a/http/firefox/installer.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-# HG changeset patch
-# User Andrew Benton <b3nton@gmail.com>
-# Date 1339485009 -7200
-# Node ID ede54971747f10b50e7d87e6236fe777ac12a070
-# Parent  253d5996845e9fd994dc9ee542d293fbc412ec56
-Bug 752895 - Don't try to install nspr, nss and sqlite when using system libraries. 
-r=glandium
-
-diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
---- a/browser/installer/Makefile.in
-+++ b/browser/installer/Makefile.in
-@@ -39,16 +39,24 @@ endif
- ifdef MOZ_ENABLE_GNOME_COMPONENT
- DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
- endif
- 
- ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
- DEFINES += -DMOZ_GTK2=1
- endif
- 
-+ifdef MOZ_NATIVE_NSPR
-+DEFINES += -DMOZ_NATIVE_NSPR=1
-+endif
-+
-+ifdef MOZ_NATIVE_NSS
-+DEFINES += -DMOZ_NATIVE_NSS=1
-+endif
-+
- ifdef NSS_DISABLE_DBM
- DEFINES += -DNSS_DISABLE_DBM=1
- endif
- 
- ifdef _MSC_VER
- DEFINES += -D_MSC_VER=$(_MSC_VER)
- endif
- 
-diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
---- a/browser/installer/package-manifest.in
-+++ b/browser/installer/package-manifest.in
-@@ -53,19 +53,21 @@
- #endif
- @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
- #ifdef MOZ_SHARED_MOZGLUE
- @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
- #endif
- #ifndef MOZ_STATIC_JS
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
-+#endif
- @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- #ifdef XP_MACOSX
- @BINPATH@/XUL
- #else
- @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
- #endif
- #ifdef XP_MACOSX
- @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
-@@ -104,17 +106,19 @@
- @BINPATH@/@MOZ_APP_NAME@
- #endif
- @BINPATH@/application.ini
- #ifdef MOZ_UPDATER
- @BINPATH@/update-settings.ini
- #endif
- @BINPATH@/platform.ini
- #ifndef XP_OS2
-+#ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-+#endif
- #else
- @BINPATH@/mozsqlt3@DLL_SUFFIX@
- #endif
- @BINPATH@/blocklist.xml
- #ifdef XP_UNIX
- @BINPATH@/run-mozilla.sh
- #ifndef XP_MACOSX
- @BINPATH@/mozilla-xremote-client
-@@ -578,26 +582,28 @@
- @BINPATH@/components/dom_svg.xpt
- @BINPATH@/components/dom_smil.xpt
- 
- ; [Personal Security Manager]
- ;
- ; NSS libraries are signed in the staging directory,
- ; meaning their .chk files are created there directly.
- ;
-+#ifndef MOZ_NATIVE_NSS
- @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
- #ifndef NSS_DISABLE_DBM
- @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
- #endif
- @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
-+#endif
- @BINPATH@/chrome/pippki@JAREXT@
- @BINPATH@/chrome/pippki.manifest
- @BINPATH@/components/pipboot.xpt
- @BINPATH@/components/pipnss.xpt
- @BINPATH@/components/pippki.xpt
- 
- ; for Solaris SPARC
- #ifdef SOLARIS
-
-