From e8ae3cc0184773575beff31be1b890d5c61554c9 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Wed, 5 Jul 2023 16:24:28 +0200
Subject: [PATCH] bump to version 115.0-1

---
 patches/allow-ubo-private-mode.patch  |  4 ++--
 patches/bootstrap-without-vcs.patch   | 11 ++++++-----
 patches/msix.patch                    | 13 +------------
 patches/remove_addons.patch           |  6 +++---
 patches/ui-patches/firefox-view.patch | 19 +++++++++----------
 version                               |  2 +-
 6 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/patches/allow-ubo-private-mode.patch b/patches/allow-ubo-private-mode.patch
index ea52d51..959a1cf 100644
--- a/patches/allow-ubo-private-mode.patch
+++ b/patches/allow-ubo-private-mode.patch
@@ -1,7 +1,7 @@
 diff --git a/toolkit/components/extensions/Extension.jsm b/toolkit/components/extensions/Extension.jsm
 index 7281518..322dc09 100644
---- a/toolkit/components/extensions/Extension.jsm
-+++ b/toolkit/components/extensions/Extension.jsm
+--- a/toolkit/components/extensions/Extension.sys.mjs
++++ b/toolkit/components/extensions/Extension.sys.mjs
 @@ -3286,6 +3286,16 @@ class Extension extends ExtensionData {
        this.permissions.add(PRIVATE_ALLOWED_PERMISSION);
      }
diff --git a/patches/bootstrap-without-vcs.patch b/patches/bootstrap-without-vcs.patch
index 9b87d04..b4295b8 100644
--- a/patches/bootstrap-without-vcs.patch
+++ b/patches/bootstrap-without-vcs.patch
@@ -26,7 +26,7 @@
  def update_git_tools(git: Optional[Path], root_state_dir: Path):
 --- a/python/mozversioncontrol/mozversioncontrol/__init__.py
 +++ b/python/mozversioncontrol/mozversioncontrol/__init__.py
-@@ -744,6 +744,29 @@ class GitRepository(Repository):
+@@ -744,7 +744,30 @@ class GitRepository(Repository):
          self._run("config", name, value)
  
  
@@ -53,9 +53,10 @@
 +
 +        
 +
