From 2ddb294c26778111c51f065b7bf80c4c3cb99570 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 28 Nov 2019 00:17:32 -0500 Subject: [PATCH 1/6] Issue #1303 - Add langpack generation targets for Pale Moon and Basilisk * The langpack is not generated via the package target but IS for mozpackage target using old behavior * Add mach command to specifically generate the langpack when needed without the rest of the packaging routine (mach langpack) --- application/basilisk/build.mk | 5 ++++- application/basilisk/installer/Makefile.in | 6 +++++- application/palemoon/build.mk | 5 ++++- application/palemoon/installer/Makefile.in | 11 +++++++++-- python/mozbuild/mozbuild/mach_commands.py | 9 +++++++++ 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/application/basilisk/build.mk b/application/basilisk/build.mk index f78105d9d1..18bfb1f562 100644 --- a/application/basilisk/build.mk +++ b/application/basilisk/build.mk @@ -8,8 +8,11 @@ installer: package: @$(MAKE) -C application/basilisk/installer make-archive +l10n-package: + @$(MAKE) -C application/palemoon/installer make-langpack + mozpackage: - @$(MAKE) -C application/basilisk/installer make-package + @$(MAKE) -C application/basilisk/installer package-compare: @$(MAKE) -C application/basilisk/installer package-compare diff --git a/application/basilisk/installer/Makefile.in b/application/basilisk/installer/Makefile.in index 586a6eac7c..64273609ab 100644 --- a/application/basilisk/installer/Makefile.in +++ b/application/basilisk/installer/Makefile.in @@ -150,11 +150,15 @@ endif # Builds using the hybrid FasterMake/RecursiveMake backend will # fail to produce a langpack. See bug 1255096. -libs:: +make-langpack: ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS))) $(MAKE) -C $(DEPTH)/application/basilisk/locales langpack +else + @echo WARNING: "Language Pack was not generated due to using the hybrid FasterMake/RecursiveMake backend." >&2 endif +libs:: make-langpack + ifeq (WINNT,$(OS_ARCH)) PKGCOMP_FIND_OPTS = else diff --git a/application/palemoon/build.mk b/application/palemoon/build.mk index 8c0dd03b95..d4532fab06 100644 --- a/application/palemoon/build.mk +++ b/application/palemoon/build.mk @@ -8,8 +8,11 @@ installer: package: @$(MAKE) -C application/palemoon/installer make-archive +l10n-package: + @$(MAKE) -C application/palemoon/installer make-langpack + mozpackage: - @$(MAKE) -C application/palemoon/installer make-package + @$(MAKE) -C application/palemoon/installer package-compare: @$(MAKE) -C application/palemoon/installer package-compare diff --git a/application/palemoon/installer/Makefile.in b/application/palemoon/installer/Makefile.in index c02cdf96a0..b3c4cdaba8 100644 --- a/application/palemoon/installer/Makefile.in +++ b/application/palemoon/installer/Makefile.in @@ -156,9 +156,16 @@ endif endif endif - -libs:: +# Builds using the hybrid FasterMake/RecursiveMake backend will +# fail to produce a langpack. See bug 1255096. +make-langpack: +ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS))) $(MAKE) -C $(DEPTH)/application/palemoon/locales langpack +else + @echo WARNING: "Language Pack was not generated due to using the hybrid FasterMake/RecursiveMake backend." >&2 +endif + +libs:: make-langpack ifeq (WINNT,$(OS_ARCH)) PKGCOMP_FIND_OPTS = diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py index 26c05ee911..5933a5aa98 100644 --- a/python/mozbuild/mozbuild/mach_commands.py +++ b/python/mozbuild/mozbuild/mach_commands.py @@ -1079,6 +1079,15 @@ class Stage_Package(MachCommandBase): def stage_package(self): return self._run_make(directory=".", target='stage-package', ensure_exit_code=False) +@CommandProvider +class L10n_Package(MachCommandBase): + """Build and package l10n as a language pack xpi.""" + + @Command('langpack', category='post-build', + description='Build and package l10n as a language pack.') + def l10n_package(self): + return self._run_make(directory=".", target='l10n-package', ensure_exit_code=False) + @CommandProvider class Package(MachCommandBase): """Package the built product for distribution.""" From 364df3c82e761ff4d07197b4267755ce6e868403 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 28 Nov 2019 02:20:28 -0500 Subject: [PATCH 2/6] Fix typo in application./basilisk/build.mk --- application/basilisk/build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/basilisk/build.mk b/application/basilisk/build.mk index 18bfb1f562..10fe02d4e7 100644 --- a/application/basilisk/build.mk +++ b/application/basilisk/build.mk @@ -9,7 +9,7 @@ package: @$(MAKE) -C application/basilisk/installer make-archive l10n-package: - @$(MAKE) -C application/palemoon/installer make-langpack + @$(MAKE) -C application/basilisk/installer make-langpack mozpackage: @$(MAKE) -C application/basilisk/installer From 1e7859111e2769fb7edc82a7b3fe924aa9641d89 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 28 Nov 2019 02:23:54 -0500 Subject: [PATCH 3/6] Allow Solaris to use alt packaging for Pale Moon and Basilisk --- toolkit/mozapps/installer/packager-uxp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/mozapps/installer/packager-uxp.mk b/toolkit/mozapps/installer/packager-uxp.mk index fdc9ccc185..8d7cb4e62d 100644 --- a/toolkit/mozapps/installer/packager-uxp.mk +++ b/toolkit/mozapps/installer/packager-uxp.mk @@ -6,11 +6,11 @@ # very much still dependent on them include $(MOZILLA_DIR)/toolkit/mozapps/installer/packager.mk -# This is currently only used on Windows and Linux +# This is currently only used on Windows, Linux, and Solaris # on other platforms such as Mac will fall back to the orginal # mozilla packaging make-archive: -ifeq (,$(filter Linux WINNT,$(OS_ARCH))) +ifeq (,$(filter SunOS Linux WINNT,$(OS_ARCH))) $(MAKE) make-package else $(MAKE) stage-package make-buildinfo-file From 37c5f72be6538f90d36a7b7584c13a437d306b28 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 28 Nov 2019 07:54:49 -0500 Subject: [PATCH 4/6] Issue #1304 - Make the second arg of insertRule optional --- dom/interfaces/css/nsIDOMCSSGroupingRule.idl | 2 +- dom/interfaces/css/nsIDOMCSSStyleSheet.idl | 2 +- dom/webidl/CSSStyleSheet.webidl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dom/interfaces/css/nsIDOMCSSGroupingRule.idl b/dom/interfaces/css/nsIDOMCSSGroupingRule.idl index 80f072d160..f3580aeecc 100644 --- a/dom/interfaces/css/nsIDOMCSSGroupingRule.idl +++ b/dom/interfaces/css/nsIDOMCSSGroupingRule.idl @@ -14,7 +14,7 @@ interface nsIDOMCSSGroupingRule : nsIDOMCSSRule readonly attribute nsIDOMCSSRuleList cssRules; unsigned long insertRule(in DOMString rule, - in unsigned long index) + [optional] in unsigned long index) raises(DOMException); void deleteRule(in unsigned long index) raises(DOMException); diff --git a/dom/interfaces/css/nsIDOMCSSStyleSheet.idl b/dom/interfaces/css/nsIDOMCSSStyleSheet.idl index b9e13134e0..cefe4f704a 100644 --- a/dom/interfaces/css/nsIDOMCSSStyleSheet.idl +++ b/dom/interfaces/css/nsIDOMCSSStyleSheet.idl @@ -20,7 +20,7 @@ interface nsIDOMCSSStyleSheet : nsIDOMStyleSheet readonly attribute nsIDOMCSSRuleList cssRules; unsigned long insertRule(in DOMString rule, - in unsigned long index) + [optional] in unsigned long index) raises(DOMException); void deleteRule(in unsigned long index) raises(DOMException); diff --git a/dom/webidl/CSSStyleSheet.webidl b/dom/webidl/CSSStyleSheet.webidl index 48fb89db12..15c110b8b4 100644 --- a/dom/webidl/CSSStyleSheet.webidl +++ b/dom/webidl/CSSStyleSheet.webidl @@ -23,7 +23,7 @@ interface CSSStyleSheet : StyleSheet { [ChromeOnly, BinaryName="parsingModeDOM"] readonly attribute CSSStyleSheetParsingMode parsingMode; [Throws, NeedsSubjectPrincipal] - unsigned long insertRule(DOMString rule, unsigned long index); + unsigned long insertRule(DOMString rule, optional unsigned long index = 0); [Throws, NeedsSubjectPrincipal] void deleteRule(unsigned long index); }; From a67d5f872cd815dbda1b33a19c284f739420d4c3 Mon Sep 17 00:00:00 2001 From: Mats Palmgren Date: Fri, 29 Nov 2019 00:19:03 +0100 Subject: [PATCH 5/6] Simplify the overflow child frame reparenting in nsInlineFrame::DestroyFrom. --- layout/generic/nsInlineFrame.cpp | 6 ++---- layout/generic/nsInlineFrame.h | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp index 54d93c85af..5a04f0cd1e 100644 --- a/layout/generic/nsInlineFrame.cpp +++ b/layout/generic/nsInlineFrame.cpp @@ -199,8 +199,7 @@ nsInlineFrame::DestroyFrom(nsIFrame* aDestructRoot) // Fixup the parent pointers for any child frames on the OverflowList. // nsIFrame::DestroyFrom depends on that to find the sticky scroll // container (an ancestor). - nsIFrame* lineContainer = nsLayoutUtils::FindNearestBlockAncestor(this); - DrainSelfOverflowListInternal(eForDestroy, lineContainer); + overflowFrames->ApplySetParent(this); } nsContainerFrame::DestroyFrom(aDestructRoot); } @@ -508,8 +507,7 @@ nsInlineFrame::DrainSelfOverflowListInternal(DrainFlags aFlags, if (aLineContainer && aLineContainer->GetPrevContinuation()) { ReparentFloatsForInlineChild(aLineContainer, firstChild, true); } - const bool doReparentSC = - (aFlags & eInFirstLine) && !(aFlags & eForDestroy); + const bool doReparentSC = (aFlags & eInFirstLine); RestyleManagerHandle restyleManager = PresContext()->RestyleManager(); for (nsIFrame* f = firstChild; f; f = f->GetNextSibling()) { f->SetParent(this); diff --git a/layout/generic/nsInlineFrame.h b/layout/generic/nsInlineFrame.h index 00f89065cc..a9679e93f0 100644 --- a/layout/generic/nsInlineFrame.h +++ b/layout/generic/nsInlineFrame.h @@ -175,9 +175,6 @@ private: enum DrainFlags { eDontReparentFrames = 1, // skip reparenting the overflow list frames eInFirstLine = 2, // the request is for an inline descendant of a nsFirstLineFrame - eForDestroy = 4, // the request is from DestroyFrom; in this case we do the - // minimal work required since the frame is about to be - // destroyed (just fixup parent pointers) }; /** * Move any frames on our overflow list to the end of our principal list. From e1a84dd73077b577707cacefd18fea436692c76f Mon Sep 17 00:00:00 2001 From: adeshkp Date: Thu, 28 Nov 2019 23:14:25 +0530 Subject: [PATCH 6/6] Issue #1258 - Remove remaining chat core bits This fixes Interlink build on Mac. --- mailnews/base/src/nsMessengerOSXIntegration.mm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mailnews/base/src/nsMessengerOSXIntegration.mm b/mailnews/base/src/nsMessengerOSXIntegration.mm index 280bdf433d..a38716e179 100644 --- a/mailnews/base/src/nsMessengerOSXIntegration.mm +++ b/mailnews/base/src/nsMessengerOSXIntegration.mm @@ -249,14 +249,6 @@ nsMessengerOSXIntegration::Observe(nsISupports* aSubject, const char* aTopic, co return mailSession->AddFolderListener(this, nsIFolderListener::boolPropertyChanged | nsIFolderListener::intPropertyChanged); } - if (!strcmp(aTopic, kUnreadImCountChangedTopic)) { - nsresult rv; - nsCOMPtr unreadCount = do_QueryInterface(aSubject, &rv); - NS_ENSURE_SUCCESS(rv, rv); - - return BadgeDockIcon(); - } - return NS_OK; }