From f82c5d39da91f0cdd749621412b063bfb0ab9bdf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 4 Oct 2021 13:25:56 +0200
Subject: firefox: 92.0.1 -> 93.0

(cherry picked from commit 7dfcaf5e73feebe12606dbc4c08128af75797fa4)
---
 overlays/patches/firefox/release/D6695.diff | 41 +++++++----------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

(limited to 'overlays')

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);
  
-- 
cgit 1.4.1