From 6f589e0b928f6b9ee20b2e3205900f1e2df31020 Mon Sep 17 00:00:00 2001
From: trickypr <23250792+trickypr@users.noreply.github.com>
Date: Sat, 24 Jun 2023 19:09:31 +1000
Subject: [PATCH] =?UTF-8?q?=20=E2=AC=86=EF=B8=8F=20Update=20to=20114.0=20(?=
 =?UTF-8?q?#257)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 👽️ Updated for `114.0.1`

* ⬆️ Update ublock origin
---
 gluon.json                                          | 10 ++++------
 .../customizableui/CustomizableUI-jsm.patch         | 13 +++++--------
 .../content/aboutPolicies-html.patch                |  6 +++---
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/gluon.json b/gluon.json
index 877f2b6..cecdfe7 100644
--- a/gluon.json
+++ b/gluon.json
@@ -5,7 +5,7 @@
   "binaryName": "pulse-browser",
   "version": {
     "product": "firefox",
-    "version": "113.0.1"
+    "version": "114.0.1"
   },
   "buildOptions": {
     "generateBranding": true
@@ -15,7 +15,7 @@
       "platform": "github",
       "id": "uBlock0@raymondhill.net",
       "repo": "gorhill/uBlock",
-      "version": "1.49.2",
+      "version": "1.50.0",
       "fileGlob": "uBlock0_*.firefox(.signed)?.xpi"
     },
     "tabliss": {
@@ -93,10 +93,8 @@
     }
   },
   "license": {
-    "ignoredFiles": [
-      ".*\\.json"
-    ],
+    "ignoredFiles": [".*\\.json"],
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.pulsebrowser.app"
-}
\ No newline at end of file
+}
diff --git a/src/browser/components/customizableui/CustomizableUI-jsm.patch b/src/browser/components/customizableui/CustomizableUI-jsm.patch
index 552e2b3..af86af0 100644
--- a/src/browser/components/customizableui/CustomizableUI-jsm.patch
+++ b/src/browser/components/customizableui/CustomizableUI-jsm.patch
@@ -1,11 +1,11 @@
 diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
-index e97c979363775d2de999e65e7e41c02a736f57ac..501f1235ac9ba571be66b533772cc259aceef48f 100644
+index 7dfad171476f20c6250866afc3b53c6979a58ce1..fb14cacccd08ccd0babdee9f581a443c0bd85872 100644
 --- a/browser/components/customizableui/CustomizableUI.jsm
 +++ b/browser/components/customizableui/CustomizableUI.jsm
-@@ -24,6 +24,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
+@@ -24,6 +24,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
+ XPCOMUtils.defineLazyModuleGetters(lazy, {
+   AddonManager: "resource://gre/modules/AddonManager.jsm",
    AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
-   SearchWidgetTracker: "resource:///modules/SearchWidgetTracker.jsm",
-   CustomizableWidgets: "resource:///modules/CustomizableWidgets.jsm",
 +  ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
    PanelMultiView: "resource:///modules/PanelMultiView.jsm",
    BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
@@ -18,12 +18,11 @@ index e97c979363775d2de999e65e7e41c02a736f57ac..501f1235ac9ba571be66b533772cc259
  
  const kSpecialWidgetPfx = "customizableui-special-";
  
-@@ -253,17 +255,19 @@ var CustomizableUIInternal = {
+@@ -245,17 +247,18 @@ var CustomizableUIInternal = {
        false
      );
  
 +    const { makeWidgetId } = lazy.ExtensionCommon;
-+
      let navbarPlacements = [
        "back-button",
 -      "forward-button",
@@ -40,5 +39,3 @@ index e97c979363775d2de999e65e7e41c02a736f57ac..501f1235ac9ba571be66b533772cc259
        "downloads-button",
        AppConstants.MOZ_DEV_EDITION ? "developer-button" : null,
        "fxa-toolbar-menu-button",
-V_EDITION ? "developer-button" : null,
-       "fxa-toolbar-menu-button",
diff --git a/src/browser/components/enterprisepolicies/content/aboutPolicies-html.patch b/src/browser/components/enterprisepolicies/content/aboutPolicies-html.patch
index 28da536..596cb33 100644
--- a/src/browser/components/enterprisepolicies/content/aboutPolicies-html.patch
+++ b/src/browser/components/enterprisepolicies/content/aboutPolicies-html.patch
@@ -1,10 +1,10 @@
 diff --git a/browser/components/enterprisepolicies/content/aboutPolicies.html b/browser/components/enterprisepolicies/content/aboutPolicies.html
-index 83ae157605f1009588b1d6c87e5eff26a2e5d594..d470b3ab00d87bb43e088290693b7d74d4c354ef 100644
+index 41a9e6bdf632c278432f69a4778bcc8ef01e2d14..63b5819cd48884997651602c3b8930b11398f05c 100644
 --- a/browser/components/enterprisepolicies/content/aboutPolicies.html
 +++ b/browser/components/enterprisepolicies/content/aboutPolicies.html
 @@ -18,6 +18,7 @@
-         <link rel="localization" href="browser/aboutPolicies.ftl">
-         <link rel="localization" href="browser/policies/policies-descriptions.ftl">
+         <link rel="localization" href="toolkit/branding/accounts.ftl">
+         <link rel="localization" href="toolkit/branding/brandings.ftl">
          <script src="chrome://browser/content/policies/aboutPolicies.js"></script>
 +        <script src="chrome://browser/content/contentTheme.js"></script>
      </head>