- def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"):
+ def get_repository_object(
+     path: Optional[Union[str, Path]], hg="hg", git="git", src="src"
+ ):
      """Get a repository object for the repository at `path`.
-     If `path` is not a known VCS repository, raise an exception.
 @@ -757,7 +780,7 @@ def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"):
      elif (path / ".git").exists():
          return GitRepository(path, git=git)
@@ -71,9 +72,9 @@
          return GitRepository(Path(config.topsrcdir), git=config.substs["GIT"])
 +    elif flavor == "local":
 +        return LocalRepository(config.topsrcdir)
+     elif flavor == "src":
+         return SrcRepository(Path(config.topsrcdir), src=config.substs["SRC"])
      else:
-         raise MissingVCSInfo("unknown VCS_CHECKOUT_TYPE value: %s" % flavor)
- 
 --- a/third_party/python/mozilla_repo_urls/mozilla_repo_urls/parser.py
 +++ b/third_party/python/mozilla_repo_urls/mozilla_repo_urls/parser.py
 @@ -9,22 +9,7 @@ for i, platform in enumerate(ADDITIONAL_PLATFORMS):
diff --git a/patches/msix.patch b/patches/msix.patch
index 97f4dfa..42e73ac 100644
--- a/patches/msix.patch
+++ b/patches/msix.patch
@@ -22,7 +22,7 @@
          <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
            <uap:ShowNameOnTiles>
              <uap:ShowOn Tile="square150x150Logo"/>
-@@ -108,31 +109,4 @@
+@@ -108,20 +108,4 @@
        </Extensions>
      </Application>
    </Applications>
@@ -30,20 +30,9 @@
 -    <!-- These COM registrations allow Windows/MSAA to access Firefox accessibility features. -->
 -    <com:Extension Category="windows.comInterface">
 -      <com:ComInterface>
--        <com:ProxyStub DisplayName="AccessibleHandler"
--                       Id="@MOZ_IGECKOBACKCHANNEL_IID@"
--                       Path="VFS\ProgramFiles\@APPX_INSTDIR@\AccessibleHandler.dll" />
 -        <com:ProxyStub DisplayName="AccessibleMarshal"
 -                       Id="1814ceeb-49e2-407f-af99-fa755a7d2607"
 -                       Path="VFS\ProgramFiles\@APPX_INSTDIR@\AccessibleMarshal.dll" />
--        <com:Interface Id="@MOZ_IGECKOBACKCHANNEL_IID@"
--                       ProxyStubClsid="@MOZ_IGECKOBACKCHANNEL_IID@" />
--        <com:Interface Id="@MOZ_IHANDLERCONTROL_IID@"
--                       ProxyStubClsid="@MOZ_IGECKOBACKCHANNEL_IID@"
--                       AsynchronousInterface="@MOZ_ASYNCIHANDLERCONTROL_IID@" />
--        <com:Interface Id="@MOZ_ASYNCIHANDLERCONTROL_IID@"
--                       ProxyStubClsid="@MOZ_IGECKOBACKCHANNEL_IID@"
--                       SynchronousInterface="@MOZ_IHANDLERCONTROL_IID@" />
 -        <com:Interface Id="4e747be5-2052-4265-8af0-8ecad7aad1c0"
 -                       ProxyStubClsid="1814ceeb-49e2-407f-af99-fa755a7d2607" />
 -        <com:Interface Id="1814ceeb-49e2-407f-af99-fa755a7d2607"
diff --git a/patches/remove_addons.patch b/patches/remove_addons.patch
index 04777e9..1c3377b 100644
--- a/patches/remove_addons.patch
+++ b/patches/remove_addons.patch
@@ -66,9 +66,9 @@ index e9d50107cb10..914a2f1a6310 100644
 -    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"
 -- 
 2.37.3
 
diff --git a/patches/ui-patches/firefox-view.patch b/patches/ui-patches/firefox-view.patch
index b32a6bf..8024360 100644
--- a/patches/ui-patches/firefox-view.patch
+++ b/patches/ui-patches/firefox-view.patch
@@ -51,8 +51,8 @@
    </html:template>
  </toolbox>
  </box>
---- a/browser/components/customizableui/CustomizableUI.jsm
-+++ b/browser/components/customizableui/CustomizableUI.jsm
+--- a/browser/components/customizableui/CustomizableUI.sys.mjs
++++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -289,7 +289,6 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_TOOLBAR,
@@ -82,15 +82,14 @@
      if (currentVersion < 19) {
 --- a/browser/components/firefoxview/firefoxview.html
 +++ b/browser/components/firefoxview/firefoxview.html
-@@ -34,7 +34,7 @@
-       </div>
-     </div>
-     <main>
--      <details class="content-container" is="tab-pickup-container" id="tab-pickup-container" open>
-+      <details class="content-container" is="tab-pickup-container" id="tab-pickup-container" open hidden>
+@@ -62,6 +62,7 @@
+         is="tab-pickup-container"
+         id="tab-pickup-container"
+         open
++	hidden
+       >
          <summary class="page-section-header">
-           <span class="twisty icon" data-l10n-id="firefoxview-collapse-button-hide" aria-role="presentation"></span>
-           <h1 id="collapsible-synced-tabs-header" data-l10n-id="firefoxview-tabpickup-header"></h1>
+           <span
 --- a/browser/components/firefoxview/firefoxview.mjs
 +++ b/browser/components/firefoxview/firefoxview.mjs
 @@ -41,7 +41,26 @@ const launchFeatureTour = () => {
diff --git a/version b/version
index a04f1c9..e991447 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-114.0.2
+115.0