From 83e8010a4fd29f2c59a56f8add09412ba27ebb09 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 12 Mar 2019 12:32:07 +0100
Subject: Updated to 66.0

---
 mozilla-1170092.patch | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'mozilla-1170092.patch')

diff --git a/mozilla-1170092.patch b/mozilla-1170092.patch
index 4252e10..b5ccad2 100644
--- a/mozilla-1170092.patch
+++ b/mozilla-1170092.patch
@@ -1,6 +1,6 @@
-diff -up firefox-65.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-65.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
---- firefox-65.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2019-01-24 19:48:40.000000000 +0100
-+++ firefox-65.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2019-01-28 14:35:05.084756038 +0100
+diff -up firefox-66.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-66.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
+--- firefox-66.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2019-03-12 01:22:16.000000000 +0100
++++ firefox-66.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2019-03-12 11:58:36.025238819 +0100
 @@ -244,8 +244,20 @@ nsresult nsReadConfig::openAndEvaluateJS
      if (NS_FAILED(rv)) return rv;
  
@@ -23,10 +23,10 @@ diff -up firefox-65.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
    } else {
      nsAutoCString location("resource://gre/defaults/autoconfig/");
      location += aFileName;
-diff -up firefox-65.0/modules/libpref/Preferences.cpp.1170092 firefox-65.0/modules/libpref/Preferences.cpp
---- firefox-65.0/modules/libpref/Preferences.cpp.1170092	2019-01-24 19:48:47.000000000 +0100
-+++ firefox-65.0/modules/libpref/Preferences.cpp	2019-01-28 14:35:05.085756034 +0100
-@@ -4406,6 +4406,8 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
+diff -up firefox-66.0/modules/libpref/Preferences.cpp.1170092 firefox-66.0/modules/libpref/Preferences.cpp
+--- firefox-66.0/modules/libpref/Preferences.cpp.1170092	2019-03-12 01:22:21.000000000 +0100
++++ firefox-66.0/modules/libpref/Preferences.cpp	2019-03-12 11:58:36.026238817 +0100
+@@ -4407,6 +4407,8 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
    //
    // Thus, in the omni.jar case, we always load app-specific default
    // preferences from omni.jar, whether or not `$app == $gre`.
@@ -35,18 +35,18 @@ diff -up firefox-65.0/modules/libpref/Preferences.cpp.1170092 firefox-65.0/modul
  
    nsresult rv;
    nsZipFind* findPtr;
-diff -up firefox-65.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-65.0/toolkit/xre/nsXREDirProvider.cpp
---- firefox-65.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2019-01-24 19:48:56.000000000 +0100
-+++ firefox-65.0/toolkit/xre/nsXREDirProvider.cpp	2019-01-28 14:36:31.645396051 +0100
+diff -up firefox-66.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-66.0/toolkit/xre/nsXREDirProvider.cpp
+--- firefox-66.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2019-03-12 01:22:26.000000000 +0100
++++ firefox-66.0/toolkit/xre/nsXREDirProvider.cpp	2019-03-12 12:05:32.008280260 +0100
 @@ -57,6 +57,7 @@
  #endif
  #ifdef XP_UNIX
- #include <ctype.h>
-+#include "nsIXULAppInfo.h"
+ #  include <ctype.h>
++#  include "nsIXULAppInfo.h"
  #endif
  #ifdef XP_IOS
- #include "UIKitDirProvider.h"
-@@ -525,6 +526,21 @@ nsXREDirProvider::GetFile(const char* aP
+ #  include "UIKitDirProvider.h"
+@@ -521,6 +522,21 @@ nsXREDirProvider::GetFile(const char* aP
        }
      }
    }
@@ -68,7 +68,7 @@ diff -up firefox-65.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-65.0/tool
    if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
  
    if (ensureFilePermissions) {
-@@ -881,6 +897,16 @@ nsresult nsXREDirProvider::GetFilesInter
+@@ -877,6 +893,16 @@ nsresult nsXREDirProvider::GetFilesInter
      LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
      LoadDirsIntoArray(mAppBundleDirectories, kAppendPrefDir, directories);
  
@@ -85,9 +85,9 @@ diff -up firefox-65.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-65.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-65.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-65.0/xpcom/io/nsAppDirectoryServiceDefs.h
---- firefox-65.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2019-01-24 19:48:56.000000000 +0100
-+++ firefox-65.0/xpcom/io/nsAppDirectoryServiceDefs.h	2019-01-28 14:35:05.086756030 +0100
+diff -up firefox-66.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-66.0/xpcom/io/nsAppDirectoryServiceDefs.h
+--- firefox-66.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2019-03-12 01:22:26.000000000 +0100
++++ firefox-66.0/xpcom/io/nsAppDirectoryServiceDefs.h	2019-03-12 11:58:36.027238815 +0100
 @@ -62,6 +62,7 @@
  #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
  #define NS_APP_PREFS_OVERRIDE_DIR \
-- 
cgit