remove bug1240930-253

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

@@ -1,90 +0,0 @@
-# HG changeset patch
-# User Geoff Lankow <geoff@darktrojan.net>
-# Date 1593577763 -43200
-# Node ID 8b55e4dbec550ee94581636afcb8661a82200f92
-# Parent  926e7403d2a87e3bd461a02a0594aca7dab92980
-Port bug 1240930 - Rename the libs-% targets for l10n repacks to l10n-%. rs=bustage-fix
-
-diff --git a/mail/locales/Makefile.in b/mail/locales/Makefile.in
---- a/mail/locales/Makefile.in
-+++ b/mail/locales/Makefile.in
-@@ -13,17 +13,17 @@ EN_US_OR_L10N_FILE = $(firstword \
- 	$(wildcard $(srcdir)/en-US/$(1)) \
- 	$(LOCALE_SRCDIR)/$(1) )
- 
- SUBMAKEFILES += \
- 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
- 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
- 	$(NULL)
- 
--# This makefile uses variable overrides from the libs-% target to
-+# This makefile uses variable overrides from the l10n-% target to
- # build non-default locales to non-default dist/ locations. Be aware!
- 
- PWD := $(CURDIR)
- 
- # These are defaulted to be compatible with the files the wget-en-US target
- # pulls. You may override them if you provide your own files.
- ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
- 
-@@ -57,38 +57,38 @@ DIST_SUBDIRS = $(DIST_SUBDIR)
- include $(moztopsrcdir)/config/rules.mk
- 
- ifeq ($(commreltopsrcdir),comm)
- COMPARE_LOCALES_DEFINES += -Dmozilla=..
- endif
- 
- include $(moztopsrcdir)/toolkit/locales/l10n.mk
- 
--libs-%: AB_CD=$*
--libs-%:
-+l10n-%: AB_CD=$*
-+l10n-%:
- # merge if we're not en-US. Conditional function because
- # we need the current value of AB_CD.
- 	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
- 	$(NSINSTALL) -D $(DIST)/install
--	@$(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 ../../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
--libs:: $(call MERGE_FILE,updater/updater.ini) $(call mkdir_deps,$(DIST)/bin)
-+misc:: $(call MERGE_FILE,updater/updater.ini) $(call mkdir_deps,$(DIST)/bin)
- ifeq ($(OS_ARCH),WINNT)
- 	cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \
- 	  sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \
- 	  sed -e 's/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/' > \
- 	  $(FINAL_TARGET)/updater.ini
- else
- 	cat $< | \
- 	  sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \
-@@ -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 and installer if applicable. It is called from the
- # tinderbox scripts. Alter it with caution.
- installers-%: IS_LANGUAGE_REPACK=1
- installers-%:
- 	@$(MAKE) clobber-$*
--	@$(MAKE) libs-$*
-+	@$(MAKE) l10n-$*
- 	@$(MAKE) package-langpack-$*
- 	@$(MAKE) repackage-zip-$*
- ifeq (WINNT,$(OS_ARCH))
- 	@$(MAKE) package-win32-installer AB_CD=$*
- endif
- 	@echo 'repackaging done'

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

@@ -1,152 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1593598391 14400
-#      Wed Jul 01 06:13:11 2020 -0400
-# Parent  6f533dd49d3e0fac01f1ffbf45258ae7a97dc26e
-Bug 1650631 - Rename the libs-% targets for l10n repacks to l10n-%. r=frg
-Port bug 1240930 - Move jar_maker to the misc tier.
-
-diff --git a/suite/extensions/irc/locales/Makefile.in b/suite/extensions/irc/locales/Makefile.in
---- a/suite/extensions/irc/locales/Makefile.in
-+++ b/suite/extensions/irc/locales/Makefile.in
-@@ -50,29 +50,29 @@ APP_DEFINES = $(firstword $(wildcard $(L
- 
- TK_DEFINES = $(firstword \
-              $(wildcard $(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc) \
-              $(MOZILLA_DIR)/toolkit/locales/en-US/defines.inc)
- 
- include $(topsrcdir)/config/rules.mk
- 
- ifneq (en-US,$(AB_CD))
--libs realchrome::
-+misc realchrome::
- 	@echo "Comparing $(AB_CD) to en-US"
- 	@$(PERL) $(topsrcdir)/toolkit/locales/compare-locales.pl $(srcdir)/en-US $(LOCALE_SRCDIR)
- 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \
- 	  -DTK_DEFINES=$(TK_DEFINES) -DAPP_DEFINES=$(APP_DEFINES) \
- 	  $(srcdir)/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf)
- endif
- 
--libs-%: AB_CD=$*
--libs-%:
-+l10n-%: AB_CD=$*
-+l10n-%:
- 	# XXX: it would be nice if we could just do nothing if no langpack is being done
- 	#  currently, we just go and (re)build en-US if called with a non-supported locale
--	$(MAKE) libs AB_CD=$*
-+	$(MAKE) l10n AB_CD=$*
- 
- repackage-zip: $(STAGEDIST)
- ifneq (en-US,$(AB_CD))
- 	$(RM) -rf $(STAGEDIST)/extensions/$(INSTALL_EXTENSION_ID)
- 	mkdir $(STAGEDIST)/extensions/$(INSTALL_EXTENSION_ID)
- 	if test -d "$(DIST)/xpi-stage/$(XPI_NAME)/chrome/chatzilla.jar"; then \
- 	  $(RM) -r $(DIST)/xpi-stage/$(XPI_NAME)/chrome/chatzilla;\
- 	fi
-diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
---- a/suite/locales/Makefile.in
-+++ b/suite/locales/Makefile.in
-@@ -9,17 +9,17 @@ include $(topsrcdir)/config/config.mk
- 
- MERGE_FILES = $(foreach f,$(1),$(call MERGE_FILE,$(f)))
- 
- SUBMAKEFILES += \
- 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
- 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
- 	$(NULL)
- 
--# This makefile uses variable overrides from the libs-% target to
-+# This makefile uses variable overrides from the l10n-% target to
- # build non-default locales to non-default dist/ locations. Be aware!
- 
- PWD := $(CURDIR)
- 
- # These are defaulted to be compatible with the files the wget-en-US target
- # pulls. You may override them if you provide your own files.
- ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
- 
-@@ -85,46 +85,46 @@ PANELS_XTRA_FILE = $(call MERGE_FILE,pro
- 	$(NSINSTALL) -D profile
- 	cp $^ profile/
- 	sed \
- 	  -n 's/.*<RDF:Description about="\(.*\)">.*/        <RDF:li resource="\1"\/>/p' \
- 	  profile/panels.extra > profile/panels-urn.inc
- 	$(call py_action,preprocessor, \
- 	  profile/panels.rdf.in -o $@)
- 
--libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
--libs:: $(FINAL_TARGET)/defaults/profile/panels.rdf ;
-+misc:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
-+misc:: $(FINAL_TARGET)/defaults/profile/panels.rdf ;
- 
--libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
-+misc:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
- 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
- 
- # Extend l10n.mk clobber-% target for our localised extensions
- # always clobber them even if not built.
- clobber-extensions-%:
- 	$(RM) -rf $(DIST)/xpi-stage/chatzilla-$* $(DIST)/xpi-stage/chatzilla-*.$*.xpi
- 
--libs-%: AB_CD=$*
--libs-%:
-+l10n-%: AB_CD=$*
-+l10n-%:
- # merge if we're not en-US. Conditional function because
- # we need the current value of AB_CD.
- 	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
- 	$(NSINSTALL) -D $(DIST)/install
--	@$(MAKE) -C $(DEPTH)/toolkit/locales libs-$*
-+	@$(MAKE) -C $(DEPTH)/toolkit/locales l10n-$*
- #	@$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$*
- 	@$(MAKE) -C ../../calendar/locales AB_CD=$* XPI_NAME=locale-$*
- ifdef MOZ_IRC
--	@$(MAKE) -C ../extensions/irc/locales libs-$*
-+	@$(MAKE) -C ../extensions/irc/locales l10n-$*
- endif
- ifdef MOZ_DEBUGQA
- 	@$(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) 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
- 
- repackage-extensions: $(STAGEDIST)
- ifdef MOZ_IRC
- 	$(MAKE) -C ../extensions/irc/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST)
-@@ -137,27 +137,27 @@ langpack: langpack-$(AB_CD)
- # 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-$*
- ifdef MOZ_IRC
- 	@$(MAKE) clobber-extensions-%*
- endif
--	@$(MAKE) libs-$*
-+	@$(MAKE) l10n-$*
- 	@$(MAKE) package-langpack-$*
- 	@$(MAKE) repackage-zip-$*
- 	@$(MAKE) repackage-extensions AB_CD=$*
- ifeq (WINNT,$(OS_ARCH))
- 	@$(MAKE) package-win32-installer AB_CD=$*
- endif
- 	@echo 'repackaging done'
- 
- ifdef MOZ_UPDATER
--libs:: $(call MERGE_FILE,updater/updater.ini) $(call mkdir_deps,$(DIST)/bin)
-+misc:: $(call MERGE_FILE,updater/updater.ini) $(call mkdir_deps,$(DIST)/bin)
- ifeq ($(OS_ARCH),WINNT)
- 	cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \
- 	  sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \
- 	  sed -e 's/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/' > \
- 	  $(FINAL_TARGET)/updater.ini
- else
- 	cat $< | \
- 	  sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \

bug1240930-253/comm/series-append

@@ -1,2 +0,0 @@
-1240930-mail-80a1.patch
-1650631-port-1240930-suite-277.patch

bug1240930-253/mozilla/1240930-80a1.patch

@@ -1,440 +0,0 @@
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1593552872 0
-# Node ID 22a1bfea8f7b108e24ebfd6c2539bcd524f8326b
-# Parent  3e0248a432be89e7016e5ef81736d418f8cbc4f0
-Bug 1240930 - Move jar_maker to the misc tier. r=firefox-build-system-reviewers,geckoview-reviewers,rstewart,agi
-
-Because jar_maker is not in the libs tier, we also rename the libs-%
-targets for l10n repacks to l10n-%, which make it clearer what they are
-for.
-
-And because multilocale.txt is both a GeneratedFile and a file that is
-generated (and installed) via manual build rules, keeping it in the misc
-target actually breaks building in toolkit/locales during l10n repacks,
-so move it to libs for now.
-
-Differential Revision: https://phabricator.services.mozilla.com/D81766
-
-diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
---- a/browser/locales/Makefile.in
-+++ b/browser/locales/Makefile.in
-@@ -6,17 +6,17 @@
- include $(topsrcdir)/config/config.mk
- 
- 
- SUBMAKEFILES += \
- 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
- 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
- 	$(NULL)
- 
--# This makefile uses variable overrides from the libs-% target to
-+# This makefile uses variable overrides from the l10n-% target to
- # build non-default locales to non-default dist/ locations. Be aware!
- 
- PWD := $(CURDIR)
- 
- # These are defaulted to be compatible with the files the wget-en-US target
- # pulls. You may override them if you provide your own files.
- ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
- 
-@@ -42,29 +42,29 @@ endif
- # Required for l10n.mk - defines a list of app sub dirs that should
- # be included in langpack xpis.
- DIST_SUBDIRS = $(DIST_SUBDIR)
- 
- include $(topsrcdir)/config/rules.mk
- 
- include $(topsrcdir)/toolkit/locales/l10n.mk
- 
--libs-%: AB_CD=$*
--libs-%:
-+l10n-%: AB_CD=$*
-+l10n-%:
- 	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
- 	$(NSINSTALL) -D $(DIST)/install
--	@$(MAKE) -C ../../toolkit/locales libs-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
-+	@$(MAKE) -C ../../toolkit/locales l10n-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
- 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
- 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
- ifneq (,$(wildcard ../extensions/formautofill/locales))
- 	@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
- endif
- 	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$*
- 	@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
--	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
-+	@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
- 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
- 
- chrome-%: AB_CD=$*
- chrome-%: IS_LANGUAGE_REPACK=1
- chrome-%:
- 	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
- 	@$(MAKE) -C ../../toolkit/locales chrome-$*
- 	@$(MAKE) -C ../../services/sync/locales chrome AB_CD=$*
-@@ -84,17 +84,17 @@ langpack: langpack-$(AB_CD)
- 
- # 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
- # tinderbox scripts. Alter it with caution.
- 
- installers-%: IS_LANGUAGE_REPACK=1
- installers-%:
- 	@$(MAKE) clobber-$*
--	@$(MAKE) libs-$*
-+	@$(MAKE) l10n-$*
- 	@$(MAKE) package-langpack-$*
- 	@$(MAKE) repackage-zip-$*
- ifeq (WINNT,$(OS_ARCH))
- 	@$(MAKE) package-win32-installer AB_CD=$*
- endif
- 	@echo 'repackaging done'
- 
- ident:
-diff --git a/config/rules.mk b/config/rules.mk
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -1223,22 +1223,26 @@ endif
- # no way langpacks will get packaged right, so error out.
- ifneq (,$(DIST_SUBDIR))
- ifndef XPI_ROOT_APPID
- $(error XPI_ROOT_APPID is not defined - langpacks will break.)
- endif
- endif
- endif
- 
--libs realchrome:: $(FINAL_TARGET)/chrome
-+misc realchrome:: $(FINAL_TARGET)/chrome
- 	$(call py_action,jar_maker,\
- 	  $(QUIET) -d $(FINAL_TARGET) \
- 	  $(MAKE_JARS_FLAGS) $(DEFINES) $(ACDEFINES) \
- 	  $(JAR_MANIFEST))
- 
-+ifdef AB_CD
-+.PHONY: l10n
-+l10n: misc ;
-+endif
- endif
- 
- endif
- 
- # When you move this out of the tools tier, please remove the corresponding
- # hacks in recursivemake.py that check if Makefile.in sets the variable.
- ifneq ($(XPI_PKGNAME),)
- tools realchrome::
-diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
---- a/python/mozbuild/mozbuild/backend/recursivemake.py
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -513,18 +513,16 @@ class RecursiveMakeBackend(CommonBackend
-         elif isinstance(obj, Defines):
-             self._process_defines(obj, backend_file)
- 
-         elif isinstance(obj, GeneratedFile):
-             if obj.required_before_compile:
-                 tier = 'export'
-             elif obj.required_during_compile:
-                 tier = None
--            elif obj.localized:
--                tier = 'libs'
-             else:
-                 tier = 'misc'
-             if tier:
-                 self._no_skip[tier].add(backend_file.relobjdir)
- 
-             # Localized generated files can use {AB_CD} and {AB_rCD} in their
-             # output paths.
-             if obj.localized:
-@@ -616,17 +614,17 @@ class RecursiveMakeBackend(CommonBackend
-            # with a different locale as input. IS_LANGUAGE_REPACK will reliably be set
-            # in this situation, so simply force the generation to run in that case.
-            force=force,
-            locale='--locale=$(AB_CD) ' if obj.localized else '',
-            script=obj.script,
-            method=obj.method))
- 
-         elif isinstance(obj, JARManifest):
--            self._no_skip['libs'].add(backend_file.relobjdir)
-+            self._no_skip['misc'].add(backend_file.relobjdir)
-             backend_file.write('JAR_MANIFEST := %s\n' % obj.path.full_path)
- 
-         elif isinstance(obj, RustProgram):
-             self._process_rust_program(obj, backend_file)
-             # Hook the program into the compile graph.
-             build_target = self._build_target_for_obj(obj)
-             self._compile_graph[build_target]
- 
-@@ -1497,16 +1495,19 @@ class RecursiveMakeBackend(CommonBackend
-                     else:
-                         install_manifest.add_link(f.full_path, dest)
-                 else:
-                     install_manifest.add_optional_exists(dest)
-                     objdir_files.append(self._pretty_path(f, backend_file))
-             install_location = '$(DEPTH)/%s' % mozpath.join(target, path)
-             if objdir_files:
-                 tier = 'export' if obj.install_target == 'dist/include' else 'misc'
-+                # We cannot generate multilocale.txt during misc at the moment.
-+                if objdir_files[0] == 'multilocale.txt':
-+                    tier = 'libs'
-                 self._add_install_target(backend_file, target_var, tier,
-                                          install_location, objdir_files)
-             if absolute_files:
-                 # Unfortunately, we can't use _add_install_target because on
-                 # Windows, the absolute file paths that we want to install
-                 # from often have spaces.  So we write our own rule.
-                 self._no_skip['misc'].add(backend_file.relobjdir)
-                 backend_file.write('misc::\n%s\n' %
-@@ -1555,37 +1556,37 @@ class RecursiveMakeBackend(CommonBackend
- 
-     def _process_localized_files(self, obj, files, backend_file):
-         target = obj.install_target
-         path = mozpath.basedir(target, ('dist/bin', ))
-         if not path:
-             raise Exception('Cannot install localized files to ' + target)
-         for i, (path, files) in enumerate(files.walk()):
-             name = 'LOCALIZED_FILES_%d' % i
--            self._no_skip['libs'].add(backend_file.relobjdir)
-+            self._no_skip['misc'].add(backend_file.relobjdir)
-             self._write_localized_files_files(files, name + '_FILES', backend_file)
-             # Use FINAL_TARGET here because some l10n repack rules set
-             # XPI_NAME to generate langpacks.
-             backend_file.write('%s_DEST = $(FINAL_TARGET)/%s\n' % (name, path))
--            backend_file.write('%s_TARGET := libs\n' % name)
-+            backend_file.write('%s_TARGET := misc\n' % name)
-             backend_file.write('INSTALL_TARGETS += %s\n' % name)
- 
-     def _process_localized_pp_files(self, obj, files, backend_file):
-         target = obj.install_target
-         path = mozpath.basedir(target, ('dist/bin', ))
-         if not path:
-             raise Exception('Cannot install localized files to ' + target)
-         for i, (path, files) in enumerate(files.walk()):
-             name = 'LOCALIZED_PP_FILES_%d' % i
--            self._no_skip['libs'].add(backend_file.relobjdir)
-+            self._no_skip['misc'].add(backend_file.relobjdir)
-             self._write_localized_files_files(files, name, backend_file)
-             # Use FINAL_TARGET here because some l10n repack rules set
-             # XPI_NAME to generate langpacks.
-             backend_file.write('%s_PATH = $(FINAL_TARGET)/%s\n' % (name, path))
--            backend_file.write('%s_TARGET := libs\n' % name)
-+            backend_file.write('%s_TARGET := misc\n' % name)
-             # Localized files will have different content in different
-             # localizations, and some preprocessed files may not have
-             # any preprocessor directives.
-             backend_file.write('%s_FLAGS := --silence-missing-directive-warnings\n' % name)
-             backend_file.write('PP_TARGETS += %s\n' % name)
- 
-     def _process_objdir_files(self, obj, files, backend_file):
-         # We can't use an install manifest for the root of the objdir, since it
-diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
---- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
-+++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
-@@ -454,54 +454,54 @@ class TestRecursiveMakeBackend(BackendTe
-     def test_localized_generated_files(self):
-         """Ensure LOCALIZED_GENERATED_FILES is handled properly."""
-         env = self._consume('localized-generated-files', RecursiveMakeBackend)
- 
-         backend_path = mozpath.join(env.topobjdir, 'backend.mk')
-         lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
- 
-         expected = [
--            'libs:: $(MDDEPDIR)/foo.xyz.stub',
-+            'misc:: $(MDDEPDIR)/foo.xyz.stub',
-             'foo.xyz: $(MDDEPDIR)/foo.xyz.stub ;',
-             'GARBAGE += foo.xyz',
-             'GARBAGE += $(MDDEPDIR)/foo.xyz.stub',
-             'EXTRA_MDDEPEND_FILES += foo.xyz.pp',
-             '$(MDDEPDIR)/foo.xyz.stub: %s/generate-foo.py $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input $(if $(IS_LANGUAGE_REPACK),FORCE)' % env.topsrcdir,
-             '$(REPORT_BUILD)',
-             '$(call py_action,file_generate,--locale=$(AB_CD) %s/generate-foo.py main foo.xyz $(MDDEPDIR)/foo.xyz.pp $(MDDEPDIR)/foo.xyz.stub $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input)' % env.topsrcdir,
-             '@$(TOUCH) $@',
-             '',
-             'LOCALIZED_FILES_0_FILES += foo.xyz',
-             'LOCALIZED_FILES_0_DEST = $(FINAL_TARGET)/',
--            'LOCALIZED_FILES_0_TARGET := libs',
-+            'LOCALIZED_FILES_0_TARGET := misc',
-             'INSTALL_TARGETS += LOCALIZED_FILES_0',
-         ]
- 
-         self.maxDiff = None
-         self.assertEqual(lines, expected)
- 
-     def test_localized_generated_files_force(self):
-         """Ensure LOCALIZED_GENERATED_FILES with .force is handled properly."""
-         env = self._consume('localized-generated-files-force', RecursiveMakeBackend)
- 
-         backend_path = mozpath.join(env.topobjdir, 'backend.mk')
-         lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
- 
-         expected = [
--            'libs:: $(MDDEPDIR)/foo.xyz.stub',
-+            'misc:: $(MDDEPDIR)/foo.xyz.stub',
-             'foo.xyz: $(MDDEPDIR)/foo.xyz.stub ;',
-             'GARBAGE += foo.xyz',
-             'GARBAGE += $(MDDEPDIR)/foo.xyz.stub',
-             'EXTRA_MDDEPEND_FILES += foo.xyz.pp',
-             '$(MDDEPDIR)/foo.xyz.stub: %s/generate-foo.py $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input $(if $(IS_LANGUAGE_REPACK),FORCE)' % env.topsrcdir,
-             '$(REPORT_BUILD)',
-             '$(call py_action,file_generate,--locale=$(AB_CD) %s/generate-foo.py main foo.xyz $(MDDEPDIR)/foo.xyz.pp $(MDDEPDIR)/foo.xyz.stub $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input)' % env.topsrcdir,
-             '@$(TOUCH) $@',
-             '',
--            'libs:: $(MDDEPDIR)/abc.xyz.stub',
-+            'misc:: $(MDDEPDIR)/abc.xyz.stub',
-             'abc.xyz: $(MDDEPDIR)/abc.xyz.stub ;',
-             'GARBAGE += abc.xyz',
-             'GARBAGE += $(MDDEPDIR)/abc.xyz.stub',
-             'EXTRA_MDDEPEND_FILES += abc.xyz.pp',
-             '$(MDDEPDIR)/abc.xyz.stub: %s/generate-foo.py $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input FORCE' % env.topsrcdir,
-             '$(REPORT_BUILD)',
-             '$(call py_action,file_generate,--locale=$(AB_CD) %s/generate-foo.py main abc.xyz $(MDDEPDIR)/abc.xyz.pp $(MDDEPDIR)/abc.xyz.stub $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input)' % env.topsrcdir,
- +            '@$(TOUCH) $@',
-@@ -515,17 +515,17 @@ class TestRecursiveMakeBackend(BackendTe
-         """Ensure LOCALIZED_GENERATED_FILES is handled properly
-         when {AB_CD} and {AB_rCD} are used."""
-         env = self._consume('localized-generated-files-AB_CD', RecursiveMakeBackend)
- 
-         backend_path = mozpath.join(env.topobjdir, 'backend.mk')
-         lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
- 
-         expected = [
--            'libs:: $(MDDEPDIR)/foo$(AB_CD).xyz.stub',
-+            'misc:: $(MDDEPDIR)/foo$(AB_CD).xyz.stub',
-             'foo$(AB_CD).xyz: $(MDDEPDIR)/foo$(AB_CD).xyz.stub ;',
-             'GARBAGE += foo$(AB_CD).xyz',
-             'GARBAGE += $(MDDEPDIR)/foo$(AB_CD).xyz.stub',
-             'EXTRA_MDDEPEND_FILES += foo$(AB_CD).xyz.pp',
-             '$(MDDEPDIR)/foo$(AB_CD).xyz.stub: %s/generate-foo.py $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input $(if $(IS_LANGUAGE_REPACK),FORCE)' % env.topsrcdir,
-             '$(REPORT_BUILD)',
-             '$(call py_action,file_generate,--locale=$(AB_CD) %s/generate-foo.py main foo$(AB_CD).xyz $(MDDEPDIR)/foo$(AB_CD).xyz.pp $(MDDEPDIR)/foo$(AB_CD).xyz.stub $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input)' % env.topsrcdir,
-             '@$(TOUCH) $@',
-@@ -976,17 +976,17 @@ class TestRecursiveMakeBackend(BackendTe
-         backend_path = mozpath.join(env.topobjdir, 'backend.mk')
-         lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
- 
-         expected = [
-             'LOCALIZED_FILES_0_FILES += $(wildcard $(LOCALE_SRCDIR)/abc/*.abc)',
-             'LOCALIZED_FILES_0_FILES += $(call MERGE_FILE,bar.ini)',
-             'LOCALIZED_FILES_0_FILES += $(call MERGE_FILE,foo.js)',
-             'LOCALIZED_FILES_0_DEST = $(FINAL_TARGET)/',
--            'LOCALIZED_FILES_0_TARGET := libs',
-+            'LOCALIZED_FILES_0_TARGET := misc',
-             'INSTALL_TARGETS += LOCALIZED_FILES_0',
-         ]
- 
-         found = [str for str in lines if 'LOCALIZED_FILES' in str]
-         self.assertEqual(found, expected)
- 
-     def test_localized_pp_files(self):
-         """Test that LOCALIZED_PP_FILES is written to backend.mk correctly."""
-@@ -994,17 +994,17 @@ class TestRecursiveMakeBackend(BackendTe
- 
-         backend_path = mozpath.join(env.topobjdir, 'backend.mk')
-         lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
- 
-         expected = [
-             'LOCALIZED_PP_FILES_0 += $(call MERGE_FILE,bar.ini)',
-             'LOCALIZED_PP_FILES_0 += $(call MERGE_FILE,foo.js)',
-             'LOCALIZED_PP_FILES_0_PATH = $(FINAL_TARGET)/',
--            'LOCALIZED_PP_FILES_0_TARGET := libs',
-+            'LOCALIZED_PP_FILES_0_TARGET := misc',
-             'LOCALIZED_PP_FILES_0_FLAGS := --silence-missing-directive-warnings',
-             'PP_TARGETS += LOCALIZED_PP_FILES_0',
-         ]
- 
-         found = [str for str in lines if 'LOCALIZED_PP_FILES' in str]
-         self.assertEqual(found, expected)
- 
-     def test_config(self):
-diff --git a/toolkit/locales/Makefile.in b/toolkit/locales/Makefile.in
---- a/toolkit/locales/Makefile.in
-+++ b/toolkit/locales/Makefile.in
-@@ -1,21 +1,21 @@
- # 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/.
- 
- include $(topsrcdir)/config/rules.mk
- 
--libs-%: AB_CD=$*
--libs-%:
--	@$(MAKE) -C ../../netwerk/locales/ libs AB_CD=$* XPI_NAME=locale-$*
--	@$(MAKE) -C ../../dom/locales/ libs AB_CD=$* XPI_NAME=locale-$*
--	@$(MAKE) -C ../../security/manager/locales/ libs AB_CD=$* XPI_NAME=locale-$*
--	@$(MAKE) -C ../../devtools/shared/locales/ libs AB_CD=$* XPI_NAME=locale-$*
--	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$*
-+l10n-%: AB_CD=$*
-+l10n-%:
-+	@$(MAKE) -C ../../netwerk/locales/ l10n AB_CD=$* XPI_NAME=locale-$*
-+	@$(MAKE) -C ../../dom/locales/ l10n AB_CD=$* XPI_NAME=locale-$*
-+	@$(MAKE) -C ../../security/manager/locales/ l10n AB_CD=$* XPI_NAME=locale-$*
-+	@$(MAKE) -C ../../devtools/shared/locales/ l10n AB_CD=$* XPI_NAME=locale-$*
-+	@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$*
- 
- # target to be used by multi-locale l10n builds, just add this locale
- # like regular chrome code
- chrome-%: AB_CD=$*
- chrome-%:
- 	@$(MAKE) -C $(DEPTH)/netwerk/locales/ chrome AB_CD=$*
- 	@$(MAKE) -C $(DEPTH)/dom/locales/ chrome AB_CD=$*
- 	@$(MAKE) -C $(DEPTH)/security/manager/locales/ chrome AB_CD=$*
-diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk
---- a/toolkit/locales/l10n.mk
-+++ b/toolkit/locales/l10n.mk
-@@ -3,18 +3,18 @@
- # 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/.
- 
- 
- # Shared makefile that can be used to easily kick off l10n builds
- # of Mozilla applications.
- # This makefile should be included, and then assumes that the including
- # makefile defines the following targets:
--# libs-%
--#   This target should call into the various libs targets that this
-+# l10n-%
-+#   This target should call into the various l10n targets that this
- #   application depends on.
- # installer-%
- #   This target should list all required targets, a typical rule would be
- #	installers-%: clobber-% langpack-% repackage-zip-%
- #		@echo "repackaging done"
- #   to initially clobber the locale staging area, and then to build the
- #   language pack and zip package.
- #   Other targets like windows installers might be listed, too, and should
-@@ -22,17 +22,17 @@
- #   The installer-% targets should not set AB_CD, so that the unpackaging
- #   step finds the original package.
- # The including makefile should provide values for the variables
- #   MOZ_APP_VERSION and MOZ_LANGPACK_EID.
- 
- 
- run_for_effects := $(shell if test ! -d $(DIST); then $(NSINSTALL) -D $(DIST); fi)
- 
--# This makefile uses variable overrides from the libs-% target to
-+# This makefile uses variable overrides from the l10n-% target to
- # build non-default locales to non-default dist/ locations. Be aware!
- 
- LPROJ_ROOT = $(firstword $(subst -, ,$(AB_CD)))
- ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
- ifeq (zh-TW,$(AB_CD))
- LPROJ_ROOT := $(subst -,_,$(AB_CD))
- endif
- endif
-@@ -197,17 +197,17 @@ endif
- 	-$(MOZILLA_DIR)/mach compare-locales $(COMPARE_LOCALES_DEFINES) --merge $(BASE_MERGE) $(srcdir)/l10n.toml $(L10NBASEDIR) $*
- 
- langpack-%: IS_LANGUAGE_REPACK=1
- langpack-%: IS_LANGPACK=1
- langpack-%: libs-%
- langpack-%: AB_CD=$*
- langpack-%:
- 	@echo 'Making langpack $(LANGPACK_FILE)'
--	@$(MAKE) libs-$(AB_CD)
-+	@$(MAKE) l10n-$(AB_CD)
- 	@$(MAKE) package-langpack-$(AB_CD)
- 
- package-langpack-%: LANGPACK_FILE=$(ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
- package-langpack-%: XPI_NAME=locale-$*
- package-langpack-%: AB_CD=$*
- package-langpack-%:
- 	@echo 'Making langpack $(LANGPACK_FILE)'
- 	$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)

bug1240930-253/mozilla/1457321-1only-62a1.patch

@@ -1,74 +0,0 @@
-# HG changeset patch
-# User Kris Maglione <maglione.k@gmail.com>
-# Date 1524868975 25200
-# Node ID fe5d46cd794bfb3e8974d8213cb3fa752902ef3b
-# Parent  0dabdf7580cc81b98ffc96a9c7072df386bbf897
-Bug 1457321: Part 1 - Add bundled dictionaries to built_in_addons.json. r=ted,rhelmer
-
-MozReview-Commit-ID: GxCSXXaz8kz
-
-diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
---- a/browser/app/Makefile.in
-+++ b/browser/app/Makefile.in
-@@ -101,9 +101,9 @@ ifdef MOZ_UPDATER
- 	mv -f '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' '$(dist_dest)/Contents/Library/LaunchServices'
- 	ln -s ../../../../Library/LaunchServices/org.mozilla.updater '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater'
- endif
- 	printf APPLMOZB > '$(dist_dest)/Contents/PkgInfo'
- endif
- 
- .PHONY: features
- tools features::
--	$(PYTHON) -c 'import os, json; listing = {"system": sorted(os.listdir("$(DIST)/bin/browser/features"))}; print json.dumps(listing)' > $(DIST)/bin/browser/chrome/browser/content/browser/built_in_addons.json
-+	$(call py_action,generate_builtin_addons,--features=browser/features browser/chrome/browser/content/browser/built_in_addons.json)
-diff --git a/python/mozbuild/mozbuild/action/generate_builtin_addons.py b/python/mozbuild/mozbuild/action/generate_builtin_addons.py
-new file mode 100644
---- /dev/null
-+++ b/python/mozbuild/mozbuild/action/generate_builtin_addons.py
-@@ -0,0 +1,46 @@
-+# 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/.
-+
-+from __future__ import absolute_import, print_function, unicode_literals
-+
-+import argparse
-+import json
-+import os.path
-+import sys
-+
-+import buildconfig
-+
-+
-+def main(argv):
-+    parser = argparse.ArgumentParser(
-+        description='Produces a JSON manifest of built-in add-ons')
-+    parser.add_argument('--features', type=str, dest='featuresdir',
-+                        action='store', help=('The distribution sub-directory '
-+                                              'containing feature add-ons'))
-+    parser.add_argument('outputfile', help='File to write output to')
-+    args = parser.parse_args(argv)
-+
-+    bindir = os.path.join(buildconfig.topobjdir, 'dist/bin')
-+
-+    def find_dictionaries(path):
-+        dicts = {}
-+        for filename in os.listdir(os.path.join(bindir, path)):
-+            base, ext = os.path.splitext(filename)
-+            if ext == '.dic':
-+                dicts[base] = '%s/%s' % (path, filename)
-+        return dicts
-+
-+    listing = {
-+        "dictionaries": find_dictionaries("dictionaries"),
-+    }
-+    if args.featuresdir:
-+        listing["system"] = sorted(os.listdir(os.path.join(bindir,
-+                                                           args.featuresdir)))
-+
-+    with open(os.path.join(bindir, args.outputfile), 'w') as fh:
-+        json.dump(listing, fh, sort_keys=True)
-+
-+
-+if __name__ == '__main__':
-+    sys.exit(main(sys.argv[1:]))

bug1240930-253/mozilla/orig/1457524-3-61a1.patch

@@ -1,82 +0,0 @@
-# HG changeset patch
-# User Xidorn Quan <me@upsuper.org>
-# Date 1525255324 -36000
-# Node ID 4340083e6691e1d2aaec806461fd8d355fcf451b
-# Parent  12c4ce3c0ac903e917c168ea527dff9d768d2019
-Bug 1457524 part 3 - Check rustdoc for rust tests. r=froydnj
-
-MozReview-Commit-ID: 4qRccUcXq6O
-
-diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
---- a/build/moz.configure/rust.configure
-+++ b/build/moz.configure/rust.configure
-@@ -256,22 +256,33 @@ set_config('RUST_TARGET_ENV_NAME', rust_
- set_config('RUSTC_COMMIT', depends(rustc_info)(lambda i: i.commit))
- 
- set_config('RUSTC_VERSION', depends(rustc_info)(lambda i: str(i.version)))
- 
- # Until we remove all the other Rust checks in old-configure.
- add_old_configure_assignment('RUSTC', rustc)
- add_old_configure_assignment('RUST_TARGET', rust_target_triple)
- 
-+# Rustdoc is required by Rust tests below.
-+rustdoc = check_prog('RUSTDOC', add_rustup_path('rustdoc'), allow_missing=True)
-+
- # This option is separate from --enable-tests because Rust tests are particularly
- # expensive in terms of compile time (especially for code in libxul).
- option('--enable-rust-tests',
-        help='Enable building of Rust tests, and build-time execution of them')
- 
--set_config('MOZ_RUST_TESTS', depends('--enable-rust-tests')(lambda v: bool(v)))
-+
-+@depends('--enable-rust-tests', rustdoc)
-+def rust_tests(enable_rust_tests, rustdoc):
-+    if enable_rust_tests and not rustdoc:
-+        die('--enable-rust-tests requires rustdoc')
-+    return bool(enable_rust_tests)
-+
-+
-+set_config('MOZ_RUST_TESTS', rust_tests)
- 
- option(env='WIN64_LINK', nargs=1, help='Path to link.exe that targets win64')
- option(env='WIN64_LIB', nargs=1, help='Paths to libraries for the win64 linker')
- 
- set_config('WIN64_LINK', depends('WIN64_LINK')(lambda x: x))
- set_config('WIN64_LIB', depends('WIN64_LIB')(lambda x: x))
- 
- 
-diff --git a/build/mozconfig.rust b/build/mozconfig.rust
---- a/build/mozconfig.rust
-+++ b/build/mozconfig.rust
-@@ -1,9 +1,10 @@
- # Options to enable rust in automation builds.
- 
- TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
- 
- # Tell configure to use the tooltool rustc.
- RUSTC="$TOOLTOOL_DIR/rustc/bin/rustc"
- CARGO="$TOOLTOOL_DIR/rustc/bin/cargo"
-+RUSTDOC="$TOOLTOOL_DIR/rustc/bin/rustdoc"
- 
- ac_add_options --enable-rust-simd
-diff --git a/config/rules.mk b/config/rules.mk
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -893,16 +893,17 @@ endif
- 
- # We use the + prefix to pass down the jobserver fds to cargo, but we
- # don't use the prefix when make -n is used, so that cargo doesn't run
- # in that case)
- define RUN_CARGO
- $(if $(findstring n,$(filter-out --%, $(MAKEFLAGS))),,+)env $(environment_cleaner) $(rust_unlock_unstable) $(rustflags_override) $(sccache_wrap) \
- 	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
- 	RUSTC=$(RUSTC) \
-+	RUSTDOC=$(RUSTDOC) \
- 	MOZ_SRC=$(topsrcdir) \
- 	MOZ_DIST=$(ABS_DIST) \
- 	LIBCLANG_PATH="$(MOZ_LIBCLANG_PATH)" \
- 	CLANG_PATH="$(MOZ_CLANG_PATH)" \
- 	PKG_CONFIG_ALLOW_CROSS=1 \
- 	RUST_BACKTRACE=full \
- 	MOZ_TOPOBJDIR=$(topobjdir) \
- 	$(cargo_incremental) \

bug1240930-253/mozilla/orig/1457524-4-61a1.patch

@@ -1,40 +0,0 @@
-# HG changeset patch
-# User Xidorn Quan <me@upsuper.org>
-# Date 1525259227 -36000
-# Node ID 904aaf73eb3a620cb2ea3f44ee35243e0b385ca9
-# Parent  504919daeab8d70c4fb613c356a26ca516440aec
-Bug 1457524 part 4 - Allow 16% false positives in test bloom::create_and_insert_some_stuff. r=heycam
-
-It seems that the result of hash algorithm used in bloom filter depends
-on the pointer length. On 64bit platforms, there are 135 false positives
-in the first part of that test, and 8 in the second part. However, on
-32bit platforms, the numbers become 157 and 16 correspondingly.
-
-16 is still less than 20% in the second part, so all fine, but 157 is
-slightly larger than 15% in the test assertion. Given it is what we are
-shipping, we probably should just accept this and loosen the assertion.
-
-MozReview-Commit-ID: 9kFXBzLFAzE
-
-diff --git a/servo/components/selectors/bloom.rs b/servo/components/selectors/bloom.rs
---- a/servo/components/selectors/bloom.rs
-+++ b/servo/components/selectors/bloom.rs
-@@ -320,17 +320,17 @@ fn create_and_insert_some_stuff() {
- 
-     for i in 0_usize .. 1000 {
-         assert!(bf.might_contain(&i));
-     }
- 
-     let false_positives =
-         (1001_usize .. 2000).filter(|i| bf.might_contain(i)).count();
- 
--    assert!(false_positives < 150, "{} is not < 150", false_positives); // 15%.
-+    assert!(false_positives < 160, "{} is not < 160", false_positives); // 16%.
- 
-     for i in 0_usize .. 100 {
-         bf.remove(&i);
-     }
- 
-     for i in 100_usize .. 1000 {
-         assert!(bf.might_contain(&i));
-     }

bug1240930-253/mozilla/orig/1457524-5-61a1.patch

@@ -1,31 +0,0 @@
-# HG changeset patch
-# User Xidorn Quan <me@upsuper.org>
-# Date 1525226493 -36000
-# Node ID b4ac7ba11da57b93a53df945a1dae2bf21b214d2
-# Parent  d32b7b4964b3a8ebdebb5713d9e1bfdd788a06d2
-Bug 1457524 part 5 - Add crates with tests into the list of RUST_TESTS. r=froydnj,heycam
-
-MozReview-Commit-ID: AaENV1xKKTg
-
-diff --git a/toolkit/library/rust/moz.build b/toolkit/library/rust/moz.build
---- a/toolkit/library/rust/moz.build
-+++ b/toolkit/library/rust/moz.build
-@@ -6,11 +6,18 @@
- 
- include('gkrust-features.mozbuild')
- 
- RustLibrary('gkrust', gkrust_features, '..')
- 
- # Target directory doesn't matter a lot here, since we can't share panic=abort
- # compilation artifacts with gkrust.
- RUST_TESTS = [
-+    'selectors',
-+    'servo_arc',
-     'stylo_tests',
- ]
- RUST_TEST_FEATURES = gkrust_features
-+
-+if CONFIG['CPU_ARCH'] != 'x86':
-+    # malloc_size_of_derive is a build dependency, so if we are doing
-+    # cross-compile for x86, this may not run correctly.
-+    RUST_TESTS += ['malloc_size_of_derive']

bug1240930-253/mozilla/orig/1461881-62a1.patch

@@ -1,71 +0,0 @@
-# HG changeset patch
-# User Mike Shal <mshal@mozilla.com>
-# Date 1526485927 14400
-# Node ID b6306fd112d2d33f192ba4cae93edc8478d9ab7f
-# Parent  8a38e426dde23253b7709a6d20e53d62e73fab8d
-Bug 1461881 - Fix packager.mk file_generate actions; r=Pike
-
-Bug 1454912 added a new argument to the file_generate action to
-correspond to the make target in the generated dependencies file. These
-multilocale.txt targets in packager.mk need to add a parameter for this
-argument, otherwise the first locale will be silently used as the target
-and won't be included in the resulting multilocale.txt file.
-
-MozReview-Commit-ID: 3nW5Twj89VH
-
-diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
---- a/toolkit/mozapps/installer/packager.mk
-+++ b/toolkit/mozapps/installer/packager.mk
-@@ -186,24 +186,24 @@ else
- BASE_PATH:=@RESPATH@
- MULTILOCALE_DIR = $(DIST)/$(RESPATH)/res
- endif
- 
- # This version of the target uses MOZ_CHROME_MULTILOCALE to build multilocale.txt
- # and places it in dist/bin/res - it should be used when packaging a build.
- multilocale.txt: LOCALES?=$(MOZ_CHROME_MULTILOCALE)
- multilocale.txt:
--	$(call py_action,file_generate,$(MOZILLA_DIR)/toolkit/locales/gen_multilocale.py main '$(MULTILOCALE_DIR)/multilocale.txt' $(MDDEPDIR)/multilocale.txt.pp $(ALL_LOCALES))
-+	$(call py_action,file_generate,$(MOZILLA_DIR)/toolkit/locales/gen_multilocale.py main '$(MULTILOCALE_DIR)/multilocale.txt' $(MDDEPDIR)/multilocale.txt.pp '$(MULTILOCALE_DIR)/multilocale.txt' $(ALL_LOCALES))
- 
- # This version of the target uses AB_CD to build multilocale.txt and places it
- # in the $(XPI_NAME)/res dir - it should be used when repackaging a build.
- multilocale.txt-%: LOCALES?=$(AB_CD)
- multilocale.txt-%: MULTILOCALE_DIR=$(DIST)/xpi-stage/$(XPI_NAME)/res
- multilocale.txt-%:
--	$(call py_action,file_generate,$(MOZILLA_DIR)/toolkit/locales/gen_multilocale.py main '$(MULTILOCALE_DIR)/multilocale.txt' $(MDDEPDIR)/multilocale.txt.pp $(ALL_LOCALES))
-+	$(call py_action,file_generate,$(MOZILLA_DIR)/toolkit/locales/gen_multilocale.py main '$(MULTILOCALE_DIR)/multilocale.txt' $(MDDEPDIR)/multilocale.txt.pp '$(MULTILOCALE_DIR)/multilocale.txt' $(ALL_LOCALES))
- 
- locale-manifest.in: LOCALES?=$(MOZ_CHROME_MULTILOCALE)
- locale-manifest.in: $(GLOBAL_DEPS) FORCE
- 	printf '\n[multilocale]\n' > $@
- 	printf '$(BASE_PATH)/res/multilocale.txt\n' >> $@
- 	for LOCALE in $(ALL_LOCALES) ;\
- 	do \
- 	  for ENTRY in $(MOZ_CHROME_LOCALE_ENTRIES) ;\
-diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
-deleted file mode 100644
---- a/toolkit/xre/Makefile.in
-+++ /dev/null
-@@ -1,21 +0,0 @@
--# -*- makefile -*-
--# vim:set ts=8 sw=8 sts=8 noet:
--
--# 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/.
--
--milestone_txt = $(topsrcdir)/config/milestone.txt
--
--include $(topsrcdir)/config/rules.mk
--
--MOZ_BUILDID   := $(shell awk '{print $$3}' $(DEPTH)/buildid.h)
--$(call errorIfEmpty,GRE_MILESTONE MOZ_BUILDID)
--
--MK_COMPILE_DEFINES = -DMOZ_BUILDID=$(MOZ_BUILDID)
--
--# Note these dependencies are broken because the target is *not* the cpp file.
--# BUT, actually fixing it would make libxul rebuilt on every single incremental
--# build because of the automatic buildid change. This is why we can't actually
--# include buildid.h there, because it would add the dependency.
--$(srcdir)/nsAppRunner.cpp: $(DEPTH)/buildid.h $(milestone_txt)

bug1240930-253/mozilla/orig/1464381-62a1.patch

@@ -1,43 +0,0 @@
-# HG changeset patch
-# User Nick Alexander <nalexander@mozilla.com>
-# Date 1527287839 25200
-# Node ID eaefe57724c7cdf82de3dd524094cf119de734e6
-# Parent  12bfa62dcd976f8185c2842cd9bdaa4d39d58b0f
-Bug 1464381 - Fix check for NIGHTLY_BUILD. r=gps
-
-This was simply an oversight in the implementation of Bug 1464128.
-What's happening is that `set_config` in `moz.configure` is not
-unconditional, and NIGHTLY_BUILD is set in local builds and in B and N
-builds in automation, so there was no test of the other case, which
-promptly fails.  This re-uses a pattern successful in mobile/android
-for setting defines.
-
-MozReview-Commit-ID: 4zL4hVsqE3Q
-
-diff --git a/browser/locales/generate_bookmarks.py b/browser/locales/generate_bookmarks.py
---- a/browser/locales/generate_bookmarks.py
-+++ b/browser/locales/generate_bookmarks.py
-@@ -24,19 +24,22 @@ def main(output, bookmarks_html_in, book
-     # no localized input uses the preprocessor conditional #if (really,
-     # anything but #define), so it's safe to restrict the set of defines to
-     # what's used in mozilla-central directly.
-     defines = {}
-     defines['AB_CD'] = locale
-     if defines['AB_CD'] == 'ja-JP-mac':
-         defines['AB_CD'] = 'ja'
- 
--    defines['NIGHTLY_BUILD'] = CONFIG['NIGHTLY_BUILD']
-     defines['BOOKMARKS_INCLUDE_PATH'] = bookmarks_inc
- 
-+    for var in ('NIGHTLY_BUILD',):
-+        if var in CONFIG:
-+            defines[var] = CONFIG[var]
-+
-     includes = preprocessor.preprocess(includes=[bookmarks_html_in],
-                                        defines=defines,
-                                        output=output)
-     return includes
- 
- 
- if __name__ == "__main__":
-     main(sys.argv[1:])

bug1240930-253/mozilla/orig/series-append

@@ -1,18 +0,0 @@
-1457524-3-61a1.patch
-1457524-4-61a1.patch
-1457524-5-61a1.patch
-1443208-1only-62a1.patch
-1454912-2no1-62a1.patch
-1454912-3-62a1.patch
-1454912-4-62a1.patch
-1461881-62a1.patch
-1461383-62a1.patch
-1470552-62a1.patch
-1642032-1-79a1.patch
-1642032-2-79a1.patch
-1642032-3-79a1.patch
-1464128-62a1.patch
-1464381-62a1.patch
-1437942-62a1.patch
-1240930-80a1.patch
-1457321-1only-62a1.patch

bug1240930-253/mozilla/orig/series-old

@@ -1,14 +0,0 @@
-1443208-1only-62a1.patch
-1454912-2no1-62a1.patch
-1454912-3-62a1.patch
-1454912-4-62a1.patch
-1461383-62a1.patch
-1470552-62a1.patch
-1642032-1-79a1.patch
-1642032-2-79a1.patch
-1642032-3-79a1.patch
-1464128-PARTIAL-62a1.patch
-# stop here for now
-1437942-62a1.patch
-1240930-80a1.patch
-1457321-1only-62a1.patch

bug1240930-253/mozilla/series-append

@@ -1,3 +0,0 @@
-1240930-80a1.patch
-#StopHere
-1457321-1only-62a1.patch