From bbb92a85723ed11fe114e3a702c1fe1362fbbf7d Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Wed, 15 May 2019 16:14:03 +0200
Subject: Updated to 67.0

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

(limited to 'mozilla-1170092.patch')

diff --git a/mozilla-1170092.patch b/mozilla-1170092.patch
index b5ccad2..bb71dd4 100644
--- a/mozilla-1170092.patch
+++ b/mozilla-1170092.patch
@@ -1,7 +1,7 @@
-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
+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
+@@ -246,8 +246,20 @@ nsresult nsReadConfig::openAndEvaluateJS
      if (NS_FAILED(rv)) return rv;
  
      rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
@@ -23,22 +23,23 @@ diff -up firefox-66.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
    } else {
      nsAutoCString location("resource://gre/defaults/autoconfig/");
      location += aFileName;
-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
+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
    //
    // Thus, in the omni.jar case, we always load app-specific default
    // preferences from omni.jar, whether or not `$app == $gre`.
++  //
 +  // At very end load configuration from system config location:
 +  // - /etc/firefox/pref/*.js
  
-   nsresult rv;
+   nsresult rv = NS_ERROR_FAILURE;
    nsZipFind* findPtr;
-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 @@
+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 @@
  #endif
  #ifdef XP_UNIX
  #  include <ctype.h>
@@ -46,7 +47,7 @@ diff -up firefox-66.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-66.0/tool
  #endif
  #ifdef XP_IOS
  #  include "UIKitDirProvider.h"
-@@ -521,6 +522,21 @@ nsXREDirProvider::GetFile(const char* aP
+@@ -524,6 +525,21 @@ nsXREDirProvider::GetFile(const char* aP
        }
      }
    }
@@ -68,7 +69,7 @@ diff -up firefox-66.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-66.0/tool
    if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
  
    if (ensureFilePermissions) {
-@@ -877,6 +893,16 @@ nsresult nsXREDirProvider::GetFilesInter
+@@ -880,6 +896,16 @@ nsresult nsXREDirProvider::GetFilesInter
      LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
      LoadDirsIntoArray(mAppBundleDirectories, kAppendPrefDir, directories);
  
@@ -85,9 +86,9 @@ diff -up firefox-66.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-66.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-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
+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 @@
  #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
  #define NS_APP_PREFS_OVERRIDE_DIR \
-- 
cgit