diff options
| author | Martin Stransky <stransky@redhat.com> | 2011-08-16 21:36:39 +0200 |
|---|---|---|
| committer | Martin Stransky <stransky@redhat.com> | 2011-08-16 21:36:39 +0200 |
| commit | 258ccb4f8878f576eb8fb7466b988e282bc76cbd (patch) | |
| tree | 15bd7947c3ba9978c25db996e414a3e854ffaff3 /firefox-6.0-cache-build.patch | |
| parent | Update to 6.0 (diff) | |
| download | librewolf-fedora-ff-258ccb4f8878f576eb8fb7466b988e282bc76cbd.tar.gz librewolf-fedora-ff-258ccb4f8878f576eb8fb7466b988e282bc76cbd.tar.bz2 librewolf-fedora-ff-258ccb4f8878f576eb8fb7466b988e282bc76cbd.zip | |
Added missing patch
Diffstat (limited to 'firefox-6.0-cache-build.patch')
| -rw-r--r-- | firefox-6.0-cache-build.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/firefox-6.0-cache-build.patch b/firefox-6.0-cache-build.patch new file mode 100644 index 0000000..22fbb79 --- /dev/null +++ b/firefox-6.0-cache-build.patch @@ -0,0 +1,53 @@ +diff -up firefox-6.0/mozilla-release/browser/installer/Makefile.in.cache firefox-6.0/mozilla-release/browser/installer/Makefile.in +--- firefox-6.0/mozilla-release/browser/installer/Makefile.in.cache 2011-08-16 15:55:27.000000000 +0200 ++++ firefox-6.0/mozilla-release/browser/installer/Makefile.in 2011-08-16 15:56:29.854358878 +0200 +@@ -110,19 +110,6 @@ ifndef LIBXUL_SDK + INSTALL_SDK = 1 + endif + +-ifneq (1_,$(if $(CROSS_COMPILE),1,0)_$(UNIVERSAL_BINARY)) +-ifdef RUN_TEST_PROGRAM +-_ABS_RUN_TEST_PROGRAM = $(call core_abspath,$(RUN_TEST_PROGRAM)) +-endif +- +-GENERATE_CACHE = \ +- $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$$PWD" -a "$$PWD" -f $(topsrcdir)/browser/installer/precompile_cache.js -e 'populate_startupcache("omni.jar", "startupCache.zip");' && \ +- rm -rf jsloader && \ +- $(UNZIP) startupCache.zip && \ +- rm startupCache.zip && \ +- $(ZIP) -r9m omni.jar jsloader +-endif +- + include $(topsrcdir)/toolkit/mozapps/installer/packager.mk + + ifeq (bundle, $(MOZ_FS_LAYOUT)) +diff -up firefox-6.0/mozilla-release/browser/installer/package-manifest.in.cache firefox-6.0/mozilla-release/browser/installer/package-manifest.in +--- firefox-6.0/mozilla-release/browser/installer/package-manifest.in.cache 2011-08-11 23:40:51.000000000 +0200 ++++ firefox-6.0/mozilla-release/browser/installer/package-manifest.in 2011-08-16 15:55:27.791593231 +0200 +@@ -86,6 +86,7 @@ + + [browser] + ; [Base Browser Files] ++@BINPATH@/jsloader/ + #ifndef XP_UNIX + @BINPATH@/@MOZ_APP_NAME@.exe + #else +diff -up firefox-6.0/mozilla-release/toolkit/mozapps/installer/packager.mk.cache firefox-6.0/mozilla-release/toolkit/mozapps/installer/packager.mk +--- firefox-6.0/mozilla-release/toolkit/mozapps/installer/packager.mk.cache 2011-08-11 23:41:31.000000000 +0200 ++++ firefox-6.0/mozilla-release/toolkit/mozapps/installer/packager.mk 2011-08-16 15:56:57.869808700 +0200 +@@ -363,7 +363,6 @@ MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_A + endif + + ifdef MOZ_OMNIJAR +-GENERATE_CACHE ?= true + + OMNIJAR_FILES = \ + chrome \ +@@ -393,7 +392,6 @@ PACK_OMNIJAR = \ + mv tmp.manifest $$m; \ + done; \ + $(ZIP) -r9m omni.jar $(OMNIJAR_FILES) -x $(NON_OMNIJAR_FILES) && \ +- $(GENERATE_CACHE) && \ + $(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR) ./ ./ && \ + mv binary.manifest components && \ + printf "manifest components/binary.manifest\n" > chrome.manifest |