Created ~/patches subfolder
This commit is contained in:
parent
9120ca6c67
commit
8dd00c914f
12
patches/arm.patch
Normal file
12
patches/arm.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
|
||||||
|
index f8977a6..34f52fc 100644
|
||||||
|
--- a/js/src/wasm/WasmSignalHandlers.cpp
|
||||||
|
+++ b/js/src/wasm/WasmSignalHandlers.cpp
|
||||||
|
@@ -243,7 +243,7 @@ using mozilla::DebugOnly;
|
||||||
|
// If you run into compile problems on a tier-3 platform, you can disable the
|
||||||
|
// emulation here.
|
||||||
|
|
||||||
|
-#if defined(__linux__) && defined(__arm__)
|
||||||
|
+#if 0 && defined(__linux__) && defined(__arm__)
|
||||||
|
# define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
|
||||||
|
#endif
|
28
patches/browser-confvars.patch
Normal file
28
patches/browser-confvars.patch
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
diff --git a/browser/confvars.sh b/browser/confvars.sh
|
||||||
|
index 92871c9516..1e151180dd 100644
|
||||||
|
--- a/browser/confvars.sh
|
||||||
|
+++ b/browser/confvars.sh
|
||||||
|
@@ -3,8 +3,10 @@
|
||||||
|
# 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/.
|
||||||
|
|
||||||
|
-MOZ_APP_VENDOR=Mozilla
|
||||||
|
-MOZ_UPDATER=1
|
||||||
|
+MOZ_APP_BASENAME=LibreWolf
|
||||||
|
+MOZ_APP_VENDOR="LibreWolf Community"
|
||||||
|
+
|
||||||
|
+MOZ_UPDATER=0
|
||||||
|
|
||||||
|
if test "$OS_ARCH" = "WINNT"; then
|
||||||
|
if ! test "$HAVE_64BIT_BUILD"; then
|
||||||
|
@@ -34,8 +36,8 @@ BROWSER_CHROME_URL=chrome://browser/content/browser.xhtml
|
||||||
|
# For mozilla-beta, mozilla-release, or mozilla-central repositories, use
|
||||||
|
# "unofficial" branding.
|
||||||
|
# For the mozilla-aurora repository, use "aurora".
|
||||||
|
-MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
|
||||||
|
-MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
|
||||||
|
+MOZ_BRANDING_DIRECTORY=browser/branding/librewolf
|
||||||
|
+MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/librewolf
|
||||||
|
MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||||
|
|
||||||
|
MOZ_PROFILE_MIGRATOR=1
|
24
patches/context-menu.patch
Normal file
24
patches/context-menu.patch
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
|
||||||
|
index a7fce1a806..3a9d07582d 100644
|
||||||
|
--- a/browser/base/content/browser-context.inc
|
||||||
|
+++ b/browser/base/content/browser-context.inc
|
||||||
|
@@ -78,9 +78,6 @@
|
||||||
|
<menuitem id="context-savelink"
|
||||||
|
data-l10n-id="main-context-menu-save-link"
|
||||||
|
oncommand="gContextMenu.saveLink();"/>
|
||||||
|
- <menuitem id="context-savelinktopocket"
|
||||||
|
- data-l10n-id="main-context-menu-save-link-to-pocket"
|
||||||
|
- oncommand= "Pocket.savePage(gContextMenu.browser, gContextMenu.linkURL);"/>
|
||||||
|
<menuitem id="context-copyemail"
|
||||||
|
data-l10n-id="main-context-menu-copy-email"
|
||||||
|
oncommand="gContextMenu.copyEmail();"/>
|
||||||
|
@@ -215,9 +212,6 @@
|
||||||
|
<menuitem id="context-savepage"
|
||||||
|
data-l10n-id="main-context-menu-page-save"
|
||||||
|
oncommand="gContextMenu.savePageAs();"/>
|
||||||
|
- <menuitem id="context-pocket"
|
||||||
|
- data-l10n-id="main-context-menu-save-to-pocket"
|
||||||
|
- oncommand="Pocket.savePage(gContextMenu.browser, gContextMenu.browser.currentURI.spec, gContextMenu.browser.contentTitle);"/>
|
||||||
|
<menuseparator id="context-sep-sendpagetodevice" class="sync-ui-item"
|
||||||
|
hidden="true"/>
|
||||||
|
<menu id="context-sendpagetodevice"
|
129
patches/megabar.patch
Normal file
129
patches/megabar.patch
Normal file
|
@ -0,0 +1,129 @@
|
||||||
|
diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
|
||||||
|
index 73d15df..99cc41b 100644
|
||||||
|
--- a/browser/components/urlbar/UrlbarInput.jsm
|
||||||
|
+++ b/browser/components/urlbar/UrlbarInput.jsm
|
||||||
|
@@ -1692,13 +1692,13 @@ class UrlbarInput {
|
||||||
|
|
||||||
|
// Enable the animation only after the first extend call to ensure it
|
||||||
|
// doesn't run when opening a new window.
|
||||||
|
- if (!this.hasAttribute("breakout-extend-animate")) {
|
||||||
|
- this.window.promiseDocumentFlushed(() => {
|
||||||
|
- this.window.requestAnimationFrame(() => {
|
||||||
|
- this.setAttribute("breakout-extend-animate", "true");
|
||||||
|
- });
|
||||||
|
- });
|
||||||
|
- }
|
||||||
|
+ // if (!this.hasAttribute("breakout-extend-animate")) {
|
||||||
|
+ // this.window.promiseDocumentFlushed(() => {
|
||||||
|
+ // this.window.requestAnimationFrame(() => {
|
||||||
|
+ // this.setAttribute("breakout-extend-animate", "true");
|
||||||
|
+ // });
|
||||||
|
+ // });
|
||||||
|
+ // }
|
||||||
|
}
|
||||||
|
|
||||||
|
endLayoutExtend() {
|
||||||
|
diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||||
|
index e9fde8b..6c4c444 100644
|
||||||
|
--- a/browser/themes/shared/urlbar-searchbar.inc.css
|
||||||
|
+++ b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||||
|
@@ -5,7 +5,7 @@
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%define fieldHoverBorderColor hsla(240,5%,5%,.35)
|
||||||
|
-%define urlbarMarginInline 5px
|
||||||
|
+%define urlbarMarginInline 0px
|
||||||
|
%define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding))
|
||||||
|
|
||||||
|
:root {
|
||||||
|
@@ -273,9 +273,9 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
#urlbar[breakout][breakout-extend] {
|
||||||
|
- top: -@urlbarBreakoutExtend@;
|
||||||
|
- left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
|
||||||
|
- width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
|
||||||
|
+ top: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
|
||||||
|
+ left: 0;
|
||||||
|
+ width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
@supports -moz-bool-pref("browser.proton.urlbar.enabled") {
|
||||||
|
@@ -288,7 +288,7 @@
|
||||||
|
|
||||||
|
@supports not -moz-bool-pref("browser.proton.urlbar.enabled") {
|
||||||
|
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||||
|
- box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
|
||||||
|
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
|
||||||
|
}
|
||||||
|
|
||||||
|
#urlbar[breakout][breakout-extend][open] > #urlbar-background {
|
||||||
|
@@ -297,9 +297,9 @@
|
||||||
|
} /*** END !proton ***/
|
||||||
|
|
||||||
|
#urlbar[breakout][breakout-extend] > #urlbar-input-container {
|
||||||
|
- height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
|
||||||
|
- padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
|
||||||
|
- padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
|
||||||
|
+ height: var(--urlbar-height);
|
||||||
|
+ padding-block: 0;
|
||||||
|
+ padding-inline: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@supports -moz-bool-pref("browser.proton.urlbar.enabled") {
|
||||||
|
@@ -325,7 +325,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||||
|
- animation-name: urlbar-grow;
|
||||||
|
+ animation-name: none;
|
||||||
|
animation-duration: 0s;
|
||||||
|
animation-timing-function: var(--animation-easing-function);
|
||||||
|
}
|
||||||
|
diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
|
||||||
|
index c6ce546..da00fac 100644
|
||||||
|
--- a/browser/themes/shared/urlbarView.inc.css
|
||||||
|
+++ b/browser/themes/shared/urlbarView.inc.css
|
||||||
|
@@ -74,8 +74,8 @@
|
||||||
|
display: block;
|
||||||
|
text-shadow: none;
|
||||||
|
overflow: clip;
|
||||||
|
- margin-inline: calc(5px + var(--urlbar-container-padding));
|
||||||
|
- width: calc(100% - 2 * (5px + var(--urlbar-container-padding)));
|
||||||
|
+ margin-inline: 0;
|
||||||
|
+ width: 100%;
|
||||||
|
/* Match urlbar-background's border. */
|
||||||
|
border-inline: 1px solid transparent;
|
||||||
|
}
|
||||||
|
@@ -115,7 +115,7 @@
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
fill: currentColor;
|
||||||
|
fill-opacity: .6;
|
||||||
|
- padding-block: 3px;
|
||||||
|
+ padding-block: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
:root[uidensity=compact] .urlbarView-row {
|
||||||
|
@@ -280,6 +280,7 @@
|
||||||
|
object-fit: contain;
|
||||||
|
flex-shrink: 0;
|
||||||
|
-moz-context-properties: fill, fill-opacity;
|
||||||
|
+ margin-inline-start: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@supports not -moz-bool-pref("browser.proton.urlbar.enabled") {
|
||||||
|
@@ -324,10 +325,10 @@
|
||||||
|
|
||||||
|
.urlbarView-type-icon {
|
||||||
|
position: absolute;
|
||||||
|
- width: 12px;
|
||||||
|
- height: 12px;
|
||||||
|
- margin-bottom: -4px;
|
||||||
|
- margin-inline-start: 8px;
|
||||||
|
+ width: 16px;
|
||||||
|
+ height: 16px;
|
||||||
|
+ margin-bottom: 0;
|
||||||
|
+ margin-inline-start: 0;
|
||||||
|
align-self: end;
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-size: contain;
|
16
patches/mozilla-vpn-ad.patch
Normal file
16
patches/mozilla-vpn-ad.patch
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
|
||||||
|
index 4d22812723..2542791b9b 100644
|
||||||
|
--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
|
||||||
|
+++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
|
||||||
|
@@ -54,11 +54,7 @@
|
||||||
|
<div class="info">
|
||||||
|
<h1 data-l10n-id="about-private-browsing-info-title"></h1>
|
||||||
|
<p data-l10n-id="about-private-browsing-info-description"></p>
|
||||||
|
- <a id="private-browsing-myths" data-l10n-id="about-private-browsing-info-myths"></a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
-
|
||||||
|
- <p id="private-browsing-vpn-text" class="vpn-promo" data-l10n-id="about-private-browsing-need-more-privacy"></p>
|
||||||
|
- <a id="private-browsing-vpn-link" class="vpn-promo" data-l10n-id="about-private-browsing-turn-on-vpn"></a>
|
||||||
|
</body>
|
||||||
|
</html>
|
43
patches/nightly/context-menu2.patch
Normal file
43
patches/nightly/context-menu2.patch
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
|
||||||
|
--- a/browser/base/content/browser-context.inc
|
||||||
|
+++ b/browser/base/content/browser-context.inc
|
||||||
|
@@ -102,19 +102,16 @@
|
||||||
|
oncommand="gContextMenu.openLinkInPrivateWindow();"/>
|
||||||
|
<menuseparator id="context-sep-open"/>
|
||||||
|
<menuitem id="context-bookmarklink"
|
||||||
|
data-l10n-id="main-context-menu-bookmark-link"
|
||||||
|
oncommand="gContextMenu.bookmarkLink();"/>
|
||||||
|
<menuitem id="context-savelink"
|
||||||
|
data-l10n-id="main-context-menu-save-link"
|
||||||
|
oncommand="gContextMenu.saveLink();"/>
|
||||||
|
- <menuitem id="context-savelinktopocket"
|
||||||
|
- data-l10n-id="main-context-menu-save-link-to-pocket"
|
||||||
|
- oncommand= "Pocket.savePage(gContextMenu.browser, gContextMenu.linkURL);"/>
|
||||||
|
<menuitem id="context-copyemail"
|
||||||
|
data-l10n-id="main-context-menu-copy-email"
|
||||||
|
oncommand="gContextMenu.copyEmail();"/>
|
||||||
|
<menuitem id="context-copylink"
|
||||||
|
data-l10n-id="main-context-menu-copy-link-simple"
|
||||||
|
oncommand="gContextMenu.copyLink();"/>
|
||||||
|
<menu id="context-sendlinktodevice"
|
||||||
|
class="sync-ui-item"
|
||||||
|
@@ -254,19 +251,16 @@
|
||||||
|
#ifdef XP_MACOSX
|
||||||
|
<menuitem id="context-bookmarkpage"
|
||||||
|
data-l10n-id="main-context-menu-bookmark-add-mac"
|
||||||
|
oncommand="gContextMenu.bookmarkThisPage();"/>
|
||||||
|
#endif
|
||||||
|
<menuitem id="context-savepage"
|
||||||
|
data-l10n-id="main-context-menu-page-save"
|
||||||
|
oncommand="gContextMenu.savePageAs();"/>
|
||||||
|
- <menuitem id="context-pocket"
|
||||||
|
- data-l10n-id="main-context-menu-save-to-pocket"
|
||||||
|
- oncommand="Pocket.savePage(gContextMenu.browser, gContextMenu.browser.currentURI.spec, gContextMenu.browser.contentTitle);"/>
|
||||||
|
<menu id="context-sendpagetodevice"
|
||||||
|
class="sync-ui-item"
|
||||||
|
data-l10n-id="main-context-menu-send-to-device"
|
||||||
|
hidden="true">
|
||||||
|
<menupopup id="context-sendpagetodevice-popup"
|
||||||
|
onpopupshowing="(() => { gSync.populateSendTabToDevicesMenu(event.target, gBrowser.currentURI.spec, gBrowser.contentTitle); })()"/>
|
||||||
|
</menu>
|
||||||
|
<menu id="fill-login" hidden="true">
|
245
patches/nightly/megabar2.patch
Normal file
245
patches/nightly/megabar2.patch
Normal file
|
@ -0,0 +1,245 @@
|
||||||
|
diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
|
||||||
|
--- a/browser/components/urlbar/UrlbarInput.jsm
|
||||||
|
+++ b/browser/components/urlbar/UrlbarInput.jsm
|
||||||
|
@@ -1699,23 +1699,23 @@ class UrlbarInput {
|
||||||
|
this.removeAttribute("breakout-extend-disabled");
|
||||||
|
}
|
||||||
|
|
||||||
|
this._toolbar.setAttribute("urlbar-exceeds-toolbar-bounds", "true");
|
||||||
|
this.setAttribute("breakout-extend", "true");
|
||||||
|
|
||||||
|
// Enable the animation only after the first extend call to ensure it
|
||||||
|
// doesn't run when opening a new window.
|
||||||
|
- if (!this.hasAttribute("breakout-extend-animate")) {
|
||||||
|
- this.window.promiseDocumentFlushed(() => {
|
||||||
|
- this.window.requestAnimationFrame(() => {
|
||||||
|
- this.setAttribute("breakout-extend-animate", "true");
|
||||||
|
- });
|
||||||
|
- });
|
||||||
|
- }
|
||||||
|
+// if (!this.hasAttribute("breakout-extend-animate")) {
|
||||||
|
+// this.window.promiseDocumentFlushed(() => {
|
||||||
|
+// this.window.requestAnimationFrame(() => {
|
||||||
|
+// this.setAttribute("breakout-extend-animate", "true");
|
||||||
|
+// });
|
||||||
|
+// });
|
||||||
|
+// }
|
||||||
|
}
|
||||||
|
|
||||||
|
endLayoutExtend() {
|
||||||
|
// If reduce motion is enabled, we want to collapse the Urlbar here so the
|
||||||
|
// user sees only sees two states: not expanded, and expanded with the view
|
||||||
|
// open.
|
||||||
|
if (!this.hasAttribute("breakout-extend") || this.view.isOpen) {
|
||||||
|
return;
|
||||||
|
diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||||
|
--- a/browser/themes/shared/urlbar-searchbar.inc.css
|
||||||
|
+++ b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||||
|
@@ -1,16 +1,16 @@
|
||||||
|
%if 0
|
||||||
|
/* 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/. */
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%define fieldHoverBorderColor hsla(240,5%,5%,.35)
|
||||||
|
-%define urlbarMarginInline 5px
|
||||||
|
+%define urlbarMarginInline 0px
|
||||||
|
%define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding))
|
||||||
|
|
||||||
|
:root {
|
||||||
|
--toolbar-field-border-color: hsla(240,5%,5%,.25);
|
||||||
|
}
|
||||||
|
|
||||||
|
@media not (-moz-proton) {
|
||||||
|
:root {
|
||||||
|
@@ -268,50 +268,50 @@
|
||||||
|
#urlbar[breakout][breakout-extend-disabled][open] {
|
||||||
|
/* The z-index needs to be big enough to trump other positioned UI pieces
|
||||||
|
that we want to overlay. 3 is used in the tab bar. */
|
||||||
|
z-index: 3;
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
#urlbar[breakout][breakout-extend] {
|
||||||
|
- top: -@urlbarBreakoutExtend@;
|
||||||
|
- left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
|
||||||
|
- width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
|
||||||
|
+ top: 0;
|
||||||
|
+ left: 0;
|
||||||
|
+ width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (-moz-proton) {
|
||||||
|
#urlbar[breakout][breakout-extend] {
|
||||||
|
top: 0;
|
||||||
|
- left: -@urlbarMarginInline@;
|
||||||
|
- width: calc(100% + 2 * @urlbarMarginInline@);
|
||||||
|
+ left: 0;
|
||||||
|
+ width: 100%;
|
||||||
|
}
|
||||||
|
} /*** END proton ***/
|
||||||
|
|
||||||
|
@media not (-moz-proton) {
|
||||||
|
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||||
|
- box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
|
||||||
|
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
|
||||||
|
}
|
||||||
|
|
||||||
|
#urlbar[breakout][breakout-extend][open] > #urlbar-background {
|
||||||
|
- box-shadow: 0 5px 18px rgba(0,0,0,.2);
|
||||||
|
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
|
||||||
|
}
|
||||||
|
} /*** END !proton ***/
|
||||||
|
|
||||||
|
#urlbar[breakout][breakout-extend] > #urlbar-input-container {
|
||||||
|
- height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
|
||||||
|
- padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
|
||||||
|
- padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
|
||||||
|
+ height: var(--urlbar-toolbar-height);
|
||||||
|
+ padding-block: 0;
|
||||||
|
+ padding-inline: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (-moz-proton) {
|
||||||
|
#urlbar[breakout][breakout-extend] > #urlbar-input-container {
|
||||||
|
height: var(--urlbar-toolbar-height);
|
||||||
|
- padding-block: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + var(--urlbar-container-padding));
|
||||||
|
- padding-inline: calc(@urlbarMarginInline@ + var(--urlbar-container-padding));
|
||||||
|
+ padding-block: 0;
|
||||||
|
+ padding-inline: 0;
|
||||||
|
}
|
||||||
|
} /*** END proton ***/
|
||||||
|
|
||||||
|
#urlbar.searchButton[breakout][breakout-extend] > #urlbar-input-container > #urlbar-search-button {
|
||||||
|
fill: currentColor;
|
||||||
|
fill-opacity: .6;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -320,17 +320,17 @@
|
||||||
|
transform: scaleX(.99) scaleY(.95);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
transform: scale(1.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||||
|
- animation-name: urlbar-grow;
|
||||||
|
+ animation-name: none;
|
||||||
|
animation-duration: 0s;
|
||||||
|
animation-timing-function: var(--animation-easing-function);
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: no-preference) {
|
||||||
|
#urlbar[breakout][breakout-extend][breakout-extend-animate] > #urlbar-background {
|
||||||
|
animation-duration: 150ms;
|
||||||
|
}
|
||||||
|
diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
|
||||||
|
--- a/browser/themes/shared/urlbarView.inc.css
|
||||||
|
+++ b/browser/themes/shared/urlbarView.inc.css
|
||||||
|
@@ -82,26 +82,26 @@
|
||||||
|
|
||||||
|
.urlbarView {
|
||||||
|
/* Don't handle window drag events in case we are overlapping a toolbar */
|
||||||
|
-moz-window-dragging: no-drag;
|
||||||
|
|
||||||
|
display: block;
|
||||||
|
text-shadow: none;
|
||||||
|
overflow: clip;
|
||||||
|
- margin-inline: calc(5px + var(--urlbar-container-padding));
|
||||||
|
- width: calc(100% - 2 * (5px + var(--urlbar-container-padding)));
|
||||||
|
+ margin-inline: 0;
|
||||||
|
+ width: 100%
|
||||||
|
/* Match urlbar-background's border. */
|
||||||
|
border-inline: 1px solid transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media not (-moz-proton) {
|
||||||
|
.urlbarView {
|
||||||
|
- margin-inline: calc(4px + var(--identity-box-margin-inline));
|
||||||
|
- width: calc(100% - 2 * (4px + var(--identity-box-margin-inline)));
|
||||||
|
+ margin-inline: 0;
|
||||||
|
+ width: 100%;
|
||||||
|
}
|
||||||
|
/* If the view is open, offset the toolbar overlap so the view's top border
|
||||||
|
aligns with the toolbar. */
|
||||||
|
#urlbar[open] > .urlbarView {
|
||||||
|
margin-block-start: -@urlbarBreakoutExtend@;
|
||||||
|
}
|
||||||
|
} /*** END !proton ***/
|
||||||
|
|
||||||
|
@@ -123,27 +123,27 @@
|
||||||
|
padding-block: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.urlbarView-row {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
fill: currentColor;
|
||||||
|
fill-opacity: .6;
|
||||||
|
- padding-block: 3px;
|
||||||
|
+ padding-block: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
:root[uidensity=compact] .urlbarView-row {
|
||||||
|
padding-block: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (-moz-proton) {
|
||||||
|
:root:not([uidensity=compact]) .urlbarView-row:not([type=tip], [type=dynamic]) {
|
||||||
|
- min-height: 32px;
|
||||||
|
- padding-block: 4px;
|
||||||
|
+ min-height: 0px; /* todo: check this */
|
||||||
|
+ padding-block: 0px;
|
||||||
|
}
|
||||||
|
} /*** END proton ***/
|
||||||
|
|
||||||
|
.urlbarView-row-inner {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
flex-grow: 1;
|
||||||
|
flex-shrink: 1;
|
||||||
|
@@ -288,16 +288,17 @@
|
||||||
|
width: @urlbarViewFaviconWidth@;
|
||||||
|
height: @urlbarViewFaviconWidth@;
|
||||||
|
margin-inline-end: calc(@urlbarViewIconMarginEnd@);
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-size: contain;
|
||||||
|
object-fit: contain;
|
||||||
|
flex-shrink: 0;
|
||||||
|
-moz-context-properties: fill, fill-opacity;
|
||||||
|
+ margin-inline-start: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media not (-moz-proton) {
|
||||||
|
.urlbarView-favicon {
|
||||||
|
/* 2px is from identity-block.inc.css */
|
||||||
|
margin-inline-end: calc(var(--urlbar-icon-padding) / 2 + var(--identity-box-margin-inline) + 2px);
|
||||||
|
}
|
||||||
|
} /*** END !proton ***/
|
||||||
|
@@ -321,20 +322,20 @@
|
||||||
|
color: var(--urlbar-popup-url-color);
|
||||||
|
-moz-context-properties: fill;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Type icon */
|
||||||
|
|
||||||
|
.urlbarView-type-icon {
|
||||||
|
position: absolute;
|
||||||
|
- width: 12px;
|
||||||
|
- height: 12px;
|
||||||
|
- margin-bottom: -4px;
|
||||||
|
- margin-inline-start: 8px;
|
||||||
|
+ width: 16px;
|
||||||
|
+ height: 16px;;
|
||||||
|
+ margin-bottom: 0;
|
||||||
|
+ margin-inline-start: 0;
|
||||||
|
align-self: end;
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-size: contain;
|
||||||
|
-moz-context-properties: fill, stroke;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Favicon badges have this priority: pinned > bookmark. */
|
||||||
|
|
148
patches/nightly/megabar3.patch
Normal file
148
patches/nightly/megabar3.patch
Normal file
|
@ -0,0 +1,148 @@
|
||||||
|
diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
|
||||||
|
index f076d5d7f2..92f0adf003 100644
|
||||||
|
--- a/browser/components/urlbar/UrlbarInput.jsm
|
||||||
|
+++ b/browser/components/urlbar/UrlbarInput.jsm
|
||||||
|
@@ -1704,13 +1704,13 @@ class UrlbarInput {
|
||||||
|
|
||||||
|
// Enable the animation only after the first extend call to ensure it
|
||||||
|
// doesn't run when opening a new window.
|
||||||
|
- if (!this.hasAttribute("breakout-extend-animate")) {
|
||||||
|
- this.window.promiseDocumentFlushed(() => {
|
||||||
|
- this.window.requestAnimationFrame(() => {
|
||||||
|
- this.setAttribute("breakout-extend-animate", "true");
|
||||||
|
- });
|
||||||
|
- });
|
||||||
|
- }
|
||||||
|
+// if (!this.hasAttribute("breakout-extend-animate")) {
|
||||||
|
+// this.window.promiseDocumentFlushed(() => {
|
||||||
|
+// this.window.requestAnimationFrame(() => {
|
||||||
|
+// this.setAttribute("breakout-extend-animate", "true");
|
||||||
|
+// });
|
||||||
|
+// });
|
||||||
|
+// }
|
||||||
|
}
|
||||||
|
|
||||||
|
endLayoutExtend() {
|
||||||
|
diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||||
|
index 3abd701732..87713b9cbd 100644
|
||||||
|
--- a/browser/themes/shared/urlbar-searchbar.inc.css
|
||||||
|
+++ b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||||
|
@@ -5,7 +5,7 @@
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%define fieldHoverBorderColor hsla(240,5%,5%,.35)
|
||||||
|
-%define urlbarMarginInline 5px
|
||||||
|
+%define urlbarMarginInline 0px
|
||||||
|
%define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding))
|
||||||
|
|
||||||
|
:root {
|
||||||
|
@@ -273,40 +273,40 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
#urlbar[breakout][breakout-extend] {
|
||||||
|
- top: -@urlbarBreakoutExtend@;
|
||||||
|
- left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
|
||||||
|
- width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
|
||||||
|
+ top: 0;
|
||||||
|
+ left: 0;
|
||||||
|
+ width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (-moz-proton) {
|
||||||
|
#urlbar[breakout][breakout-extend] {
|
||||||
|
top: 0;
|
||||||
|
- left: -@urlbarMarginInline@;
|
||||||
|
- width: calc(100% + 2 * @urlbarMarginInline@);
|
||||||
|
+ left: 0;
|
||||||
|
+ width: 100%;
|
||||||
|
}
|
||||||
|
} /*** END proton ***/
|
||||||
|
|
||||||
|
@media not (-moz-proton) {
|
||||||
|
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||||
|
- box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
|
||||||
|
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
|
||||||
|
}
|
||||||
|
|
||||||
|
#urlbar[breakout][breakout-extend][open] > #urlbar-background {
|
||||||
|
- box-shadow: 0 5px 18px rgba(0,0,0,.2);
|
||||||
|
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
|
||||||
|
}
|
||||||
|
} /*** END !proton ***/
|
||||||
|
|
||||||
|
#urlbar[breakout][breakout-extend] > #urlbar-input-container {
|
||||||
|
- height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
|
||||||
|
- padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
|
||||||
|
- padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
|
||||||
|
+ height: var(--urlbar-toolbar-height);
|
||||||
|
+ padding-block: 0;
|
||||||
|
+ padding-inline: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (-moz-proton) {
|
||||||
|
#urlbar[breakout][breakout-extend] > #urlbar-input-container {
|
||||||
|
height: var(--urlbar-toolbar-height);
|
||||||
|
- padding-block: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + var(--urlbar-container-padding));
|
||||||
|
- padding-inline: calc(@urlbarMarginInline@ + var(--urlbar-container-padding));
|
||||||
|
+ padding-block: 0;
|
||||||
|
+ padding-inline: 0;
|
||||||
|
}
|
||||||
|
} /*** END proton ***/
|
||||||
|
|
||||||
|
@@ -325,7 +325,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||||
|
- animation-name: urlbar-grow;
|
||||||
|
+ animation-name: none;
|
||||||
|
animation-duration: 0s;
|
||||||
|
animation-timing-function: var(--animation-easing-function);
|
||||||
|
}
|
||||||
|
diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
|
||||||
|
index e58531723e..dba8668168 100644
|
||||||
|
--- a/browser/themes/shared/urlbarView.inc.css
|
||||||
|
+++ b/browser/themes/shared/urlbarView.inc.css
|
||||||
|
@@ -86,16 +86,16 @@
|
||||||
|
display: block;
|
||||||
|
text-shadow: none;
|
||||||
|
overflow: clip;
|
||||||
|
- margin-inline: calc(5px + var(--urlbar-container-padding));
|
||||||
|
- width: calc(100% - 2 * (5px + var(--urlbar-container-padding)));
|
||||||
|
+ margin-inline: 0;
|
||||||
|
+ width: 100%
|
||||||
|
/* Match urlbar-background's border. */
|
||||||
|
border-inline: 1px solid transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media not (-moz-proton) {
|
||||||
|
.urlbarView {
|
||||||
|
- margin-inline: calc(4px + var(--identity-box-margin-inline));
|
||||||
|
- width: calc(100% - 2 * (4px + var(--identity-box-margin-inline)));
|
||||||
|
+ margin-inline: 0;
|
||||||
|
+ width: 100%;
|
||||||
|
}
|
||||||
|
/* If the view is open, offset the toolbar overlap so the view's top border
|
||||||
|
aligns with the toolbar. */
|
||||||
|
@@ -298,6 +298,7 @@
|
||||||
|
object-fit: contain;
|
||||||
|
flex-shrink: 0;
|
||||||
|
-moz-context-properties: fill, fill-opacity;
|
||||||
|
+ margin-inline-start: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media not (-moz-proton) {
|
||||||
|
@@ -331,10 +332,10 @@
|
||||||
|
|
||||||
|
.urlbarView-type-icon {
|
||||||
|
position: absolute;
|
||||||
|
- width: 12px;
|
||||||
|
- height: 12px;
|
||||||
|
- margin-bottom: -4px;
|
||||||
|
- margin-inline-start: 8px;
|
||||||
|
+ width: 16px;
|
||||||
|
+ height: 16px;;
|
||||||
|
+ margin-bottom: 0;
|
||||||
|
+ margin-inline-start: 0;
|
||||||
|
align-self: end;
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-size: contain;
|
123
patches/nightly/report-site-issue.patch
Normal file
123
patches/nightly/report-site-issue.patch
Normal file
|
@ -0,0 +1,123 @@
|
||||||
|
diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
|
||||||
|
--- a/browser/extensions/moz.build
|
||||||
|
+++ b/browser/extensions/moz.build
|
||||||
|
@@ -1,14 +1,11 @@
|
||||||
|
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||||
|
# vim: set filetype=python:
|
||||||
|
# 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/.
|
||||||
|
|
||||||
|
DIRS += [
|
||||||
|
- "doh-rollout",
|
||||||
|
"formautofill",
|
||||||
|
"screenshots",
|
||||||
|
- "webcompat",
|
||||||
|
- "report-site-issue",
|
||||||
|
"pictureinpicture",
|
||||||
|
]
|
||||||
|
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
|
||||||
|
--- a/browser/locales/Makefile.in
|
||||||
|
+++ b/browser/locales/Makefile.in
|
||||||
|
@@ -56,17 +56,16 @@ l10n-%:
|
||||||
|
$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
|
||||||
|
$(NSINSTALL) -D $(DIST)/install
|
||||||
|
@$(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 ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$*
|
||||||
|
@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
|
||||||
|
@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
|
||||||
|
@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
|
||||||
|
@$(MAKE) multilocale.txt-$* AB_CD=$* XPI_NAME=locale-$*
|
||||||
|
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
|
||||||
|
|
||||||
|
chrome-%: AB_CD=$*
|
||||||
|
chrome-%: IS_LANGUAGE_REPACK=1
|
||||||
|
@@ -77,17 +76,16 @@ chrome-%:
|
||||||
|
@$(MAKE) -C ../../extensions/spellcheck/locales chrome AB_CD=$*
|
||||||
|
ifneq (,$(wildcard ../extensions/formautofill/locales))
|
||||||
|
@$(MAKE) -C ../extensions/formautofill/locales chrome AB_CD=$*
|
||||||
|
endif
|
||||||
|
@$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$*
|
||||||
|
@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
|
||||||
|
@$(MAKE) chrome AB_CD=$*
|
||||||
|
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
|
||||||
|
- @$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$*
|
||||||
|
|
||||||
|
package-win32-installer: $(SUBMAKEFILES)
|
||||||
|
$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
|
||||||
|
|
||||||
|
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
|
||||||
|
diff --git a/browser/locales/filter.py b/browser/locales/filter.py
|
||||||
|
--- a/browser/locales/filter.py
|
||||||
|
+++ b/browser/locales/filter.py
|
||||||
|
@@ -15,17 +15,16 @@ def test(mod, path, entity=None):
|
||||||
|
"toolkit",
|
||||||
|
"security/manager",
|
||||||
|
"devtools/client",
|
||||||
|
"devtools/shared",
|
||||||
|
"devtools/startup",
|
||||||
|
"browser",
|
||||||
|
"browser/extensions/formautofill",
|
||||||
|
"browser/extensions/fxmonitor",
|
||||||
|
- "browser/extensions/report-site-issue",
|
||||||
|
"extensions/spellcheck",
|
||||||
|
"other-licenses/branding/firefox",
|
||||||
|
"browser/branding/official",
|
||||||
|
"services/sync",
|
||||||
|
):
|
||||||
|
return "ignore"
|
||||||
|
if mod not in ("browser", "extensions/spellcheck"):
|
||||||
|
# we only have exceptions for browser and extensions/spellcheck
|
||||||
|
diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
|
||||||
|
--- a/browser/locales/l10n.ini
|
||||||
|
+++ b/browser/locales/l10n.ini
|
||||||
|
@@ -9,17 +9,16 @@ all = browser/locales/all-locales
|
||||||
|
[compare]
|
||||||
|
dirs = browser
|
||||||
|
other-licenses/branding/firefox
|
||||||
|
browser/branding/official
|
||||||
|
devtools/client
|
||||||
|
devtools/startup
|
||||||
|
browser/extensions/formautofill
|
||||||
|
browser/extensions/fxmonitor
|
||||||
|
- browser/extensions/report-site-issue
|
||||||
|
|
||||||
|
[includes]
|
||||||
|
# non-central apps might want to use %(topsrcdir)s here, or other vars
|
||||||
|
# RFE: that needs to be supported by compare-locales, too, though
|
||||||
|
toolkit = toolkit/locales/l10n.ini
|
||||||
|
services_sync = services/sync/locales/l10n.ini
|
||||||
|
|
||||||
|
[extras]
|
||||||
|
diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
|
||||||
|
--- a/browser/locales/l10n.toml
|
||||||
|
+++ b/browser/locales/l10n.toml
|
||||||
|
@@ -130,20 +130,16 @@ locales = [
|
||||||
|
reference = "browser/extensions/formautofill/locales/en-US/**"
|
||||||
|
l10n = "{l}browser/extensions/formautofill/**"
|
||||||
|
|
||||||
|
[[paths]]
|
||||||
|
reference = "browser/extensions/fxmonitor/locales/en-US/**"
|
||||||
|
l10n = "{l}browser/extensions/fxmonitor/**"
|
||||||
|
|
||||||
|
[[paths]]
|
||||||
|
- reference = "browser/extensions/report-site-issue/locales/en-US/**"
|
||||||
|
- l10n = "{l}browser/extensions/report-site-issue/**"
|
||||||
|
-
|
||||||
|
-[[paths]]
|
||||||
|
reference = "services/sync/locales/en-US/**"
|
||||||
|
l10n = "{l}services/sync/**"
|
||||||
|
|
||||||
|
|
||||||
|
[[includes]]
|
||||||
|
path = "toolkit/locales/l10n.toml"
|
||||||
|
|
||||||
|
[[includes]]
|
74
patches/remove_addons.patch
Normal file
74
patches/remove_addons.patch
Normal file
|
@ -0,0 +1,74 @@
|
||||||
|
diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
|
||||||
|
index 269dcb2..ed7c31d 100644
|
||||||
|
--- a/browser/extensions/moz.build
|
||||||
|
+++ b/browser/extensions/moz.build
|
||||||
|
@@ -5,10 +5,7 @@
|
||||||
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
|
DIRS += [
|
||||||
|
- "doh-rollout",
|
||||||
|
"formautofill",
|
||||||
|
"screenshots",
|
||||||
|
- "webcompat",
|
||||||
|
- "report-site-issue",
|
||||||
|
"pictureinpicture",
|
||||||
|
]
|
||||||
|
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
|
||||||
|
index 496379c..dd6f359 100644
|
||||||
|
--- a/browser/locales/Makefile.in
|
||||||
|
+++ b/browser/locales/Makefile.in
|
||||||
|
@@ -61,7 +61,6 @@ l10n-%:
|
||||||
|
ifneq (,$(wildcard ../extensions/formautofill/locales))
|
||||||
|
@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
|
||||||
|
endif
|
||||||
|
- @$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$*
|
||||||
|
@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
|
||||||
|
@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
|
||||||
|
@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
|
||||||
|
@@ -82,7 +81,6 @@ endif
|
||||||
|
@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
|
||||||
|
@$(MAKE) chrome AB_CD=$*
|
||||||
|
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
|
||||||
|
- @$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$*
|
||||||
|
|
||||||
|
package-win32-installer: $(SUBMAKEFILES)
|
||||||
|
$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
|
||||||
|
diff --git a/browser/locales/filter.py b/browser/locales/filter.py
|
||||||
|
index bb2e992..7d7768e 100644
|
||||||
|
--- a/browser/locales/filter.py
|
||||||
|
+++ b/browser/locales/filter.py
|
||||||
|
@@ -20,7 +20,6 @@ def test(mod, path, entity=None):
|
||||||
|
"browser",
|
||||||
|
"browser/extensions/formautofill",
|
||||||
|
"browser/extensions/fxmonitor",
|
||||||
|
- "browser/extensions/report-site-issue",
|
||||||
|
"extensions/spellcheck",
|
||||||
|
"other-licenses/branding/firefox",
|
||||||
|
"browser/branding/official",
|
||||||
|
diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
|
||||||
|
index f4cb7ca..4efac13 100644
|
||||||
|
--- a/browser/locales/l10n.ini
|
||||||
|
+++ b/browser/locales/l10n.ini
|
||||||
|
@@ -14,7 +14,6 @@ dirs = browser
|
||||||
|
devtools/startup
|
||||||
|
browser/extensions/formautofill
|
||||||
|
browser/extensions/fxmonitor
|
||||||
|
- browser/extensions/report-site-issue
|
||||||
|
|
||||||
|
[includes]
|
||||||
|
# non-central apps might want to use %(topsrcdir)s here, or other vars
|
||||||
|
diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
|
||||||
|
index b9b18fe..af7c583 100644
|
||||||
|
--- a/browser/locales/l10n.toml
|
||||||
|
+++ b/browser/locales/l10n.toml
|
||||||
|
@@ -133,10 +133,6 @@ locales = [
|
||||||
|
reference = "browser/extensions/fxmonitor/locales/en-US/**"
|
||||||
|
l10n = "{l}browser/extensions/fxmonitor/**"
|
||||||
|
|
||||||
|
-[[paths]]
|
||||||
|
- reference = "browser/extensions/report-site-issue/locales/en-US/**"
|
||||||
|
- l10n = "{l}browser/extensions/report-site-issue/**"
|
||||||
|
-
|
||||||
|
[[paths]]
|
||||||
|
reference = "services/sync/locales/en-US/**"
|
||||||
|
l10n = "{l}services/sync/**"
|
13
patches/sed-patches/allow-searchengines-non-esr.patch
Normal file
13
patches/sed-patches/allow-searchengines-non-esr.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/browser/components/enterprisepolicies/schemas/policies-schema.json b/browser/components/enterprisepolicies/schemas/policies-schema.json
|
||||||
|
index d436cf1ca1..ecd6e53b9e 100644
|
||||||
|
--- a/browser/components/enterprisepolicies/schemas/policies-schema.json
|
||||||
|
+++ b/browser/components/enterprisepolicies/schemas/policies-schema.json
|
||||||
|
@@ -1074,7 +1074,7 @@
|
||||||
|
},
|
||||||
|
|
||||||
|
"SearchEngines": {
|
||||||
|
- "enterprise_only": true,
|
||||||
|
+ "enterprise_only": false,
|
||||||
|
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
25
patches/sed-patches/disable-pocket.patch
Normal file
25
patches/sed-patches/disable-pocket.patch
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
|
||||||
|
index 81de0fb201..163b4843e4 100644
|
||||||
|
--- a/browser/components/BrowserGlue.jsm
|
||||||
|
+++ b/browser/components/BrowserGlue.jsm
|
||||||
|
@@ -1375,8 +1375,6 @@ BrowserGlue.prototype = {
|
||||||
|
Normandy.init();
|
||||||
|
}
|
||||||
|
|
||||||
|
- SaveToPocket.init();
|
||||||
|
-
|
||||||
|
AboutHomeStartupCache.init();
|
||||||
|
|
||||||
|
Services.obs.notifyObservers(null, "browser-ui-startup-complete");
|
||||||
|
diff --git a/browser/components/moz.build b/browser/components/moz.build
|
||||||
|
index d16b27b1ea..a119166fa5 100644
|
||||||
|
--- a/browser/components/moz.build
|
||||||
|
+++ b/browser/components/moz.build
|
||||||
|
@@ -42,7 +42,6 @@ DIRS += [
|
||||||
|
"originattributes",
|
||||||
|
"ion",
|
||||||
|
"places",
|
||||||
|
- "pocket",
|
||||||
|
"preferences",
|
||||||
|
"privatebrowsing",
|
||||||
|
"prompts",
|
19
patches/sed-patches/remove-internal-plugin-certs.patch
Normal file
19
patches/sed-patches/remove-internal-plugin-certs.patch
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
|
||||||
|
index 784077b740..e035b3ba6d 100644
|
||||||
|
--- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm
|
||||||
|
+++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
|
||||||
|
@@ -822,14 +822,6 @@ function getSignedStatus(aRv, aCert, aAddonID) {
|
||||||
|
return AddonManager.SIGNEDSTATE_BROKEN;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (aCert.organizationalUnit == "Mozilla Components") {
|
||||||
|
- return AddonManager.SIGNEDSTATE_SYSTEM;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (aCert.organizationalUnit == "Mozilla Extensions") {
|
||||||
|
- return AddonManager.SIGNEDSTATE_PRIVILEGED;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
return /preliminary/i.test(aCert.organizationalUnit)
|
||||||
|
? AddonManager.SIGNEDSTATE_PRELIMINARY
|
||||||
|
: AddonManager.SIGNEDSTATE_SIGNED;
|
55
patches/sed-patches/stop-undesired-requests.patch
Normal file
55
patches/sed-patches/stop-undesired-requests.patch
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js
|
||||||
|
index 92f0652aec..696a99f7ef 100644
|
||||||
|
--- a/browser/components/newtab/data/content/activity-stream.bundle.js
|
||||||
|
+++ b/browser/components/newtab/data/content/activity-stream.bundle.js
|
||||||
|
@@ -1841,7 +1841,7 @@ class ASRouterAdminInner extends react__WEBPACK_IMPORTED_MODULE_3___default.a.Pu
|
||||||
|
label = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", null, "remote settings (", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", {
|
||||||
|
className: "providerUrl",
|
||||||
|
target: "_blank",
|
||||||
|
- href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records",
|
||||||
|
+ href: "https://f.s.s.m.c.qjz9zk/v1/buckets/main/collections/nimbus-desktop-experiments/records",
|
||||||
|
rel: "noopener noreferrer"
|
||||||
|
}, "nimbus-desktop-experiments"), ")");
|
||||||
|
}
|
||||||
|
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
|
||||||
|
index c7cde8917c..b398a22064 100644
|
||||||
|
--- a/modules/libpref/init/all.js
|
||||||
|
+++ b/modules/libpref/init/all.js
|
||||||
|
@@ -2243,7 +2243,7 @@ pref("security.cert_pinning.hpkp.enabled", false);
|
||||||
|
// Remote settings preferences
|
||||||
|
// Note: if you change this, make sure to also review security.onecrl.maximum_staleness_in_seconds
|
||||||
|
pref("services.settings.poll_interval", 86400); // 24H
|
||||||
|
-pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1");
|
||||||
|
+pref("services.settings.server", "https://f.s.s.m.c.qjz9zk/v1");
|
||||||
|
pref("services.settings.default_bucket", "main");
|
||||||
|
|
||||||
|
// The percentage of clients who will report uptake telemetry as
|
||||||
|
diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
|
||||||
|
index 66df850904..1538a2ff0d 100644
|
||||||
|
--- a/services/settings/Utils.jsm
|
||||||
|
+++ b/services/settings/Utils.jsm
|
||||||
|
@@ -60,7 +60,7 @@ var Utils = {
|
||||||
|
);
|
||||||
|
const isXpcshell = env.exists("XPCSHELL_TEST_PROFILE_DIR");
|
||||||
|
return AppConstants.RELEASE_OR_BETA && !Cu.isInAutomation && !isXpcshell
|
||||||
|
- ? "https://firefox.settings.services.mozilla.com/v1"
|
||||||
|
+ ? "https://f.s.s.m.c.qjz9zk/v1"
|
||||||
|
: gServerURL;
|
||||||
|
},
|
||||||
|
|
||||||
|
diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm
|
||||||
|
index 8a3c6acb84..7408b3fd2f 100644
|
||||||
|
--- a/toolkit/components/search/SearchUtils.jsm
|
||||||
|
+++ b/toolkit/components/search/SearchUtils.jsm
|
||||||
|
@@ -159,9 +159,9 @@ var SearchUtils = {
|
||||||
|
|
||||||
|
ENGINES_URLS: {
|
||||||
|
"prod-main":
|
||||||
|
- "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config/records",
|
||||||
|
+ "https://f.s.s.m.c.qjz9zk/v1/buckets/main/collections/search-config/records",
|
||||||
|
"prod-preview":
|
||||||
|
- "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records",
|
||||||
|
+ "https://f.s.s.m.c.qjz9zk/v1/buckets/main-preview/collections/search-config/records",
|
||||||
|
"stage-main":
|
||||||
|
"https://settings.stage.mozaws.net/v1/buckets/main/collections/search-config/records",
|
||||||
|
"stage-preview":
|
5300
patches/unity-menubar.patch
Normal file
5300
patches/unity-menubar.patch
Normal file
File diff suppressed because it is too large
Load diff
13
patches/urlbarprovider-interventions.patch
Normal file
13
patches/urlbarprovider-interventions.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/browser/components/urlbar/UrlbarProviderInterventions.jsm b/browser/components/urlbar/UrlbarProviderInterventions.jsm
|
||||||
|
index e22886ce92..d46d8191f2 100644
|
||||||
|
--- a/browser/components/urlbar/UrlbarProviderInterventions.jsm
|
||||||
|
+++ b/browser/components/urlbar/UrlbarProviderInterventions.jsm
|
||||||
|
@@ -451,7 +451,7 @@ class ProviderInterventions extends UrlbarProvider {
|
||||||
|
]),
|
||||||
|
});
|
||||||
|
for (let [id, phrases] of Object.entries(DOCUMENTS)) {
|
||||||
|
- queryScorer.addDocument({ id, phrases });
|
||||||
|
+// queryScorer.addDocument({ id, phrases });
|
||||||
|
}
|
||||||
|
return queryScorer;
|
||||||
|
});
|
Loading…
Reference in a new issue