zotan/snowleopard
1
0
Fork 1
Code Activity

Update patches

Browse source
This commit is contained in:
Laura Hausmann 2023-10-27 17:46:19 +02:00
parent 400ce007a5
commit f11437c37e
Signed by: zotan
GPG key ID: D044E84C5BE01605
5 changed files with 201 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assets/mozconfig
View file

@ -14,7 +14,7 @@ ac_add_options --with-unsigned-addon-scopes=app,system
export MOZ_REQUIRE_SIGNING=
mk_add_options MOZ_CRASHREPORTER=0
mk_add_options MOZ_DATA_REPORTING=0
mk_add_options MOZ_SERVICES_HEALTHREPORT=0
mk_add_options MOZ_TELEMETRY_REPORTING=0
ac_add_options MOZ_CRASHREPORTER=
ac_add_options MOZ_DATA_REPORTING=
#ac_add_options MOZ_SERVICES_HEALTHREPORT=
ac_add_options MOZ_TELEMETRY_REPORTING=

27
patches/0006-disable-privacy-policy-popup.patch Normal file
View file

@ -0,0 +1,27 @@
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 86bfe71247a6a..cf0d7e43cca72 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -3693,14 +3693,14 @@ pref("toolkit.lazyHiddenWindow", true);
pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
#ifdef MOZ_DATA_REPORTING
- pref("datareporting.policy.dataSubmissionEnabled", true);
- pref("datareporting.policy.dataSubmissionPolicyNotifiedTime", "0");
- pref("datareporting.policy.dataSubmissionPolicyAcceptedVersion", 0);
- pref("datareporting.policy.dataSubmissionPolicyBypassNotification", false);
- pref("datareporting.policy.currentPolicyVersion", 2);
- pref("datareporting.policy.minimumPolicyVersion", 1);
- pref("datareporting.policy.minimumPolicyVersion.channel-beta", 2);
- pref("datareporting.policy.firstRunURL", "https://www.mozilla.org/privacy/firefox/");
+// pref("datareporting.policy.dataSubmissionEnabled", true);
+// pref("datareporting.policy.dataSubmissionPolicyNotifiedTime", "0");
+// pref("datareporting.policy.dataSubmissionPolicyAcceptedVersion", 0);
+// pref("datareporting.policy.dataSubmissionPolicyBypassNotification", false);
+// pref("datareporting.policy.currentPolicyVersion", 2);
+// pref("datareporting.policy.minimumPolicyVersion", 1);
+// pref("datareporting.policy.minimumPolicyVersion.channel-beta", 2);
+// pref("datareporting.policy.firstRunURL", "https://www.mozilla.org/privacy/firefox/");
#endif
#ifdef MOZ_SERVICES_HEALTHREPORT

111
patches/0007-disable-tab-shortcuts.patch Normal file
View file

