Merge branch 'master' into f30

1 files changed, 18 insertions, 18 deletions

diff --git a/mozilla-1170092.patch b/mozilla-1170092.patch
index bb71dd4..65f833f 100644
--- a/mozilla-1170092.patch
+++ b/mozilla-1170092.patch
@@ -1,6 +1,6 @@
-diff -up firefox-67.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-67.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
---- firefox-67.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2019-05-14 01:08:09.000000000 +0200
-+++ firefox-67.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2019-05-15 15:10:23.860653275 +0200
+diff -up firefox-71.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-71.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
+--- firefox-71.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2019-11-26 01:02:21.000000000 +0100
++++ firefox-71.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2019-11-26 10:47:04.316154398 +0100
 @@ -246,8 +246,20 @@ nsresult nsReadConfig::openAndEvaluateJS
      if (NS_FAILED(rv)) return rv;
  
@@ -23,10 +23,10 @@ diff -up firefox-67.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
    } else {
      nsAutoCString location("resource://gre/defaults/autoconfig/");
      location += aFileName;
-diff -up firefox-67.0/modules/libpref/Preferences.cpp.1170092 firefox-67.0/modules/libpref/Preferences.cpp
---- firefox-67.0/modules/libpref/Preferences.cpp.1170092	2019-05-15 15:10:23.860653275 +0200
-+++ firefox-67.0/modules/libpref/Preferences.cpp	2019-05-15 15:11:58.160110320 +0200
-@@ -4417,6 +4417,9 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
+diff -up firefox-71.0/modules/libpref/Preferences.cpp.1170092 firefox-71.0/modules/libpref/Preferences.cpp
+--- firefox-71.0/modules/libpref/Preferences.cpp.1170092	2019-11-26 01:02:25.000000000 +0100
++++ firefox-71.0/modules/libpref/Preferences.cpp	2019-11-26 10:47:04.316154398 +0100
+@@ -4472,6 +4472,9 @@ nsresult Preferences::InitInitialObjects
    //
    // Thus, in the omni.jar case, we always load app-specific default
    // preferences from omni.jar, whether or not `$app == $gre`.
@@ -36,10 +36,10 @@ diff -up firefox-67.0/modules/libpref/Preferences.cpp.1170092 firefox-67.0/modul
  
    nsresult rv = NS_ERROR_FAILURE;
    nsZipFind* findPtr;
-diff -up firefox-67.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-67.0/toolkit/xre/nsXREDirProvider.cpp
---- firefox-67.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2019-05-14 01:08:35.000000000 +0200
-+++ firefox-67.0/toolkit/xre/nsXREDirProvider.cpp	2019-05-15 15:10:23.861653269 +0200
-@@ -60,6 +60,7 @@
+diff -up firefox-71.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-71.0/toolkit/xre/nsXREDirProvider.cpp
+--- firefox-71.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2019-11-26 01:02:29.000000000 +0100
++++ firefox-71.0/toolkit/xre/nsXREDirProvider.cpp	2019-11-26 10:49:40.076095714 +0100
+@@ -61,6 +61,7 @@
  #endif
  #ifdef XP_UNIX
  #  include <ctype.h>
@@ -47,7 +47,7 @@ diff -up firefox-67.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-67.0/tool
  #endif
  #ifdef XP_IOS
  #  include "UIKitDirProvider.h"
-@@ -524,6 +525,21 @@ nsXREDirProvider::GetFile(const char* aP
+@@ -526,6 +527,21 @@ nsXREDirProvider::GetFile(const char* aP
        }
      }
    }
@@ -69,9 +69,9 @@ diff -up firefox-67.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-67.0/tool
    if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
  
    if (ensureFilePermissions) {
-@@ -880,6 +896,16 @@ nsresult nsXREDirProvider::GetFilesInter
+@@ -842,6 +858,16 @@ nsresult nsXREDirProvider::GetFilesInter
+ 
      LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
-     LoadDirsIntoArray(mAppBundleDirectories, kAppendPrefDir, directories);
  
 +    // Add /etc/<application>/pref/ directory if it exists
 +    nsCOMPtr<nsIFile> systemPrefDir;
@@ -86,10 +86,10 @@ diff -up firefox-67.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-67.0/tool
      rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
    } else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
      // NS_APP_CHROME_DIR_LIST is only used to get default (native) icons
-diff -up firefox-67.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-67.0/xpcom/io/nsAppDirectoryServiceDefs.h
---- firefox-67.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2019-05-14 01:08:28.000000000 +0200
-+++ firefox-67.0/xpcom/io/nsAppDirectoryServiceDefs.h	2019-05-15 15:10:24.044652216 +0200
-@@ -62,6 +62,7 @@
+diff -up firefox-71.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-71.0/xpcom/io/nsAppDirectoryServiceDefs.h
+--- firefox-71.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2019-11-26 01:02:30.000000000 +0100
++++ firefox-71.0/xpcom/io/nsAppDirectoryServiceDefs.h	2019-11-26 10:47:04.317154398 +0100
+@@ -60,6 +60,7 @@
  #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
  #define NS_APP_PREFS_OVERRIDE_DIR \
    "PrefDOverride"  // Directory for per-profile defaults