firefox: 92.0.1 -> 93.0

(cherry picked from commit 7dfcaf5e73feebe12606dbc4c08128af75797fa4)

3 files changed, 13 insertions, 50 deletions

diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
index eeca26fcaf93..81f826d19a73 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
@@ -156,23 +156,6 @@ buildStdenv.mkDerivation ({
       sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab";
     })
 
-  # These fix Firefox on sway and other non-Gnome wayland WMs. They should be
-  # removed whenever the following two patches make it onto a release:
-  # 1. https://hg.mozilla.org/mozilla-central/rev/51c13987d1b8
-  # 2. https://hg.mozilla.org/integration/autoland/rev/3b856ecc00e4
-  # This will probably happen in the next point release, but let's be careful
-  # and double check whether it's working on sway on the next v bump.
-  ++ lib.optionals (lib.versionAtLeast version "92") [
-      (fetchpatch {
-        url = "https://hg.mozilla.org/integration/autoland/raw-rev/3b856ecc00e4";
-        sha256 = "sha256-d8IRJD6ELC3ZgEs1ES/gy2kTNu/ivoUkUNGMEUoq8r8=";
-      })
-      (fetchpatch {
-        url = "https://hg.mozilla.org/mozilla-central/raw-rev/51c13987d1b8";
-        sha256 = "sha256-C2jcoWLuxW0Ic+Mbh3UpEzxTKZInljqVdcuA9WjspoA=";
-      })
-  ]
-
   ++ patches;
 
 
@@ -265,6 +248,7 @@ buildStdenv.mkDerivation ({
     # this will run autoconf213
     configureScript="$(realpath ./mach) configure"
     export MOZCONFIG=$(pwd)/mozconfig
+    export MOZBUILD_STATE_PATH=$(pwd)/mozbuild
 
     # Set C flags for Rust's bindgen program. Unlike ordinary C
     # compilation, bindgen does not invoke $CC directly. Instead it
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
index 774ac9770afe..2173f62814e7 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -3,10 +3,10 @@
 rec {
   firefox = firefoxCommon rec {
     pname = "firefox";
-    version = "92.0.1";
+    version = "93.0";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "53361c231a4ac93a1808c9ccb29893d85b5e516fe939a770aac7f178abb4f43cbe3571097e5c5bf91b11fd95fc62b61f2aa215a45048357bfc9dad9eabdee9ef";
+      sha512 = "b29890e331819d47201b599b9feaaa7eaa0b02088fcbf980efc4f289d43da4f73970bf35ba2f763a2a892fd5318deb68cb9a66e71e9bc0c603642434c7e32e91";
     };
 
     meta = {
diff --git a/overlays/patches/firefox/release/D6695.diff b/overlays/patches/firefox/release/D6695.diff
index de7eae4741ad..bb02e8a2b0aa 100644
--- a/overlays/patches/firefox/release/D6695.diff
+++ b/overlays/patches/firefox/release/D6695.diff
@@ -1,8 +1,8 @@
 diff --git a/toolkit/moz.build b/toolkit/moz.build
-index 060a2f4ed9e8..f821576bb62f 100644
+index 14f4638b693e..1ed5c2002991 100644
 --- a/toolkit/moz.build
 +++ b/toolkit/moz.build
-@@ -82,3 +82,6 @@ with Files("pluginproblem/**"):
+@@ -75,3 +75,6 @@ with Files("mozapps/preferences/**"):
  
  with Files("l10n-registry.manifest"):
      BUG_COMPONENT = ("Core", "Localization")
@@ -10,10 +10,10 @@ index 060a2f4ed9e8..f821576bb62f 100644
 +if CONFIG["ENABLE_TESTS"]:
 +    DIRS += ["tests/gtest"]
 diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
-index 2760be996403..c56b4a7a9774 100644
+index 50a64a2b469c..b97fedabe5ca 100644
 --- a/toolkit/xre/nsXREDirProvider.cpp
 +++ b/toolkit/xre/nsXREDirProvider.cpp
-@@ -405,13 +405,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
+@@ -412,13 +412,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
      nsCOMPtr<nsIFile> localDir;
      rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), false);
      if (NS_SUCCEEDED(rv)) {
@@ -27,7 +27,7 @@ index 2760be996403..c56b4a7a9774 100644
        localDir.swap(file);
      }
    }
-@@ -1429,6 +1422,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+@@ -1417,6 +1410,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
    NS_ENSURE_SUCCESS(rv, rv);
  
    localDir = dirFileMac;
@@ -37,7 +37,7 @@ index 2760be996403..c56b4a7a9774 100644
  #elif defined(XP_IOS)
    nsAutoCString userDir;
    if (GetUIKitDirectory(aLocal, userDir)) {
-@@ -1452,6 +1448,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+@@ -1440,6 +1436,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
    NS_ENSURE_SUCCESS(rv, rv);
  
    rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir));
@@ -47,7 +47,7 @@ index 2760be996403..c56b4a7a9774 100644
  #elif defined(XP_UNIX)
    const char* homeDir = getenv("HOME");
    if (!homeDir || !*homeDir) return NS_ERROR_FAILURE;
-@@ -1472,8 +1471,51 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+@@ -1460,8 +1459,51 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
        if (NS_SUCCEEDED(rv)) rv = localDir->AppendNative(".cache"_ns);
      }
    } else {
@@ -99,7 +99,7 @@ index 2760be996403..c56b4a7a9774 100644
    }
  #else
  #  error "Don't know how to get product dir on your platform"
-@@ -1594,20 +1636,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
+@@ -1559,20 +1601,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
  
  #if defined(XP_MACOSX) || defined(XP_WIN)
  
@@ -120,28 +120,7 @@ index 2760be996403..c56b4a7a9774 100644
    static const char* const sExtensions = "extensions";
    rv = aFile->AppendNative(nsDependentCString(sExtensions));
    NS_ENSURE_SUCCESS(rv, rv);
-@@ -1625,20 +1659,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionsDevPath(nsIFile* aFile) {
- 
- #if defined(XP_MACOSX) || defined(XP_WIN)
- 
--  static const char* const sXR = "Mozilla";
--  rv = aFile->AppendNative(nsDependentCString(sXR));
--  NS_ENSURE_SUCCESS(rv, rv);
--
-   static const char* const sExtensions = "SystemExtensionsDev";
-   rv = aFile->AppendNative(nsDependentCString(sExtensions));
-   NS_ENSURE_SUCCESS(rv, rv);
- 
- #elif defined(XP_UNIX)
- 
--  static const char* const sXR = ".mozilla";
--  rv = aFile->AppendNative(nsDependentCString(sXR));
--  NS_ENSURE_SUCCESS(rv, rv);
--
-   static const char* const sExtensions = "systemextensionsdev";
-   rv = aFile->AppendNative(nsDependentCString(sExtensions));
-   NS_ENSURE_SUCCESS(rv, rv);
-@@ -1703,9 +1729,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+@@ -1637,9 +1671,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
    NS_ENSURE_SUCCESS(rv, rv);
  #elif defined(XP_UNIX)
    nsAutoCString folder;
@@ -151,7 +130,7 @@ index 2760be996403..c56b4a7a9774 100644
  
    if (!profile.IsEmpty()) {
      // Skip any leading path characters
-@@ -1725,8 +1748,12 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+@@ -1659,8 +1690,12 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
        folder.Append(vendor);
        ToLowerCase(folder);