@ -0,0 +1,111 @@
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index d08984b796330..ec2b46f95f6ff 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -75,8 +75,8 @@
<command id="Browser:ReloadSkipCache" oncommand="BrowserReloadSkipCache()" disabled="true">
<observes element="Browser:Reload" attribute="disabled"/>
</command>
- <command id="Browser:NextTab" oncommand="gBrowser.tabContainer.advanceSelectedTab(1, true);"/>
- <command id="Browser:PrevTab" oncommand="gBrowser.tabContainer.advanceSelectedTab(-1, true);"/>
+# <command id="Browser:NextTab" oncommand="gBrowser.tabContainer.advanceSelectedTab(1, true);"/>
+# <command id="Browser:PrevTab" oncommand="gBrowser.tabContainer.advanceSelectedTab(-1, true);"/>
<command id="Browser:ShowAllTabs" oncommand="gTabsPanel.showAllTabsPanel();"/>
<command id="cmd_fullZoomReduce" oncommand="FullZoom.reduce()"/>
<command id="cmd_fullZoomEnlarge" oncommand="FullZoom.enlarge()"/>
@@ -341,15 +341,15 @@
#define NUM_SELECT_TAB_MODIFIER accel
#endif
-#expand <key id="key_selectTab1" oncommand="gBrowser.selectTabAtIndex(0, event);" key="1" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
-#expand <key id="key_selectTab2" oncommand="gBrowser.selectTabAtIndex(1, event);" key="2" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
-#expand <key id="key_selectTab3" oncommand="gBrowser.selectTabAtIndex(2, event);" key="3" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
-#expand <key id="key_selectTab4" oncommand="gBrowser.selectTabAtIndex(3, event);" key="4" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
-#expand <key id="key_selectTab5" oncommand="gBrowser.selectTabAtIndex(4, event);" key="5" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
-#expand <key id="key_selectTab6" oncommand="gBrowser.selectTabAtIndex(5, event);" key="6" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
-#expand <key id="key_selectTab7" oncommand="gBrowser.selectTabAtIndex(6, event);" key="7" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
-#expand <key id="key_selectTab8" oncommand="gBrowser.selectTabAtIndex(7, event);" key="8" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
-#expand <key id="key_selectLastTab" oncommand="gBrowser.selectTabAtIndex(-1, event);" key="9" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
+# #expand <key id="key_selectTab1" oncommand="gBrowser.selectTabAtIndex(0, event);" key="1" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
+# #expand <key id="key_selectTab2" oncommand="gBrowser.selectTabAtIndex(1, event);" key="2" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
+# #expand <key id="key_selectTab3" oncommand="gBrowser.selectTabAtIndex(2, event);" key="3" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
+# #expand <key id="key_selectTab4" oncommand="gBrowser.selectTabAtIndex(3, event);" key="4" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
+# #expand <key id="key_selectTab5" oncommand="gBrowser.selectTabAtIndex(4, event);" key="5" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
+# #expand <key id="key_selectTab6" oncommand="gBrowser.selectTabAtIndex(5, event);" key="6" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
+# #expand <key id="key_selectTab7" oncommand="gBrowser.selectTabAtIndex(6, event);" key="7" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
+# #expand <key id="key_selectTab8" oncommand="gBrowser.selectTabAtIndex(7, event);" key="8" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
+# #expand <key id="key_selectLastTab" oncommand="gBrowser.selectTabAtIndex(-1, event);" key="9" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
<key id="key_wrCaptureCmd"
#ifdef XP_MACOSX
diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js
index f1d264d84fec8..ca0367a34ca23 100644
--- a/browser/base/content/tabbrowser.js
+++ b/browser/base/content/tabbrowser.js
@@ -5641,14 +5641,14 @@
case ShortcutUtils.NEXT_TAB:
if (AppConstants.platform == "macosx") {
- this.tabContainer.advanceSelectedTab(1, true);
- aEvent.preventDefault();
+// this.tabContainer.advanceSelectedTab(1, true);
+// aEvent.preventDefault();
}
break;
case ShortcutUtils.PREVIOUS_TAB:
if (AppConstants.platform == "macosx") {
- this.tabContainer.advanceSelectedTab(-1, true);
- aEvent.preventDefault();
+// this.tabContainer.advanceSelectedTab(-1, true);
+// aEvent.preventDefault();
}
break;
}
diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
index 997e8413f2a22..178c1dee73632 100644
--- a/toolkit/content/widgets/tabbox.js
+++ b/toolkit/content/widgets/tabbox.js
@@ -134,20 +134,20 @@
true
);
if (this.tabs && this.handleCtrlTab) {
- this.tabs.advanceSelectedTab(event.shiftKey ? -1 : 1, true);
- event.preventDefault();
+// this.tabs.advanceSelectedTab(event.shiftKey ? -1 : 1, true);
+// event.preventDefault();
}
break;
case ShortcutUtils.PREVIOUS_TAB:
if (this.tabs) {
- this.tabs.advanceSelectedTab(-1, true);
- event.preventDefault();
+// this.tabs.advanceSelectedTab(-1, true);
+// event.preventDefault();
}
break;
case ShortcutUtils.NEXT_TAB:
if (this.tabs) {
- this.tabs.advanceSelectedTab(1, true);
- event.preventDefault();
+ // this.tabs.advanceSelectedTab(1, true);
+// event.preventDefault();
}
break;
}
diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
index 01c7ed0125d69..33c915f3e3cf5 100644
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -3379,6 +3379,12 @@ void EventStateManager::PostHandleKeyboardEvent(
EnsureDocument(presContext);
nsFocusManager* fm = nsFocusManager::GetFocusManager();
if (fm && mDocument) {
+
+ // We don't care about tab movement, it's handled by Sidebery
+ if (aKeyboardEvent->IsControl() && aKeyboardEvent->mKeyCode == NS_VK_TAB) {
+ return;
+ }
+
// Shift focus forward or back depending on shift key
bool isDocMove = aKeyboardEvent->IsControl() ||
aKeyboardEvent->mKeyCode == NS_VK_F6;

46
patches/0008-remove-default-bookmars.patch Normal file
View file

@ -0,0 +1,46 @@
diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html
index c42e81ac23e37..2e3f72eedba36 100644
--- a/browser/base/content/default-bookmarks.html
+++ b/browser/base/content/default-bookmarks.html
@@ -29,41 +29,6 @@
<dl><p>
<dt><h3 personal_toolbar_folder="true" data-l10n-id="default-bookmarks-toolbarfolder">default-bookmarks-toolbarfolder</h3></dt>
<dd data-l10n-id="default-bookmarks-toolbarfolder-description">default-bookmarks-toolbarfolder-description</dd>
-#ifndef NIGHTLY_BUILD
-#ifdef EARLY_BETA_OR_EARLIER
- <dl><p>
- <dt><a href="https://www.mozilla.org/firefox/central/" icon="@firefox_icon@" data-l10n-id="default-bookmarks-getting-started">default-bookmarks-getting-started</a></dt>
- </dl><p>
-#else
- <dl><p>
- <dt><a href="https://www.mozilla.org/firefox/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users&utm_content=-global" icon="@firefox_icon@" data-l10n-id="default-bookmarks-getting-started">default-bookmarks-getting-started</a></dt>
- </dl><p>
-#endif
- <dt><h3 data-l10n-id="default-bookmarks-firefox-heading">default-bookmarks-firefox-heading</h3></dt>
- <dl><p>
- <dt><a href="https://support.mozilla.org/products/firefox" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-get-help">default-bookmarks-firefox-get-help</a></dt>
- <dt><a href="https://support.mozilla.org/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-customize">default-bookmarks-firefox-customize</a></dt>
-#ifdef EARLY_BETA_OR_EARLIER
- <dt><a href="https://www.mozilla.org/contribute/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users-beta&utm_content=-global" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
-#else
- <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
-#endif
- <dt><a href="https://www.mozilla.org/about/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-about">default-bookmarks-firefox-about</a></dt>
- </dl><p>
-#else
- <dl><p>
- <dt><a href="https://www.mozilla.org/contribute/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users-nightly&utm_content=-global" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
- </dl><p>
- <dt><h3 data-l10n-id="default-bookmarks-nightly-heading">default-bookmarks-nightly-heading</h3></dt>
- <dl><p>
- <dt><a href="https://blog.nightly.mozilla.org/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-nightly-blog">default-bookmarks-nightly-blog</a></dt>
- <dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz" data-l10n-id="default-bookmarks-bugzilla">default-bookmarks-bugzilla</a></dt>
- <dt><a href="https://developer.mozilla.org/" icon="@mdn_icon@" shortcuturl="mdn" data-l10n-id="default-bookmarks-mdn">default-bookmarks-mdn</a></dt>
- <dt><a href="https://addons.mozilla.org/firefox/addon/nightly-tester-tools/" icon="@addon_icon@" data-l10n-id="default-bookmarks-nightly-tester-tools">default-bookmarks-nightly-tester-tools</a></dt>
- <dt><a href="about:crashes" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-crashes">default-bookmarks-crashes</a></dt>
- <dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-planet">default-bookmarks-planet</a></dt>
- </dl><p>
-#endif
</dl>
</body>
</html>

13
patches/0009-allow-tab-key-webextensions.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/toolkit/modules/ShortcutUtils.sys.mjs b/toolkit/modules/ShortcutUtils.sys.mjs
index e45855602bb2a..6e2162493f6c5 100644
--- a/toolkit/modules/ShortcutUtils.sys.mjs
+++ b/toolkit/modules/ShortcutUtils.sys.mjs
@@ -226,7 +226,7 @@ export var ShortcutUtils = {
const MEDIA_KEYS =
/^(MediaNextTrack|MediaPlayPause|MediaPrevTrack|MediaStop)$/;
const BASIC_KEYS =
- /^([A-Z0-9]|Comma|Period|Home|End|PageUp|PageDown|Space|Insert|Delete|Up|Down|Left|Right)$/;
+ /^([A-Z0-9]|Comma|Period|Home|End|PageUp|PageDown|Space|Insert|Delete|Up|Down|Left|Right|Tab)$/;
const FUNCTION_KEYS = /^(F[1-9]|F1[0-2])$/;
if (MEDIA_KEYS.test(string.trim())) {