summaryrefslogtreecommitdiff
path: root/www/firefox-esr/files/patch-bug1013882
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2015-07-16 06:05:59 +0000
committerJan Beich <jbeich@FreeBSD.org>2015-07-16 06:05:59 +0000
commitef0a0c91f153782cd38b84d14147dfa8cef8337f (patch)
treecaa550e9c6de6d456de3b7c58dd8a734b5352b71 /www/firefox-esr/files/patch-bug1013882
parentRevert 392050 (diff)
- Update NSS and ca_root_nss to 3.19.2
- Update Firefox and gmp-api to 39.0 - Update Firefox ESR and libxul to 38.1.0 Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.19.2_release_notes Changes: https://www.mozilla.org/firefox/39.0/releasenotes/ Changes: https://www.mozilla.org/firefox/38.1.0/releasenotes/ MFH: 2015Q3 Security: https://vuxml.freebsd.org/freebsd/44d9daee-940c-4179-86bb-6e3ffd617869.html
Notes
Notes: svn path=/head/; revision=392273
Diffstat (limited to 'www/firefox-esr/files/patch-bug1013882')
-rw-r--r--www/firefox-esr/files/patch-bug101388210
1 files changed, 5 insertions, 5 deletions
diff --git a/www/firefox-esr/files/patch-bug1013882 b/www/firefox-esr/files/patch-bug1013882
index 86dc379fe50f..b3177989a39e 100644
--- a/www/firefox-esr/files/patch-bug1013882
+++ b/www/firefox-esr/files/patch-bug1013882
@@ -30,14 +30,14 @@ diff --git browser/installer/package-manifest.in browser/installer/package-manif
index b509fd4..195345c 100644
--- browser/installer/package-manifest.in
+++ browser/installer/package-manifest.in
-@@ -583,7 +583,7 @@
- @BINPATH@/components/MozKeyboard.js
- @BINPATH@/components/InputMethod.manifest
+@@ -608,7 +608,7 @@
+ @RESPATH@/components/MozKeyboard.js
+ @RESPATH@/components/InputMethod.manifest
-#ifdef MOZ_DEBUG
+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @BINPATH@/components/TestInterfaceJS.js
- @BINPATH@/components/TestInterfaceJS.manifest
+ @RESPATH@/components/TestInterfaceJS.js
+ @RESPATH@/components/TestInterfaceJS.manifest
#endif
diff --git mobile/android/installer/Makefile.in mobile/android/installer/Makefile.in
index 96dceab..3528ad6 100644