From 2311e183f1d1dccc749c82fde2d0795fc35e1724 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 2 Jun 2026 11:16:29 +0200
Subject: [PATCH] gh-13745: Disable desktop launcher for windows (gh-13987)

---
 .../urlbar/content/UrlbarInput-mjs.patch      |  4 ++--
 .../windows/nsis/defines-nsi-in.patch         | 12 ++--------
 src/toolkit/moz-configure.patch               | 23 +++++++++++++------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/browser/components/urlbar/content/UrlbarInput-mjs.patch b/src/browser/components/urlbar/content/UrlbarInput-mjs.patch
index f33a99404..43314bcc0 100644
--- a/src/browser/components/urlbar/content/UrlbarInput-mjs.patch
+++ b/src/browser/components/urlbar/content/UrlbarInput-mjs.patch
@@ -140,9 +140,9 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..c166b7de23c35716bf8c51b6b9c72f77
 +      this._zenHandleUrlbarClose();
 +    } else if (!this._untrimmedValue || this.searchMode || this.window.gZenVerticalTabsManager._hasSetSingleToolbar) {
 +      // Restore the current page URL when the urlbar is empty on blur
-+      this.window.setTimeout(() => {
++      this.window.requestAnimationFrame(() => {
 +        this.handleRevert();
-+      }, 0);
++      });
 +    }
 +
 +    // Arc like URLbar: Blur the input on exit
diff --git a/src/browser/installer/windows/nsis/defines-nsi-in.patch b/src/browser/installer/windows/nsis/defines-nsi-in.patch
index f423ee10d..862ac618b 100644
--- a/src/browser/installer/windows/nsis/defines-nsi-in.patch
+++ b/src/browser/installer/windows/nsis/defines-nsi-in.patch
@@ -1,16 +1,8 @@
 diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
-index a9bf2d67ce522054442be664bda1434c63609ea1..54e2c97f79b1e526eca66f4ca611e26b9c3f89d4 100644
+index a9bf2d67ce522054442be664bda1434c63609ea1..16e03732d78207ce602066a4bccc0d2c2385ca91 100644
 --- a/browser/installer/windows/nsis/defines.nsi.in
 +++ b/browser/installer/windows/nsis/defines.nsi.in
-@@ -110,7 +110,6 @@
- #endif
- 
- #ifdef DESKTOP_LAUNCHER_ENABLED
--!define DESKTOP_LAUNCHER_ENABLED
- #endif
- 
- #ifdef MOZ_BITS_DOWNLOAD
-@@ -147,7 +146,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
+@@ -147,7 +147,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
  !define APPROXIMATE_REQUIRED_SPACE_MB "145"
  
  # Constants for parts of the telemetry submission URL
diff --git a/src/toolkit/moz-configure.patch b/src/toolkit/moz-configure.patch
index cacaabb60..48f198e0c 100644
--- a/src/toolkit/moz-configure.patch
+++ b/src/toolkit/moz-configure.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 226d0c5a93a9a2404e1974001da4e34b7b670067..b73277448f7d2706d316df2505e17d232f392d47 100644
+index 0f5dab192533aa42df97ee3bd4176a9f44d4d568..d45ad2409f6d36106fce5a380545aaae9397ae84 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -22,6 +22,7 @@ def check_moz_app_id(moz_app_id, build_project):
+@@ -20,6 +20,7 @@ def check_moz_app_id(moz_app_id, build_project):
  
  project_flag(
      env="MOZ_APP_VENDOR",
@@ -10,7 +10,7 @@ index 226d0c5a93a9a2404e1974001da4e34b7b670067..b73277448f7d2706d316df2505e17d23
      nargs=1,
      help='Used for application.ini\'s "Vendor" field, which also impacts profile location and user-visible fields',
  )
-@@ -35,6 +36,7 @@ project_flag(
+@@ -33,6 +34,7 @@ project_flag(
  
  project_flag(
      "MOZ_APP_PROFILE",
@@ -18,7 +18,7 @@ index 226d0c5a93a9a2404e1974001da4e34b7b670067..b73277448f7d2706d316df2505e17d23
      nargs=1,
      help='Used for application.ini\'s "Profile" field, which controls profile location',
  )
-@@ -86,10 +88,13 @@ option(
+@@ -84,10 +86,13 @@ option(
  )
  set_config("MOZ_INCLUDE_SOURCE_INFO", True, when="MOZ_INCLUDE_SOURCE_INFO")
  
@@ -33,7 +33,7 @@ index 226d0c5a93a9a2404e1974001da4e34b7b670067..b73277448f7d2706d316df2505e17d23
      help="Set distribution-specific id",
  )
  set_config("MOZ_DISTRIBUTION_ID", depends("--with-distribution-id")(lambda v: v[0]))
-@@ -931,9 +936,9 @@ set_config("MOZ_SYSTEM_AV1", True, when="--with-system-av1")
+@@ -874,9 +879,9 @@ set_config("MOZ_SYSTEM_AV1", True, when="--with-system-av1")
  option("--disable-jxl", help="Disable jxl image support")
  
  
@@ -46,7 +46,7 @@ index 226d0c5a93a9a2404e1974001da4e34b7b670067..b73277448f7d2706d316df2505e17d23
          return True
  
  
-@@ -2070,7 +2075,7 @@ set_define("A11Y_LOG", True, when=a11y_log)
+@@ -2028,7 +2033,7 @@ set_define("A11Y_LOG", True, when=a11y_log)
  # ==============================================================
  @depends(milestone)
  def require_signing(milestone):
@@ -55,7 +55,7 @@ index 226d0c5a93a9a2404e1974001da4e34b7b670067..b73277448f7d2706d316df2505e17d23
  
  
  option(
-@@ -3903,7 +3908,7 @@ with only_when(compile_environment):
+@@ -3912,7 +3917,7 @@ with only_when(compile_environment):
              return "Mozilla"
          elif target.os == "Android":
              return ".mozilla"
@@ -64,3 +64,12 @@ index 226d0c5a93a9a2404e1974001da4e34b7b670067..b73277448f7d2706d316df2505e17d23
  
      option(
          "--with-user-appdir",
+@@ -4325,7 +4330,7 @@ with only_when(target_is_windows):
+ 
+     @depends(target.abi)
+     def desktop_launcher_enabled(abi):
+-        return abi == "msvc"
++        return False # See gh-13745
+ 
+     set_config("DESKTOP_LAUNCHER_ENABLED", True, when=desktop_launcher_enabled)
+     set_define("DESKTOP_LAUNCHER_ENABLED", True, when=desktop_launcher_enabled)