rebase

bug1240930-253/comm/1240930-mail-80a1.patch

@@ -27,7 +27,7 @@ diff --git a/mail/locales/Makefile.in b/mail/locales/Makefile.in
  # pulls. You may override them if you provide your own files.
  ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
  
-@@ -57,45 +57,45 @@ DIST_SUBDIRS = $(DIST_SUBDIR)
+@@ -57,29 +57,29 @@ DIST_SUBDIRS = $(DIST_SUBDIR)
  include $(moztopsrcdir)/config/rules.mk
  
  ifeq ($(commreltopsrcdir),comm)
@@ -47,24 +47,26 @@ diff --git a/mail/locales/Makefile.in b/mail/locales/Makefile.in
 -	@$(MAKE) -C $(DEPTH)/toolkit/locales libs-$*  XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 +	@$(MAKE) -C $(DEPTH)/toolkit/locales l10n-$*  XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
  	@$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
- 	@$(MAKE) -C $(DEPTH)/devtools/shim/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
  	@$(MAKE) -C ../../chat/locales AB_CD=$* XPI_NAME=locale-$*
  	@$(MAKE) -C ../../calendar/locales AB_CD=$* XPI_NAME=locale-$*
  	@$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
+ 	@$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$*
 -	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
 +	@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
  	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
  
- 
  package-win32-installer: $(SUBMAKEFILES)
  	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
  
  langpack: langpack-$(AB_CD)
  
+ ifdef MOZ_UPDATER
+@@ -151,15 +151,15 @@ l10n-check::
+ 	$(MAKE) installers-x-test L10NBASEDIR='$(PWD)'
+ 
  # This is a generic target that will make a langpack, repack ZIP (+tarball)
- # builds, and repack an installer if applicable. It is called from the
+ # builds, and repack and installer if applicable. It is called from the
  # tinderbox scripts. Alter it with caution.
- 
  installers-%: IS_LANGUAGE_REPACK=1
  installers-%:
  	@$(MAKE) clobber-$*
@@ -76,5 +78,3 @@ diff --git a/mail/locales/Makefile.in b/mail/locales/Makefile.in
  	@$(MAKE) package-win32-installer AB_CD=$*
  endif
  	@echo 'repackaging done'
- 
- ifdef MOZ_UPDATER

bug1240930-253/comm/1468240-port-1437942-mail-62a1.patch

@@ -6,32 +6,20 @@
 Bug 1468240 - Move searchplugins to mail directory. rs=jorgk DONTBUILD
 
 diff --git a/mail/components/search/jar.mn b/mail/components/search/jar.mn
-new file mode 100644
---- /dev/null
+--- a/mail/components/search/jar.mn
 +++ b/mail/components/search/jar.mn
-@@ -0,0 +1,8 @@
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+messenger.jar:
+@@ -1,8 +1,11 @@
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ messenger.jar:
+ %   overlay chrome://messenger/content/messenger.xul            chrome://messenger/content/search/searchOverlay.xul
+     content/messenger/search/searchOverlay.xul                  (content/searchOverlay.xul)
+     content/messenger/search/searchOverlay.js                   (content/searchOverlay.js)
 +        searchplugins/                                              (searchplugins/**)
 +
 +% resource search-plugins %searchplugins/
-diff --git a/mail/components/search/moz.build b/mail/components/search/moz.build
---- a/mail/components/search/moz.build
-+++ b/mail/components/search/moz.build
-@@ -12,8 +12,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
-     EXTRA_PP_JS_MODULES += ['WinSearchIntegration.js']
-     FINAL_LIBRARY = 'mailcomps'
- 
- DIRS += ['public']
- 
- EXTRA_PP_JS_MODULES += [
-     'SearchIntegration.js',
- ]
-+
-+JAR_MANIFESTS += ['jar.mn']
 diff --git a/mail/locales/en-US/searchplugins/bing.xml b/mail/components/search/searchplugins/bing.xml
 rename from mail/locales/en-US/searchplugins/bing.xml
 rename to mail/components/search/searchplugins/bing.xml
@@ -106,19 +94,19 @@ diff --git a/mail/locales/Makefile.in b/mail/locales/Makefile.in
  	$(NSINSTALL) -D $(DIST)/install
  	@$(MAKE) -C $(DEPTH)/toolkit/locales libs-$*  XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
  	@$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
- 	@$(MAKE) -C $(DEPTH)/devtools/shim/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
  	@$(MAKE) -C ../../chat/locales AB_CD=$* XPI_NAME=locale-$*
  	@$(MAKE) -C ../../calendar/locales AB_CD=$* XPI_NAME=locale-$*
  	@$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
+ 	@$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$*
 -	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
  	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
  	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
  
- 
  package-win32-installer: $(SUBMAKEFILES)
  	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
  
  langpack: langpack-$(AB_CD)
+ 
 diff --git a/mail/locales/filter.py b/mail/locales/filter.py
 --- a/mail/locales/filter.py
 +++ b/mail/locales/filter.py
@@ -138,7 +126,7 @@ diff --git a/mail/locales/filter.py b/mail/locales/filter.py
 diff --git a/mail/locales/jar.mn b/mail/locales/jar.mn
 --- a/mail/locales/jar.mn
 +++ b/mail/locales/jar.mn
-@@ -225,18 +225,16 @@
+@@ -215,19 +215,16 @@
    locale/@AB_CD@/messenger/downloadsOverlay.dtd                         (%chrome/messenger/downloadsOverlay.dtd)
    locale/@AB_CD@/messenger/chat.dtd                                     (%chrome/messenger/chat.dtd)
    locale/@AB_CD@/messenger/chat.properties                              (%chrome/messenger/chat.properties)
@@ -147,6 +135,7 @@ diff --git a/mail/locales/jar.mn b/mail/locales/jar.mn
    locale/@AB_CD@/messenger/imAccounts.properties                        (%chrome/messenger/imAccounts.properties)
    locale/@AB_CD@/messenger/imAccountWizard.dtd                          (%chrome/messenger/imAccountWizard.dtd)
    locale/@AB_CD@/messenger/sanitize.dtd									(%chrome/messenger/sanitize.dtd)
+-% resource search-plugins chrome://messenger/locale/searchplugins/
 -  locale/@AB_CD@/messenger/searchplugins/list.json                      (.deps/generated_@AB_CD@/list.json)
 -  locale/@AB_CD@/messenger/searchplugins/                               (.deps/generated_@AB_CD@/*.xml)
  % locale messenger-mapi @AB_CD@ %locale/@AB_CD@/messenger-mapi/

bug1240930-253/comm/1639866-1-port-1437942-suite-277.patch

@@ -374,7 +374,7 @@ rename to suite/components/search/searchplugins/zoznam-sk.xml
 diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
 --- a/suite/locales/Makefile.in
 +++ b/suite/locales/Makefile.in
-@@ -41,45 +41,27 @@ MOZ_SFX_PACKAGE=$(topsrcdir)/comm/other-
+@@ -42,45 +42,27 @@ MOZ_SFX_PACKAGE=$(topsrcdir)/comm/other-
  NON_OMNIJAR_FILES = \
  	defaults/messenger/mailViews.dat \
  	defaults/profile/panels.rdf \
@@ -430,8 +430,8 @@ diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
  endif
  	@$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 -	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
+ 	@$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$*
  	@$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$*
- 	@$(MAKE) -C $(DEPTH)/devtools/shim/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
  	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
  	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
  

bug1240930-253/comm/1650631-port-1240930-suite-277.patch

@@ -28,14 +28,14 @@ diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
  # pulls. You may override them if you provide your own files.
  ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
  
-@@ -96,35 +96,35 @@ libs:: $(call MERGE_FILES,$(addprefix pr
+@@ -96,35 +96,35 @@ libs:: $(FINAL_TARGET)/defaults/profile/
+ libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
  	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
  
  # Extend l10n.mk clobber-% target for our localised extensions
- ifdef MOZ_IRC
+ # always clobber them even if not built.
  clobber-extensions-%:
  	$(RM) -rf $(DIST)/xpi-stage/chatzilla-$* $(DIST)/xpi-stage/chatzilla-*.$*.xpi
- endif
  
 -libs-%: AB_CD=$*
 -libs-%:
@@ -57,8 +57,8 @@ diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
  	@$(MAKE) -C ../extensions/debugQA/locales AB_CD=$* XPI_NAME=locale-$*
  endif
  	@$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
+ 	@$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$*
  	@$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$*
- 	@$(MAKE) -C $(DEPTH)/devtools/shim/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 -	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
 +	@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
  	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*