patches/firefox: update XDG patch for Firefox 80

1 files changed, 18 insertions, 28 deletions

diff --git a/overlays/patches/firefox/release/D6695.diff b/overlays/patches/firefox/release/D6695.diff
index e6425af02ca6..9d0c9f9d0cb1 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 f01b128b2493a..ae0e19ec9c509 100644
+index b6f792da7124..672d43957bed 100644
 --- a/toolkit/moz.build
 +++ b/toolkit/moz.build
-@@ -84,3 +84,6 @@ with Files('pluginproblem/**'):
+@@ -87,3 +87,6 @@ with Files('pluginproblem/**'):
  
  with Files('l10n-registry.manifest'):
      BUG_COMPONENT = ('Core', 'Localization')
@@ -10,34 +10,24 @@ index f01b128b2493a..ae0e19ec9c509 100644
 +if CONFIG['ENABLE_TESTS']:
 +    DIRS += ['tests/gtest']
 diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
-index 1d6ffb748e4e4..8708279b964a2 100644
+index 197d29a85106..24b2d00bc8c2 100644
 --- a/toolkit/xre/nsXREDirProvider.cpp
 +++ b/toolkit/xre/nsXREDirProvider.cpp
-@@ -390,13 +390,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
+@@ -405,13 +405,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
      nsCOMPtr<nsIFile> localDir;
      rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), false);
      if (NS_SUCCEEDED(rv)) {
 -#  if defined(XP_MACOSX)
--      rv = localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla"));
+-      rv = localDir->AppendNative("Mozilla"_ns);
 -#  else
--      rv = localDir->AppendNative(NS_LITERAL_CSTRING(".mozilla"));
+-      rv = localDir->AppendNative(".mozilla"_ns);
 -#  endif
 -    }
 -    if (NS_SUCCEEDED(rv)) {
        localDir.swap(file);
      }
    }
-@@ -1302,7 +1295,8 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult,
-             nsDependentCString(hasVendor ? GetAppVendor() : GetAppName())))) {
-       return NS_ERROR_FAILURE;
-     }
--  } else if (NS_FAILED(localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")))) {
-+  }
-+  else if (NS_FAILED(localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")))) {
-     return NS_ERROR_FAILURE;
-   }
- 
-@@ -1443,6 +1437,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+@@ -1429,6 +1422,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
    NS_ENSURE_SUCCESS(rv, rv);
  
    localDir = dirFileMac;
@@ -47,7 +37,7 @@ index 1d6ffb748e4e4..8708279b964a2 100644
  #elif defined(XP_IOS)
    nsAutoCString userDir;
    if (GetUIKitDirectory(aLocal, userDir)) {
-@@ -1466,6 +1463,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+@@ -1452,6 +1448,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
    NS_ENSURE_SUCCESS(rv, rv);
  
    rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir));
@@ -57,8 +47,8 @@ index 1d6ffb748e4e4..8708279b964a2 100644
  #elif defined(XP_UNIX)
    const char* homeDir = getenv("HOME");
    if (!homeDir || !*homeDir) return NS_ERROR_FAILURE;
-@@ -1487,8 +1487,51 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
-         rv = localDir->AppendNative(NS_LITERAL_CSTRING(".cache"));
+@@ -1472,8 +1471,51 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+       if (NS_SUCCEEDED(rv)) rv = localDir->AppendNative(".cache"_ns);
      }
    } else {
 +    bool exists;
@@ -109,7 +99,7 @@ index 1d6ffb748e4e4..8708279b964a2 100644
    }
  #else
  #  error "Don't know how to get product dir on your platform"
-@@ -1609,20 +1652,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
+@@ -1594,20 +1636,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
  
  #if defined(XP_MACOSX) || defined(XP_WIN)
  
@@ -130,7 +120,7 @@ index 1d6ffb748e4e4..8708279b964a2 100644
    static const char* const sExtensions = "extensions";
    rv = aFile->AppendNative(nsDependentCString(sExtensions));
    NS_ENSURE_SUCCESS(rv, rv);
-@@ -1640,20 +1675,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionsDevPath(nsIFile* aFile) {
+@@ -1625,20 +1659,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionsDevPath(nsIFile* aFile) {
  
  #if defined(XP_MACOSX) || defined(XP_WIN)
  
@@ -151,7 +141,7 @@ index 1d6ffb748e4e4..8708279b964a2 100644
    static const char* const sExtensions = "systemextensionsdev";
    rv = aFile->AppendNative(nsDependentCString(sExtensions));
    NS_ENSURE_SUCCESS(rv, rv);
-@@ -1718,9 +1745,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+@@ -1703,9 +1729,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
    NS_ENSURE_SUCCESS(rv, rv);
  #elif defined(XP_UNIX)
    nsAutoCString folder;
@@ -161,7 +151,7 @@ index 1d6ffb748e4e4..8708279b964a2 100644
  
    if (!profile.IsEmpty()) {
      // Skip any leading path characters
-@@ -1740,8 +1764,12 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+@@ -1725,8 +1748,12 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
        folder.Append(vendor);
        ToLowerCase(folder);
  
@@ -177,10 +167,10 @@ index 1d6ffb748e4e4..8708279b964a2 100644
        folder.Truncate();
      }
 diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp
-index e79c8303fe129..53c550db18c05 100644
+index b8699fecc4b7..a91eba2cbbbd 100644
 --- a/xpcom/io/nsAppFileLocationProvider.cpp
 +++ b/xpcom/io/nsAppFileLocationProvider.cpp
-@@ -247,7 +247,7 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) {
+@@ -233,7 +233,7 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) {
  // GetProductDirectory - Gets the directory which contains the application data
  // folder
  //
@@ -189,7 +179,7 @@ index e79c8303fe129..53c550db18c05 100644
  // WIN    : <Application Data folder on user's machine>\Mozilla
  // Mac    : :Documents:Mozilla:
  //----------------------------------------------------------------------------------------
-@@ -291,19 +291,80 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
+@@ -277,19 +277,80 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
      return rv;
    }
  #elif defined(XP_UNIX)
@@ -271,7 +261,7 @@ index e79c8303fe129..53c550db18c05 100644
    rv = localDir->Exists(&exists);
  
    if (NS_SUCCEEDED(rv) && !exists) {
-@@ -323,7 +384,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
+@@ -309,7 +370,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
  // GetDefaultUserProfileRoot - Gets the directory which contains each user
  // profile dir
  //