Commit 7b916854 authored by Martin Weinelt's avatar Martin Weinelt Committed by github-actions[bot]
Browse files

buildMozillaMach: update no-buildconfig patch for 121+ 

(cherry picked from commit a2502f79)
parent 949dde3d

pkgs/applications/networking/browsers/firefox/common.nix

+2 −1
Original line number Diff line number Diff line
@@ -254,7 +254,8 @@ buildStdenv.mkDerivation { 
  ]

  ++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch

  ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch

  ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch

  ++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch

  ++ lib.optional (lib.versionAtLeast version "121") ./no-buildconfig-ffx121.patch

  ++ extraPatches;



  postPatch = ''

pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx121.patch

0 → 100644
+27 −0
Original line number Diff line number Diff line 
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp

index cfbc39527b02..9327631a79c5 100644

--- a/docshell/base/nsAboutRedirector.cpp

+++ b/docshell/base/nsAboutRedirector.cpp

@@ -88,9 +88,6 @@ static const RedirEntry kRedirMap[] = {

     {"about", "chrome://global/content/aboutAbout.html", 0},

     {"addons", "chrome://mozapps/content/extensions/aboutaddons.html",

      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},

-    {"buildconfig", "chrome://global/content/buildconfig.html",

-     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

-         nsIAboutModule::IS_SECURE_CHROME_UI},

     {"checkerboard", "chrome://global/content/aboutCheckerboard.html",

      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

          nsIAboutModule::ALLOW_SCRIPT},

diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn

index ed7c2ad3fc30..ff54456a6582 100644

--- a/toolkit/content/jar.mn

+++ b/toolkit/content/jar.mn

@@ -41,8 +41,6 @@ toolkit.jar:

    content/global/aboutUrlClassifier.js

    content/global/aboutUrlClassifier.xhtml

    content/global/aboutUrlClassifier.css

-*   content/global/buildconfig.html

-   content/global/buildconfig.css

    content/global/contentAreaUtils.js

    content/global/datepicker.xhtml

 #ifndef MOZ_FENNEC