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 @@ -@@ -108,31 +109,4 @@ +@@ -108,20 +108,4 @@ @@ -30,20 +30,9 @@ - - - -- - -- -- -- - - ---- 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 @@ - - -
--
-+