From b2dc05596cab8a5950dff319cf111b7613949937 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Sat, 10 Aug 2024 12:21:15 +0200
Subject: [PATCH] update/fix broken patches for 129.0

---
 patches/context-menu.patch                    | 16 ++++----
 ...sable-data-reporting-at-compile-time.patch |  8 ++--
 .../fullpage-translations-customization.patch | 40 +++++++++++++++----
 3 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/patches/context-menu.patch b/patches/context-menu.patch
index da19aa6..b0e9fa4 100644
--- a/patches/context-menu.patch
+++ b/patches/context-menu.patch
@@ -1,24 +1,24 @@
 diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
-index 39a139f..c565bce 100644
+index 3a58888b28b4..471c238aa284 100644
 --- a/browser/base/content/browser-context.inc
 +++ b/browser/base/content/browser-context.inc
-@@ -100,9 +100,6 @@
+@@ -107,9 +107,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();"/>
-@@ -256,9 +253,6 @@
+                 />
+@@ -264,9 +261,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);"/>
+-                />
        <menu id="context-sendpagetodevice"
              class="sync-ui-item"
              data-l10n-id="main-context-menu-send-to-device"
diff --git a/patches/disable-data-reporting-at-compile-time.patch b/patches/disable-data-reporting-at-compile-time.patch
index 7dbdb81..ac35a25 100644
--- a/patches/disable-data-reporting-at-compile-time.patch
+++ b/patches/disable-data-reporting-at-compile-time.patch
@@ -1,4 +1,5 @@
 diff --git a/browser/moz.configure b/browser/moz.configure
+index e605019172ad..73268e5d353d 100644
 --- a/browser/moz.configure
 +++ b/browser/moz.configure
 @@ -5,11 +5,11 @@
@@ -12,13 +13,14 @@ diff --git a/browser/moz.configure b/browser/moz.configure
  imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True)
 -imply_option("MOZ_NORMANDY", True)
 +imply_option("MOZ_NORMANDY", False)
+ imply_option("MOZ_PROFILE_MIGRATOR", True)
+ 
  
- with only_when(target_has_linux_kernel & compile_environment):
-     option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper")
 diff --git a/python/mach/mach/telemetry.py b/python/mach/mach/telemetry.py
+index 40d5cc221644..36db9a9e45b1 100644
 --- a/python/mach/mach/telemetry.py
 +++ b/python/mach/mach/telemetry.py
-@@ -98,10 +98,7 @@ def is_applicable_telemetry_environment(
+@@ -98,10 +98,7 @@ def is_applicable_telemetry_environment():
  
  
  def is_telemetry_enabled(settings):
diff --git a/patches/fullpage-translations-customization.patch b/patches/fullpage-translations-customization.patch
index cc53cf8..387d687 100644
--- a/patches/fullpage-translations-customization.patch
+++ b/patches/fullpage-translations-customization.patch
@@ -1,14 +1,32 @@
+diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
+index 1fb595272a18..56c2c58e111c 100644
 --- a/browser/base/content/main-popupset.inc.xhtml
 +++ b/browser/base/content/main-popupset.inc.xhtml
-@@ -675,6 +675,8 @@
+@@ -607,6 +607,8 @@
                checked="false"
                autocheck="false"
-               oncommand="FullPageTranslationsPanel.onNeverTranslateSite()"/>
+               id="translations-panel-settings-never-translate-site"/>
 +    <menuitem data-l10n-id="translations-panel-disable-translations"
-+              oncommand="FullPageTranslationsPanel.openDisableTranslations()"/>
++              id="translations-panel-disable-translations"/>
      <menuseparator/>
      <menuitem class="manage-languages-menuitem"
                data-l10n-id="translations-panel-settings-manage-languages"
+diff --git a/browser/base/content/main-popupset.js b/browser/base/content/main-popupset.js
+index c403c914f27c..6338cbd92621 100644
+--- a/browser/base/content/main-popupset.js
++++ b/browser/base/content/main-popupset.js
+@@ -251,6 +251,9 @@ document.addEventListener(
+         case "translations-panel-settings-never-translate-site":
+           FullPageTranslationsPanel.onNeverTranslateSite();
+           break;
++        case "translations-panel-disable-translations":
++          FullPageTranslationsPanel.openDisableTranslations();
++          break;
+         case "translations-panel-manage-languages":
+           FullPageTranslationsPanel.openManageLanguages();
+           break;
+diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
+index 4c2637db10b7..846a538036d7 100644
 --- a/browser/components/preferences/main.inc.xhtml
 +++ b/browser/components/preferences/main.inc.xhtml
 @@ -389,8 +389,16 @@
@@ -37,9 +55,11 @@
  </groupbox>
  
  <!-- Files and Applications -->
+diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
+index fec5aa685ea7..92082d259903 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -144,6 +144,10 @@ Preferences.addAll([
+@@ -145,6 +145,10 @@ Preferences.addAll([
    { id: "dom.ipc.processCount.web", type: "int" },
    { id: "layers.acceleration.disabled", type: "bool", inverted: true },
  
@@ -50,7 +70,7 @@
    // Files and Applications
    { id: "pref.downloads.disable_button.edit_actions", type: "bool" },
  
-@@ -325,6 +329,22 @@ var gMainPane = {
+@@ -326,6 +330,22 @@ var gMainPane = {
  
      gMainPane.initTranslations();
  
@@ -73,7 +93,7 @@
      if (
        Services.prefs.getBoolPref(
          "media.videocontrols.picture-in-picture.enabled"
-@@ -789,6 +809,10 @@ var gMainPane = {
+@@ -793,6 +813,10 @@ var gMainPane = {
        document.getElementById("checkSpelling"),
        () => this.writeCheckSpelling()
      );
@@ -84,7 +104,7 @@
      Preferences.addSyncFromPrefListener(
        document.getElementById("alwaysAsk"),
        () => this.readUseDownloadDir()
-@@ -1019,24 +1043,33 @@ var gMainPane = {
+@@ -1023,24 +1047,33 @@ var gMainPane = {
      document.getElementById("zoomBox").hidden = false;
    },
  
@@ -122,9 +142,11 @@
      class TranslationsState {
        /**
         * The fully initialized state.
+diff --git a/browser/components/translations/content/fullPageTranslationsPanel.js b/browser/components/translations/content/fullPageTranslationsPanel.js
+index 0c8288af9aca..05e49c06ff63 100644
 --- a/browser/components/translations/content/fullPageTranslationsPanel.js
 +++ b/browser/components/translations/content/fullPageTranslationsPanel.js
-@@ -1225,6 +1225,15 @@ var FullPageTranslationsPanel = new (class {
+@@ -1220,6 +1220,15 @@ var FullPageTranslationsPanel = new (class {
      );
    }
  
@@ -140,6 +162,8 @@
    /**
     * Redirect the user to about:preferences
     */
+diff --git a/browser/locales/en-US/browser/translations.ftl b/browser/locales/en-US/browser/translations.ftl
+index e2aca3eabbe1..92d738fdf6e5 100644
 --- a/browser/locales/en-US/browser/translations.ftl
 +++ b/browser/locales/en-US/browser/translations.ftl
 @@ -58,6 +58,9 @@ translations-panel-settings-never-translate-unknown-language =