Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704'

1 files changed, 16 insertions, 15 deletions

diff --git a/nixpkgs-overlays/patches/firefox/release/D6695.diff b/nixpkgs-overlays/patches/firefox/release/D6695.diff
index f75df56ddd34..e6425af02ca6 100644
--- a/nixpkgs-overlays/patches/firefox/release/D6695.diff
+++ b/nixpkgs-overlays/patches/firefox/release/D6695.diff
@@ -1,18 +1,19 @@
 diff --git a/toolkit/moz.build b/toolkit/moz.build
-index 109fb2ce9369..0b871d931038 100644
+index f01b128b2493a..ae0e19ec9c509 100644
 --- a/toolkit/moz.build
 +++ b/toolkit/moz.build
-@@ -72,2 +72,5 @@ with Files('mozapps/preferences/**'):
- with Files('pluginproblem/**'):
-     BUG_COMPONENT = ('Core', 'Plug-ins')
+@@ -84,3 +84,6 @@ with Files('pluginproblem/**'):
+ 
+ with Files('l10n-registry.manifest'):
+     BUG_COMPONENT = ('Core', 'Localization')
 +
 +if CONFIG['ENABLE_TESTS']:
 +    DIRS += ['tests/gtest']
 diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
-index a094e318d6f1..63f9efc9e77a 100644
+index 1d6ffb748e4e4..8708279b964a2 100644
 --- a/toolkit/xre/nsXREDirProvider.cpp
 +++ b/toolkit/xre/nsXREDirProvider.cpp
-@@ -385,13 +385,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
+@@ -390,13 +390,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
      nsCOMPtr<nsIFile> localDir;
      rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), false);
      if (NS_SUCCEEDED(rv)) {
@@ -26,7 +27,7 @@ index a094e318d6f1..63f9efc9e77a 100644
        localDir.swap(file);
      }
    }
-@@ -1244,7 +1237,8 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult,
+@@ -1302,7 +1295,8 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult,
              nsDependentCString(hasVendor ? GetAppVendor() : GetAppName())))) {
        return NS_ERROR_FAILURE;
      }
@@ -36,7 +37,7 @@ index a094e318d6f1..63f9efc9e77a 100644
      return NS_ERROR_FAILURE;
    }
  
-@@ -1373,6 +1367,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+@@ -1443,6 +1437,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
    NS_ENSURE_SUCCESS(rv, rv);
  
    localDir = dirFileMac;
@@ -46,7 +47,7 @@ index a094e318d6f1..63f9efc9e77a 100644
  #elif defined(XP_IOS)
    nsAutoCString userDir;
    if (GetUIKitDirectory(aLocal, userDir)) {
-@@ -1396,6 +1393,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+@@ -1466,6 +1463,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
    NS_ENSURE_SUCCESS(rv, rv);
  
    rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir));
@@ -56,7 +57,7 @@ index a094e318d6f1..63f9efc9e77a 100644
  #elif defined(XP_UNIX)
    const char* homeDir = getenv("HOME");
    if (!homeDir || !*homeDir) return NS_ERROR_FAILURE;
-@@ -1417,8 +1417,51 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+@@ -1487,8 +1487,51 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
          rv = localDir->AppendNative(NS_LITERAL_CSTRING(".cache"));
      }
    } else {
@@ -108,7 +109,7 @@ index a094e318d6f1..63f9efc9e77a 100644
    }
  #else
  #  error "Don't know how to get product dir on your platform"
-@@ -1545,20 +1588,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
+@@ -1609,20 +1652,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
  
  #if defined(XP_MACOSX) || defined(XP_WIN)
  
@@ -129,7 +130,7 @@ index a094e318d6f1..63f9efc9e77a 100644
    static const char* const sExtensions = "extensions";
    rv = aFile->AppendNative(nsDependentCString(sExtensions));
    NS_ENSURE_SUCCESS(rv, rv);
-@@ -1576,20 +1611,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionsDevPath(nsIFile* aFile) {
+@@ -1640,20 +1675,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionsDevPath(nsIFile* aFile) {
  
  #if defined(XP_MACOSX) || defined(XP_WIN)
  
@@ -150,7 +151,7 @@ index a094e318d6f1..63f9efc9e77a 100644
    static const char* const sExtensions = "systemextensionsdev";
    rv = aFile->AppendNative(nsDependentCString(sExtensions));
    NS_ENSURE_SUCCESS(rv, rv);
-@@ -1654,9 +1681,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+@@ -1718,9 +1745,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
    NS_ENSURE_SUCCESS(rv, rv);
  #elif defined(XP_UNIX)
    nsAutoCString folder;
@@ -160,7 +161,7 @@ index a094e318d6f1..63f9efc9e77a 100644
  
    if (!profile.IsEmpty()) {
      // Skip any leading path characters
-@@ -1676,8 +1700,12 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+@@ -1740,8 +1764,12 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
        folder.Append(vendor);
        ToLowerCase(folder);
  
@@ -176,7 +177,7 @@ index a094e318d6f1..63f9efc9e77a 100644
        folder.Truncate();
      }
 diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp
-index e79c8303fe12..53c550db18c0 100644
+index e79c8303fe129..53c550db18c05 100644
 --- a/xpcom/io/nsAppFileLocationProvider.cpp
 +++ b/xpcom/io/nsAppFileLocationProvider.cpp
 @@ -247,7 +247,7 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) {