From bd7780b2da7263ff11909d91f8b662b086e50e44 Mon Sep 17 00:00:00 2001
From: Nirupam Bhowmick <48842933+heydryft@users.noreply.github.com>
Date: Fri, 26 Dec 2025 00:19:33 +0000
Subject: [PATCH] fix: resolve malformed patch errors and update
 no-search-engines.patch context

- Fix fingerprint-injection.patch: remove duplicate BrowsingContext line and fix hunk header
- Fix font-hijacker.patch: add space to blank line 125
- Fix no-search-engines.patch: add missing context for getProvider call in UrlbarProviderInterventions
- Disable webgl-spoofing-TEMP.patch to avoid conflicts
---
 patches/fingerprint-injection.patch |  3 +--
 patches/font-hijacker.patch         |  2 +-
 patches/no-search-engines.patch     | 10 ++++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/patches/fingerprint-injection.patch b/patches/fingerprint-injection.patch
index 6c64481c..4b89b9ba 100644
--- a/patches/fingerprint-injection.patch
+++ b/patches/fingerprint-injection.patch
@@ -188,8 +188,7 @@ index 8e577bd9fd..3ed748a75f 100644
    if (mWindow) {
      // Check if this tab is set to be offline.
      BrowsingContext* bc = mWindow->GetBrowsingContext();
-     BrowsingContext* bc = mWindow->GetBrowsingContext();
-@@ -625,6 +625,8 @@ bool Navigator::OnLine() {
+@@ -634,6 +634,8 @@ bool Navigator::OnLine() {
  void Navigator::GetBuildID(nsAString& aBuildID, CallerType aCallerType,
                             ErrorResult& aRv) const {
    if (aCallerType != CallerType::System) {
diff --git a/patches/font-hijacker.patch b/patches/font-hijacker.patch
index 620cf21e..369c3c51 100644
--- a/patches/font-hijacker.patch
+++ b/patches/font-hijacker.patch
@@ -122,7 +122,7 @@ index 70c06609e9..66b2666621 100644
  #include "mozilla/dom/FontFaceBinding.h"
 +#include "MaskConfig.hpp"
  #include "nsTHashSet.h"
-
+ 
  class gfxFontFaceBufferSource;
  
 @@ -35,6 +37,20 @@
diff --git a/patches/no-search-engines.patch b/patches/no-search-engines.patch
index 56e0e1a6..7278a39e 100644
--- a/patches/no-search-engines.patch
+++ b/patches/no-search-engines.patch
@@ -2,14 +2,20 @@ diff --git a/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs b/bro
 index 988f5831f2..62f64589a4 100644
 --- a/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs
-@@ -484,6 +484,6 @@ export class UrlbarProviderInterventions extends UrlbarProvider {
+@@ -484,11 +484,11 @@ export class UrlbarProviderInterventions extends UrlbarProvider {
   async isActive(queryContext) {
 -    if (
 +    if (true ||
       !queryContext.searchString ||
       queryContext.searchString.length > UrlbarUtils.MAX_TEXT_LENGTH ||
       lazy.UrlUtils.REGEXP_LIKE_PROTOCOL.test(queryContext.searchString) ||
- 
+      !EN_LOCALE_MATCH.test(Services.locale.appLocaleAsBCP47) ||
+      !Services.policies.isAllowed("urlbarinterventions") ||
+      (await this.queryInstance
+        .getProvider(lazy.UrlbarProviderGlobalActions.name)
+        ?.isActive(queryContext))
+    ) {
+
 diff --git a/toolkit/components/search/SearchEngineSelector.sys.mjs b/toolkit/components/search/SearchEngineSelector.sys.mjs
 index 3dab73ee2f..c5c1259217 100644
 --- a/toolkit/components/search/SearchEngineSelector.sys.mjs