From cc8a5cf3678bc8e73b8c8df966e9aab14f3d4411 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 4 Mar 2025 19:20:12 +0100
Subject: [PATCH] Update Firefox version to 136.0 in README and surfer.json;
 modify ToolbarContextMenu context menu items

---
 README.md                                     |  2 +-
 .../content/main-popupset-inc-xhtml.patch     | 18 +++++++++++++--
 .../ToolbarContextMenu-sys-mjs.patch          | 22 +++++++++++++++++++
 surfer.json                                   |  2 +-
 4 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch

diff --git a/README.md b/README.md
index d4242097..6c0f170f 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
 
 ## 🖥️ Compatibility
 
-Zen is currently built using Firefox version `135.0.1`! 🚀
+Zen is currently built using Firefox version `136.0`! 🚀
 
 - [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 136.0`!
 - Check out the latest [release notes](https://zen-browser.app/release-notes)!
diff --git a/src/browser/base/content/main-popupset-inc-xhtml.patch b/src/browser/base/content/main-popupset-inc-xhtml.patch
index a49f1bef..072fa90a 100644
--- a/src/browser/base/content/main-popupset-inc-xhtml.patch
+++ b/src/browser/base/content/main-popupset-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
-index 959c523b21c642f29353b9de37b3ce6b5505b01b..0d151ad345dde47467432196ed76f4320b4b92cc 100644
+index 959c523b21c642f29353b9de37b3ce6b5505b01b..4cd26ea85ad4905bade71dcd470b8678079787bd 100644
 --- a/browser/base/content/main-popupset.inc.xhtml
 +++ b/browser/base/content/main-popupset.inc.xhtml
 @@ -206,6 +206,10 @@
@@ -21,7 +21,21 @@ index 959c523b21c642f29353b9de37b3ce6b5505b01b..0d151ad345dde47467432196ed76f432
      </panel>
    </html:template>
  
-@@ -565,6 +570,8 @@
+@@ -426,11 +431,13 @@
+               observes="cmd_CustomizeToolbars"
+               class="viewCustomizeToolbar"
+               data-lazy-l10n-id="toolbar-context-menu-view-customize-toolbar-2"/>
++#if 0
+     <menuseparator id="sidebarRevampSeparator"/>
+     <menuitem id="toolbar-context-toggle-vertical-tabs"
+               data-lazy-l10n-id="toolbar-context-turn-on-vertical-tabs"/>
+     <menuitem id="toolbar-context-customize-sidebar"
+               data-lazy-l10n-id="toolbar-context-customize-sidebar"/>
++#endif
+     <menuseparator contexttype="fullscreen"/>
+     <menuitem id="toolbar-context-full-screen-autohide"
+               class="fullscreen-context-autohide"
+@@ -565,6 +572,8 @@
  
  #include popup-notifications.inc.xhtml
  
diff --git a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
new file mode 100644
index 00000000..6a690a49
--- /dev/null
+++ b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
@@ -0,0 +1,22 @@
+diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
+index 9879487f9ed9ddf825f5fb5c1467ddbd7fbe7a32..9e2565fafe0f5f9afa6065c9f4f522fec745db2a 100644
+--- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs
++++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
+@@ -237,17 +237,6 @@ export var ToolbarContextMenu = {
+     // autohide item's checked state to mirror the autohide pref.
+     showFullScreenViewContextMenuItems(popup);
+ 
+-    let toggleVerticalTabsItem = document.getElementById(
+-      "toolbar-context-toggle-vertical-tabs"
+-    );
+-    document.l10n.setAttributes(
+-      toggleVerticalTabsItem,
+-      gBrowser.tabContainer?.verticalMode
+-        ? "toolbar-context-turn-off-vertical-tabs"
+-        : "toolbar-context-turn-on-vertical-tabs"
+-    );
+-    document.getElementById("toolbar-context-customize-sidebar").hidden =
+-      !gBrowser.tabContainer?.verticalMode;
+ 
+     // View -> Toolbars menu doesn't have the moveToPanel or removeFromToolbar items.
+     if (!moveToPanel || !removeFromToolbar) {
diff --git a/surfer.json b/surfer.json
index 92291b13..37a48a0f 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,7 +5,7 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "135.0.1",
+    "version": "136.0",
     "candidate": "136.0"
   },
   "buildOptions": {