Updated to 63.0

1 files changed, 22 insertions, 21 deletions

diff --git a/mozilla-1170092.patch b/mozilla-1170092.patch
index 9e8906f..8a9e86f 100644
--- a/mozilla-1170092.patch
+++ b/mozilla-1170092.patch
@@ -1,7 +1,7 @@
-diff -up firefox-58.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-58.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
---- firefox-58.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2018-01-11 21:17:03.000000000 +0100
-+++ firefox-58.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2018-01-23 13:59:45.446495820 +0100
-@@ -239,9 +239,20 @@ nsresult nsReadConfig::openAndEvaluateJS
+diff -up firefox-63.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-63.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
+--- firefox-63.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2018-10-15 21:20:45.000000000 +0200
++++ firefox-63.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2018-10-18 13:37:55.993001292 +0200
+@@ -265,9 +265,20 @@ nsresult nsReadConfig::openAndEvaluateJS
              return rv;
  
          rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
@@ -24,10 +24,10 @@ diff -up firefox-58.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
      } else {
          nsAutoCString location("resource://gre/defaults/autoconfig/");
          location += aFileName;
-diff -up firefox-58.0/modules/libpref/Preferences.cpp.1170092 firefox-58.0/modules/libpref/Preferences.cpp
---- firefox-58.0/modules/libpref/Preferences.cpp.1170092	2018-01-23 13:59:45.447495817 +0100
-+++ firefox-58.0/modules/libpref/Preferences.cpp	2018-01-23 14:02:51.456987774 +0100
-@@ -4402,6 +4402,8 @@ pref_InitInitialObjects()
+diff -up firefox-63.0/modules/libpref/Preferences.cpp.1170092 firefox-63.0/modules/libpref/Preferences.cpp
+--- firefox-63.0/modules/libpref/Preferences.cpp.1170092	2018-10-15 21:20:49.000000000 +0200
++++ firefox-63.0/modules/libpref/Preferences.cpp	2018-10-18 13:37:55.994001285 +0200
+@@ -4873,6 +4873,8 @@ Preferences::InitInitialObjects(bool aIs
    //
    // 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-58.0/modules/libpref/Preferences.cpp.1170092 firefox-58.0/modul
  
    nsresult rv;
    nsZipFind* findPtr;
-diff -up firefox-58.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-58.0/toolkit/xre/nsXREDirProvider.cpp
---- firefox-58.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2018-01-11 21:17:06.000000000 +0100
-+++ firefox-58.0/toolkit/xre/nsXREDirProvider.cpp	2018-01-23 13:59:45.447495817 +0100
-@@ -59,6 +59,7 @@
+diff -up firefox-63.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-63.0/toolkit/xre/nsXREDirProvider.cpp
+--- firefox-63.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2018-10-15 21:20:52.000000000 +0200
++++ firefox-63.0/toolkit/xre/nsXREDirProvider.cpp	2018-10-18 13:41:06.969581700 +0200
+@@ -57,6 +57,7 @@
  #endif
  #ifdef XP_UNIX
  #include <ctype.h>
@@ -47,7 +47,7 @@ diff -up firefox-58.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-58.0/tool
  #endif
  #ifdef XP_IOS
  #include "UIKitDirProvider.h"
-@@ -554,6 +555,20 @@ nsXREDirProvider::GetFile(const char* aP
+@@ -527,6 +528,20 @@ nsXREDirProvider::GetFile(const char* aP
        }
      }
    }
@@ -68,24 +68,25 @@ diff -up firefox-58.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-58.0/tool
    if (NS_FAILED(rv) || !file)
      return NS_ERROR_FAILURE;
  
-@@ -887,6 +902,14 @@ nsXREDirProvider::GetFilesInternal(const
-     LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
+@@ -863,6 +878,15 @@ nsXREDirProvider::GetFilesInternal(const
      LoadDirsIntoArray(mAppBundleDirectories,
                        kAppendPrefDir, directories);
+ 
 +    // Add /etc/<application>/pref/ directory if it exists
 +    nsCOMPtr<nsIFile> systemPrefDir;
 +    rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR, getter_AddRefs(systemPrefDir));
 +    if (NS_SUCCEEDED(rv)) {
 +      rv = systemPrefDir->AppendNative(NS_LITERAL_CSTRING("pref"));
 +      if (NS_SUCCEEDED(rv))
-+        directories.AppendObject(systemPrefDir);
++        directories.AppendObject(systemPrefDir); 
 +    }
- 
-     rv = NS_NewArrayEnumerator(aResult, directories);
++
+     rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
    }
-diff -up firefox-58.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-58.0/xpcom/io/nsAppDirectoryServiceDefs.h
---- firefox-58.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2018-01-23 13:59:45.447495817 +0100
-+++ firefox-58.0/xpcom/io/nsAppDirectoryServiceDefs.h	2018-01-23 14:02:02.871120476 +0100
+   else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
+diff -up firefox-63.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-63.0/xpcom/io/nsAppDirectoryServiceDefs.h
+--- firefox-63.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2018-10-15 21:20:52.000000000 +0200
++++ firefox-63.0/xpcom/io/nsAppDirectoryServiceDefs.h	2018-10-18 13:37:55.994001285 +0200
 @@ -59,6 +59,7 @@
  #define NS_APP_PREFS_50_FILE                    "PrefF"
  #define NS_APP_PREFS_DEFAULTS_DIR_LIST          "PrefDL"