diff -r 8d4c4f06e0e4 -r b30da62025bc firefox-multilocale-chrome.patch --- a/firefox-multilocale-chrome.patch Mon Apr 08 00:00:01 2013 +0200 +++ b/firefox-multilocale-chrome.patch Mon Apr 08 00:00:49 2013 +0200 @@ -1,12 +1,12 @@ # HG changeset patch +# Parent 4730f10113d354094e4c93aad9af5efa4abe15e0 # User Wolfgang Rosenauer -# Parent 1352398be333989afdf06a2d87d63df9fed61333 Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -338,16 +338,20 @@ pref("browser.download.panel.shown", fal +@@ -341,16 +341,20 @@ pref("browser.download.panel.shown", fal pref("browser.download.panel.firstSessionCompleted", false); // search engines URL @@ -30,86 +30,122 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -124,39 +124,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr - install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; +@@ -71,20 +71,22 @@ UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(ST + + STUB_HOOK = $(NSINSTALL) -D "$(_ABS_DIST)/$(PKG_INST_PATH)"; \ + $(RM) "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ + cp ../installer/windows/l10ngen/stub.exe "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ + chmod 0755 "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ + $(NULL) + endif - install:: $(addprefix generic/profile/,$(PROFILE_FILES)) - $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile +-SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ++SEARCHPLUGINS_NAMES = $(shell cat \ ++ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ ++ @srcdir@/en-US/searchplugins/list.txt ) ) + SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins + SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) +-PP_TARGETS += SEARCHPLUGINS ++#PP_TARGETS += SEARCHPLUGINS + + # Required for l10n.mk - defines a list of app sub dirs that should + # be included in langpack xpis. + ifdef MOZ_METRO + # metro build, include both app folders + DIST_SUBDIRS = browser metro + else + DIST_SUBDIRS = $(DIST_SUBDIR) +@@ -142,20 +144,44 @@ install:: $(addprefix generic/profile/,$ install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome --SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) -+SEARCH_PLUGINS = $(shell cat \ -+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ -+ @srcdir@/en-US/searchplugins/list.txt ) ) + # metro build calls back here for search engine plugins + searchplugins: $(addprefix $(FINAL_TARGET)/searchplugins/,$(SEARCHPLUGINS)) + .PHONY: searchplugins --libs:: $(addsuffix .xml,$(SEARCH_PLUGINS)) -- $(NSINSTALL) -D $(FINAL_TARGET)/searchplugins -- for SEARCH_PLUGIN in $^; do\ -- SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\ +tmp-search.jar.mn:: + printf "$(AB_CD).jar:" > $@ -+ printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >> $@ -+ @echo >> $@ ++ printf "$(foreach plugin,$(SEARCHPLUGINS), \n locale/browser/searchplugins/$(plugin) ($(plugin)))" >> $@ ++ @echo >> $@ + -+searchplugins:: $(addsuffix .xml,$(SEARCH_PLUGINS)) -+ for SEARCH_PLUGIN in $^; do \ - $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ -- $$SEARCH_PLUGIN > $(FINAL_TARGET)/searchplugins/$$SEARCH_PLUGIN_BASE; \ -+ $$SEARCH_PLUGIN > $$SEARCH_PLUGIN-new ; \ -+ mv $$SEARCH_PLUGIN-new $$SEARCH_PLUGIN ; \ - done - --install:: $(addsuffix .xml,$(SEARCH_PLUGINS)) -- $(NSINSTALL) -D $(DESTDIR)$(mozappdir)/searchplugins -- for i in $^; do \ -- SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\ -- $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ -- $$SEARCH_PLUGIN > $(DESTDIR)$(mozappdir)/searchplugins/$$SEARCH_PLUGIN_BASE; \ -- done -+searchplugins:: tmp-search.jar.mn ++searchplugins-jar:: $(SEARCHPLUGINS) ++ for SEARCHPLUGIN in $^; do \ ++ $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ ++ $$SEARCHPLUGIN > $$SEARCHPLUGIN-new ; \ ++ mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ ++ done ++ ++searchplugins-jar:: tmp-search.jar.mn + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ + $(QUIET) -j $(FINAL_TARGET)/chrome \ + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ + -s $(LOCALE_SRCDIR)/searchplugins \ + $(MAKE_JARS_FLAGS) tmp-search.jar.mn - -+libs:: searchplugins ++ ++libs:: searchplugins-jar + +GARBAGE += tmp-search.jar.mn - ++ libs-%: $(NSINSTALL) -D $(DIST)/install @$(MAKE) -C ../../toolkit/locales libs-$* @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* -+ @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* ++ @$(MAKE) -B searchplugins-jar AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) + ifdef MOZ_METRO + @$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$* + endif @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* - repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe - repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) - @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." +diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml +--- a/browser/locales/en-US/searchplugins/google.xml ++++ b/browser/locales/en-US/searchplugins/google.xml +@@ -9,24 +9,16 @@ + data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABUUlEQVR42pWTzUsCYRCH9y9zu3SooCCkjhIRRLeIykXokiWCJ7PvDpZRlz6si1lIQZ3SQxQdOhREpgSm0JeQvfu0+i6I7LKLh4F5h5nnnRl+o6jTdHn8omAYbVqhXqvYFXcEBKFDwcoZZB8B4LkEB9cwGGmFKHb01A1EU9JXzfdvDYZi1lwLwBcVAIwsNWPesIwls7gDtB2Z7N9ujVe+IX2LO2AgItB1OL9vJqsmILDrOoK02IkBAdYy4FsQJC5h+VQCHQDWTqYSgo8fuHuRxS4Ae3stQ7UGE5ttAHqCUgfxC7m4ryrowOyeO6CxqHwZxtYFqtYc5+kNan/gDTsAeueEIRj7n/rmRQMwueUAGF0VAAT3rQBTC0Y3DoDOGbm00icML4oWHYSTgo0MFqjlmPpDgqMcFCuQf4erBzjOwXjcriu9qHg0uutO2+es6fl67T9ptebvFRjBVgAAAABJRU5ErkJggg== + + + + + + + +-#if MOZ_UPDATE_CHANNEL == beta +- +-#elif MOZ_UPDATE_CHANNEL == aurora +- +-#elif MOZ_UPDATE_CHANNEL == nightly +- +-#else + +-#endif + + + + + + https://www.google.com/ + diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -108,16 +108,17 @@ +@@ -115,16 +115,17 @@ + locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) + #endif + % locale browser-region @AB_CD@ %locale/browser-region/ locale/browser-region/region.properties (%chrome/browser-region/region.properties) # the following files are browser-specific overrides locale/browser/netError.dtd (%chrome/overrides/netError.dtd) locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) ++ locale/browser/searchplugins/list.txt (%searchplugins/list.txt) % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd -+ locale/browser/searchplugins/list.txt (%searchplugins/list.txt) % locale testpilot @AB_CD@ %locale/feedback/ locale/feedback/main.dtd (%feedback/main.dtd) locale/feedback/main.properties (%feedback/main.properties) % locale pdf.js @AB_CD@ %locale/pdfviewer/ locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) - locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) - #ifdef MOZ_WEBAPP_RUNTIME - ../webapprt/chrome/@AB_CD@.jar: