Add missing bug 1519902, build with cZ and DOMI again, and add repack and distribution options to locales Makefile.in

rel-esr52/comm/patches/1519902-imagecache.patch

@@ -0,0 +1,29 @@
+
+# HG changeset patch
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
+# Parent  0b25488876e3fb14f1cef7a5cc9e9046b3b5c8ba
+Bug 1519902 - Use current document for imageCache.findEntryProperties(). r=IanN a=IanN
+Port Bug 1202085 part 2 [Do not store images that have been synthesized by a service worker in the image cache].
+
+diff --git a/suite/common/nsContextMenu.js b/suite/common/nsContextMenu.js
+--- a/suite/common/nsContextMenu.js
++++ b/suite/common/nsContextMenu.js
+@@ -76,17 +76,17 @@ nsContextMenu.prototype = {
+ 
+     var contentType = null;
+     var contentDisposition = null;
+     if (this.onImage) {
+       try {
+         let imageCache = Components.classes["@mozilla.org/image/tools;1"]
+                                    .getService(Components.interfaces.imgITools)
+                                    .getImgCacheForDocument(doc);
+-        let props = imageCache.findEntryProperties(popupNode.currentURI);
++        let props = imageCache.findEntryProperties(popupNode.currentURI, doc);
+         if (props) {
+           let nsISupportsCString = Components.interfaces.nsISupportsCString;
+           contentType = props.get("type", nsISupportsCString).data;
+           try {
+             contentDisposition = props.get("content-disposition",
+                                            nsISupportsCString).data;
+           } catch (e) {}
+         }

rel-esr52/comm/patches/build_cz_domi.diff

@@ -0,0 +1,183 @@
+# HG changeset patch
+# User seabld
+# Parent  282b3932982311c4f788b2e0ddd38b635d8e89cb
+Start building Chatzilla and DOM Inspector again (partial backout of Bug 1346939)
+
+diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
+--- a/suite/app/Makefile.in
++++ b/suite/app/Makefile.in
+@@ -93,16 +93,17 @@ endef # do not remove the blank line!
+ DONOTPACK = {e2fda1a4%
+ 
+ pack-ext: $(STAGEDIST)
+ 	@echo "Packaging extensions..."
+ 	$(foreach dir,$(filter-out $(DONOTPACK),$(subst $(STAGEDIST)/,,$(wildcard $(STAGEDIST)/*))),$(_PACKAGE_EXTENSIONS))
+ 
+ tools::
+ 	@$(MAKE) pack-ext STAGEDIST="$(DIST)/bin/extensions"
++	@$(MAKE) pack-ext STAGEDIST="$(DIST)/bin/distribution/extensions"
+ 
+ endif
+ 
+ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+ # Anything below the above ifdef won't be included in mac builds. So be very
+ # careful what you add here.
+ 
+ MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
+diff --git a/suite/confvars.sh b/suite/confvars.sh
+--- a/suite/confvars.sh
++++ b/suite/confvars.sh
+@@ -8,17 +8,17 @@ MOZ_APP_VENDOR=Mozilla
+ MOZ_APP_NAME=seamonkey
+ MOZ_APP_DISPLAYNAME=SeaMonkey
+ MOZ_LDAP_XPCOM=1
+ MOZ_COMPOSER=1
+ MOZ_DISABLE_EXPORT_JS=1
+ MOZ_SUITE=1
+ MOZ_BRANDING_DIRECTORY=suite/branding/nightly
+ MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly
+-MOZ_EXTENSIONS_DEFAULT=" gio"
++MOZ_EXTENSIONS_DEFAULT=" inspector irc gio"
+ MOZ_UPDATER=1
+ # This should usually be the same as the value MAR_CHANNEL_ID.
+ # If more than one ID is needed, then you should use a comma separated list
+ # of values.
+ ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-release
+ # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
+ MAR_CHANNEL_ID=seamonkey-comm-release
+ MOZ_MORK=1
+diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in
+--- a/suite/installer/package-manifest.in
++++ b/suite/installer/package-manifest.in
+@@ -899,16 +899,61 @@ bin/libfreebl_32int64_3.so
+ @BINPATH@/llvm-symbolizer
+ #endif
+ #endif
+ 
+ #if defined(MOZ_ASAN) && defined(CLANG_CL)
+ @BINPATH@/clang_rt.asan_dynamic-i386.dll
+ #endif
+ 
++[chatzilla]
++#ifdef MOZ_OMNIJAR
++@RESPATH@/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
++#else
++@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/chatzilla@JAREXT@
++#ifdef MOZ_GTK
++@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.xpm
++@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window16.xpm
++#elifdef XP_WIN32
++@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.ico
++#endif
++@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome.manifest
++@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js
++@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/components.list
++@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/install.rdf
++#endif
++#ifdef LOCALE_BUILD
++#ifdef MOZ_OMNIJAR
++@RESPATH@/distribution/extensions/langpack-@AB_CD@@chatzilla.mozilla.org.xpi
++#else
++@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome/chatzilla@JAREXT@
++@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome.manifest
++@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.js
++@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.rdf
++#endif
++#endif
++
++[inspector]
++#ifdef MOZ_OMNIJAR
++@RESPATH@/distribution/extensions/inspector@mozilla.org.xpi
++#else
++@RESPATH@/extensions/inspector@mozilla.org/install.rdf
++@RESPATH@/extensions/inspector@mozilla.org/chrome.manifest
++@RESPATH@/extensions/inspector@mozilla.org/chrome/inspector@JAREXT@
++#ifdef MOZ_GTK
++@RESPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain16.xpm
++@RESPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain.xpm
++#elifdef XP_WIN32
++@RESPATH@/extensions/inspector@mozilla.org/platform/WINNT/chrome/icons/default/winInspectorMain.ico
++#endif
++@RESPATH@/extensions/inspector@mozilla.org/components/components.list
++@RESPATH@/extensions/inspector@mozilla.org/components/inspector-cmdline.js
++@RESPATH@/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
++#endif
++
+ [debugqa]
+ #ifdef MOZ_PACKAGE_DEBUGQA
+ #ifdef MOZ_OMNIJAR
+ @RESPATH@/distribution/extensions/debugQA@mozilla.org.xpi
+ #else
+ @RESPATH@/extensions/debugQA@mozilla.org/install.rdf
+ @RESPATH@/extensions/debugQA@mozilla.org/chrome.manifest
+ @RESPATH@/extensions/debugQA@mozilla.org/chrome/debugqa@JAREXT@
+diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
+--- a/suite/locales/Makefile.in
++++ b/suite/locales/Makefile.in
+@@ -109,21 +109,26 @@ PANELS_XTRA_FILE = $(call MERGE_FILE,pro
+ 	  profile/panels.rdf.in -o $@)
+ 
+ libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
+ libs:: $(FINAL_TARGET)/defaults/profile/panels.rdf ;
+ 
+ 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
++clobber-%:
++	$(RM) -rf $(DIST)/xpi-stage/chatzilla-$* $(DIST)/xpi-stage/chatzilla-*.$*.xpi
++
+ libs-%:
+ 	$(NSINSTALL) -D $(DIST)/install
+ 	@$(MAKE) -C $(DEPTH)/toolkit/locales libs-$*
+ 	@$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$*
+ 	@$(MAKE) -C ../../editor/ui/locales AB_CD=$* XPI_NAME=locale-$*
++	@$(MAKE) -C $(DEPTH)/extensions/irc/locales libs-$*
+ 	@$(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) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
+ 
+ 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)
+ 	@echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).'
+@@ -154,18 +159,20 @@ clobber-zip:
+ 	  $(STAGEDIST)/defaults/profile \
+ 	  $(STAGEDIST)/chrome/$(AB_CD) \
+ 	  $(STAGEDIST)/extensions/langpack-$(AB_CD)@* \
+ 	  $(STAGEDIST)/distribution/extensions/langpack-$(AB_CD)@* \
+ 
+ repackage-zip: repackage-extensions
+ 
+ repackage-extensions: $(STAGEDIST)
++	$(MAKE) -C $(DEPTH)/extensions/irc/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST)
+ ifeq ($(MOZ_PACKAGER_FORMAT),omni)
+ 	$(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST)/extensions;
++	$(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST)/distribution/extensions;
+ endif
+ 
+ repackage-zip-%: $(call ESCAPE_WILDCARD,$(ZIP_IN)) $(STAGEDIST) libs-%
+ 	@$(MAKE) repackage-zip AB_CD=$* ZIP_IN=$(ZIP_IN)
+ 
+ langpack: langpack-$(AB_CD)
+ 
+ ifdef MOZ_UPDATER
+@@ -203,16 +210,18 @@ merge-%:
+ ifdef LOCALE_MERGEDIR
+ 	$(RM) -rf $(LOCALE_MERGEDIR)
+ 	$(topsrcdir)/mozilla/mach compare-locales --merge-dir $(LOCALE_MERGEDIR) --l10n-ini $(srcdir)/l10n.ini $*
+ endif
+ 	@echo
+ 
+ .PHONY: repackage-extensions
+ 
++MOZ_PKG_EXTRAL10N += extensions/langpack-$(AB_CD)@chatzilla.mozilla.org=$(DIST)/xpi-stage/chatzilla-$(AB_CD)
++
+ ifdef MOZ_CALENDAR
+ LIGHTNING_PATH=$(DEPTH)/calendar/lightning
+ GDATA_PATH=$(DEPTH)/calendar/providers/gdata
+ 
+ define run-calendar-rule
+ $(MAKE) -C $(LIGHTNING_PATH) LOCALE_MERGEDIR=$(LOCALE_MERGEDIR) $(subst calendar-,,$@)
+ $(MAKE) -C $(GDATA_PATH) LOCALE_MERGEDIR=$(LOCALE_MERGEDIR) $(subst calendar-,,$@)
+ endef

rel-esr52/comm/patches/distribution.diff

@@ -0,0 +1,31 @@
+# HG changeset patch
+# User seabld
+# Parent  676ed501227651bf6991683206959955404549ca
+Add distribution to locales Makefile
+
+diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
+--- a/suite/locales/Makefile.in
++++ b/suite/locales/Makefile.in
+@@ -278,8 +278,22 @@ INSTALLERS_TARGETS = clobber-% langpack-
+ installers-%: $(INSTALLERS_TARGETS)
+ 	@echo 'repackaging done'
+ 
+ repack-%: AB_CD=$*
+ repack-%:
+ 	make clobber-zip AB_CD=$(AB_CD)
+ 	make merge-$(AB_CD)
+ 	make installers-$(AB_CD) MOZ_MAKE_COMPLETE_MAR=1
++
++distribution:
++	$(MAKE) -C $(DEPTH)/tools/update-packaging complete-patch PKG_INST_PATH=
++	$(foreach locale,$(SHIPPED_LOCALES),$(MAKE) -C $(DEPTH)/suite/locales/ repack-$(locale) LOCALE_MERGEDIR=$(LOCALE_MERGEDIR) MOZ_MAKE_COMPLETE_MAR=1 ;)
++
++SHIPPED_LOCALES_FILE = $(topsrcdir)/suite/locales/shipped-locales
++ifeq ($(OS_ARCH), WINNT)
++SHIPPED_FILTER = -e linux -e osx
++else ifeq ($(OS_ARCH), Darwin)
++SHIPPED_FILTER = -e linux -e win32
++else
++SHIPPED_FILTER = -e osx -e win32
++endif
++SHIPPED_LOCALES := $(shell if test -f $(SHIPPED_LOCALES_FILE); then cat $(SHIPPED_LOCALES_FILE) |grep -v -e en-US $(SHIPPED_FILTER) | cut -d " " -f1; fi)

rel-esr52/comm/patches/repack.diff

@@ -0,0 +1,40 @@
+# HG changeset patch
+# Parent  8b53fcfb32b45772fee43ce5c266c5face2611e0
+Add repack to locales Makefile
+
+diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
+--- a/suite/locales/Makefile.in
++++ b/suite/locales/Makefile.in
+@@ -204,16 +204,17 @@ ident:
+ 	    $(STAGEDIST)/platform.ini Build SourceStamp
+ 	@printf 'buildid '
+ 	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
+ 	    $(STAGEDIST)/application.ini App BuildID
+ 
+ merge-%:
+ ifdef LOCALE_MERGEDIR
+ 	$(RM) -rf $(LOCALE_MERGEDIR)
++	$(MKDIR) -p $(LOCALE_MERGEDIR)
+ 	$(topsrcdir)/mozilla/mach compare-locales --merge-dir $(LOCALE_MERGEDIR) --l10n-ini $(srcdir)/l10n.ini $*
+ endif
+ 	@echo
+ 
+ .PHONY: repackage-extensions
+ 
+ MOZ_PKG_EXTRAL10N += extensions/langpack-$(AB_CD)@chatzilla.mozilla.org=$(DIST)/xpi-stage/chatzilla-$(AB_CD)
+ 
+@@ -271,8 +272,14 @@ CALENDAR_INSTALLERS_TARGETS = calendar-m
+ endif
+ 
+ # This is a generic target that will make a langpack, repack ZIP (+tarball)
+ # builds, and repack and installer if applicable. It is called from the
+ # tinderbox scripts. Alter it with caution.
+ INSTALLERS_TARGETS = clobber-% langpack-% repackage-win32-installer-% repackage-zip-%
+ installers-%: $(INSTALLERS_TARGETS)
+ 	@echo 'repackaging done'
++
++repack-%: AB_CD=$*
++repack-%:
++	make clobber-zip AB_CD=$(AB_CD)
++	make merge-$(AB_CD)
++	make installers-$(AB_CD) MOZ_MAKE_COMPLETE_MAR=1

rel-esr52/comm/patches/series

@@ -1 +1,5 @@
 client_repo.diff
+1519902-imagecache.patch
+build_cz_domi.diff
+repack.diff
+distribution.diff