2 # Parent  d7a4d772ba2afb3ac43e2f2f234ffa55bcf50e70

     2 # Parent  58a0b60e25e7160c9877299a37a2f10660888e9a

     9 Index: firefox-60.2.0/modules/libpref/Preferences.cpp

     9 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp

    10 ===================================================================

    10 --- a/modules/libpref/Preferences.cpp

    11 --- firefox-60.2.0.orig/modules/libpref/Preferences.cpp	2018-09-05 21:49:23.102829401 +0200

    11 +++ b/modules/libpref/Preferences.cpp

    12 +++ firefox-60.2.0/modules/libpref/Preferences.cpp	2018-09-05 21:49:31.498872824 +0200

    12 @@ -76,16 +76,17 @@

    13 @@ -81,6 +81,7 @@

    13  #include "nsXPCOMCID.h"

    14  #include "nsXPCOM.h"

    15  #include "nsXULAppAPI.h"

    16  #include "nsZipArchive.h"

    17  #include "plbase64.h"

    21 @@ -3873,6 +3874,7 @@ Preferences::InitInitialObjects()

    25  #endif

    26  

    27  using namespace mozilla;

    28  

    29  #ifdef DEBUG

    30 @@ -3519,25 +3520,37 @@ static nsresult pref_ReadPrefFromJar(nsZ

    31    // application pref files for backwards compatibility.

    32    static const char* specialFiles[] = {

    33  #if defined(XP_MACOSX)

    34      "macprefs.js"

    35  #elif defined(XP_WIN)

    29 @@ -3882,6 +3884,17 @@ Preferences::InitInitialObjects()

    43  #endif

    44  #elif defined(XP_BEOS)

    45      "beos.js"

    44    rv = pref_LoadPrefsInDir(

    60    rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles,

    45      defaultPrefDir, specialFiles, ArrayLength(specialFiles));

    61                             ArrayLength(specialFiles));

    47 @@ -3940,7 +3953,7 @@ Preferences::InitInitialObjects()

    63      NS_WARNING("Error parsing application default preferences.");

    64    }

    65  

    66    // Load jar:$app/omni.jar!/defaults/preferences/*.js

    67    // or jar:$gre/omni.jar!/defaults/preferences/*.js.

    68 @@ -3585,17 +3598,17 @@ static nsresult pref_ReadPrefFromJar(nsZ

    69        }

    70  

    71        nsCOMPtr<nsIFile> path = do_QueryInterface(elem);

    72        if (!path) {

    73          continue;

    56 Index: firefox-60.2.0/modules/libpref/moz.build

    82  #ifdef MOZ_WIDGET_ANDROID

    57 ===================================================================

    83    // Set up the correct default for toolkit.telemetry.enabled. If this build

    58 --- firefox-60.2.0.orig/modules/libpref/moz.build	2018-09-05 21:49:23.106829422 +0200

    84    // has MOZ_TELEMETRY_ON_BY_DEFAULT *or* we're on the beta channel, telemetry

    59 +++ firefox-60.2.0/modules/libpref/moz.build	2018-09-05 21:49:31.498872824 +0200

    85    // is on by default, otherwise not. This is necessary so that beta users who

    60 @@ -32,6 +32,10 @@ UNIFIED_SOURCES += [

    86    // are testing final release builds don't flipflop defaults.

    87 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build

    88 --- a/modules/libpref/moz.build

    89 +++ b/modules/libpref/moz.build

    90 @@ -27,16 +27,20 @@ XPIDL_MODULE = 'pref'

    91  EXPORTS.mozilla += [

    92      'Preferences.h',

    93  ]

    94  

    95  UNIFIED_SOURCES += [

    71 Index: firefox-60.2.0/python/mozbuild/mozpack/chrome/flags.py

   106  

    72 ===================================================================

   107  DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']

    73 --- firefox-60.2.0.orig/python/mozbuild/mozpack/chrome/flags.py	2018-09-05 21:49:23.106829422 +0200

   108  DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']

    74 +++ firefox-60.2.0/python/mozbuild/mozpack/chrome/flags.py	2018-09-05 21:49:31.498872824 +0200

   109  if CONFIG['MOZ_ENABLE_WEBRENDER']:

    75 @@ -225,6 +225,7 @@ class Flags(OrderedDict):

   110      DEFINES['MOZ_ENABLE_WEBRENDER'] = True

   111 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py

   112 --- a/python/mozbuild/mozpack/chrome/flags.py

   113 +++ b/python/mozbuild/mozpack/chrome/flags.py

   114 @@ -220,16 +220,17 @@ class Flags(OrderedDict):

   115          'contentaccessible': Flag,

   116          'os': StringFlag,

   117          'osversion': VersionFlag,

   118          'abi': StringFlag,

   119          'platform': Flag,

    83 Index: firefox-60.2.0/python/mozbuild/mozpack/chrome/manifest.py

   127      def __init__(self, *flags):

    84 ===================================================================

   128          '''

    85 --- firefox-60.2.0.orig/python/mozbuild/mozpack/chrome/manifest.py	2018-09-05 21:49:23.106829422 +0200

   129          Initialize a set of flags given in string form.

    86 +++ firefox-60.2.0/python/mozbuild/mozpack/chrome/manifest.py	2018-09-05 21:49:31.498872824 +0200

   130             flags = Flags('contentaccessible=yes', 'appversion>=3.5')

    87 @@ -39,6 +39,7 @@ class ManifestEntry(object):

   131          '''

   132 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py

   133 --- a/python/mozbuild/mozpack/chrome/manifest.py

   134 +++ b/python/mozbuild/mozpack/chrome/manifest.py

   135 @@ -34,16 +34,17 @@ class ManifestEntry(object):

   136          'platformversion',

   137          'os',

   138          'osversion',

   139          'abi',

   140          'xpcnativewrappers',

    95 Index: firefox-60.2.0/toolkit/components/downloads/moz.build

   148          '''

    96 ===================================================================

   149          Initialize a manifest entry with the given base path and flags.

    97 --- firefox-60.2.0.orig/toolkit/components/downloads/moz.build	2018-09-05 21:49:23.106829422 +0200

   150          '''

    98 +++ firefox-60.2.0/toolkit/components/downloads/moz.build	2018-09-05 21:49:31.498872824 +0200

   151          self.base = base

    99 @@ -46,5 +46,9 @@ if CONFIG['MOZ_PLACES']:

   152          self.flags = Flags(*flags)

   153 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build

   154 --- a/toolkit/components/downloads/moz.build

   155 +++ b/toolkit/components/downloads/moz.build

   156 @@ -41,10 +41,14 @@ EXTRA_JS_MODULES += [

   157  

   158  if CONFIG['MOZ_PLACES']:

   159      EXTRA_JS_MODULES += [

   160          'DownloadHistory.jsm',

   161      ]

   109 Index: firefox-60.2.0/toolkit/content/jar.mn

   171 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn

   110 ===================================================================

   172 --- a/toolkit/content/jar.mn

   111 --- firefox-60.2.0.orig/toolkit/content/jar.mn	2018-09-05 21:49:23.106829422 +0200

   173 +++ b/toolkit/content/jar.mn

   112 +++ firefox-60.2.0/toolkit/content/jar.mn	2018-09-05 21:49:31.498872824 +0200

   174 @@ -69,16 +69,18 @@ toolkit.jar:

   113 @@ -74,6 +74,8 @@ toolkit.jar:

   175     content/global/bindings/checkbox.xml        (widgets/checkbox.xml)

   176     content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)

   177     content/global/bindings/datekeeper.js       (widgets/datekeeper.js)

   178     content/global/bindings/datepicker.js       (widgets/datepicker.js)

   179     content/global/bindings/datetimepopup.xml   (widgets/datetimepopup.xml)

   122 Index: firefox-60.2.0/toolkit/content/widgets/dialog-kde.xml

   188     content/global/bindings/general.xml         (widgets/general.xml)

   123 ===================================================================

   189     content/global/bindings/groupbox.xml        (widgets/groupbox.xml)

   124 --- /dev/null	1970-01-01 00:00:00.000000000 +0000

   190     content/global/bindings/listbox.xml         (widgets/listbox.xml)

   125 +++ firefox-60.2.0/toolkit/content/widgets/dialog-kde.xml	2018-09-05 21:49:31.498872824 +0200

   191     content/global/bindings/menu.xml            (widgets/menu.xml)

   192     content/global/bindings/menulist.xml        (widgets/menulist.xml)

   193 diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml

   194 new file mode 100644

   195 --- /dev/null

   196 +++ b/toolkit/content/widgets/dialog-kde.xml

   605 Index: firefox-60.2.0/toolkit/mozapps/downloads/nsHelperAppDlg.js

   676 diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js

   606 ===================================================================

   677 --- a/toolkit/mozapps/downloads/nsHelperAppDlg.js

   607 --- firefox-60.2.0.orig/toolkit/mozapps/downloads/nsHelperAppDlg.js	2018-09-05 21:49:23.106829422 +0200

   678 +++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js

   608 +++ firefox-60.2.0/toolkit/mozapps/downloads/nsHelperAppDlg.js	2018-09-05 21:49:31.498872824 +0200

   679 @@ -627,17 +627,17 @@ nsUnknownContentTypeDialog.prototype = {

   609 @@ -632,7 +632,7 @@ nsUnknownContentTypeDialog.prototype = {

   680        else

   681          typeString = mimeInfo.MIMEType;

   682      }

   683      // When the length is unknown, contentLength would be -1

   684      if (this.mLauncher.contentLength >= 0) {

   618 @@ -806,7 +806,7 @@ nsUnknownContentTypeDialog.prototype = {

   693        type.value = typeString;

   694      }

   695    },

   696  

   697    // Returns true if opening the default application makes sense.

   698 @@ -801,17 +801,17 @@ nsUnknownContentTypeDialog.prototype = {

   699        switch (this.dialogElement("openHandler").selectedIndex) {

   700        case 0:

   701          // No app need be specified in this case.

   702          ok = true;

   703          break;

   627 @@ -1071,20 +1071,50 @@ nsUnknownContentTypeDialog.prototype = {

   712  

   713      // Enable Ok button if ok to press.

   714      this.mDialog.document.documentElement.getButton("accept").disabled = !ok;

   715    },

   716  

   717 @@ -1066,30 +1066,60 @@ nsUnknownContentTypeDialog.prototype = {

   718  

   719        if (params.handlerApp &&

   720            params.handlerApp.executable &&

   721            params.handlerApp.executable.isFile()) {

   722          // Remember the file they chose to run.

   692 Index: firefox-60.2.0/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

   787                   .createInstance(nsIFilePicker);

   693 ===================================================================

   788        fp.init(this.mDialog,

   694 --- firefox-60.2.0.orig/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2018-09-05 21:49:23.106829422 +0200

   789                this.dialogElement("strings").getString("chooseAppFilePickerTitle"),

   695 +++ firefox-60.2.0/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2018-09-05 21:49:31.498872824 +0200

   790                nsIFilePicker.modeOpen);

   696 @@ -20,6 +20,7 @@

   791  

   792 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

   793 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

   794 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

   795 @@ -15,16 +15,17 @@

   796  #include "nsPrintfCString.h"

   797  #include "nsNetCID.h"

   798  #include "nsNetUtil.h"

   799  #include "nsISupportsPrimitives.h"

   800  #include "nsIGSettingsService.h"

   703  public:

   807   public:

   704 @@ -44,6 +45,7 @@ private:

   808    NS_DECL_ISUPPORTS

   705    nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult);

   809    NS_DECL_NSISYSTEMPROXYSETTINGS

   706    nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult);

   810  

   707    nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult);

   811    nsUnixSystemProxySettings() : mSchemeProxySettings(4) {}

   812    nsresult Init();

   813 @@ -42,16 +43,17 @@ class nsUnixSystemProxySettings final : 

   814                                     nsACString& aResult);

   815    nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost,

   816                               int32_t aPort, nsACString& aResult);

   817    nsresult GetProxyFromGSettings(const nsACString& aScheme,

   818                                   const nsACString& aHost, int32_t aPort,

   819                                   nsACString& aResult);

   820    nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType,

   821                                         nsACString& aResult);

   712 @@ -510,6 +512,9 @@ nsUnixSystemProxySettings::GetProxyForUR

   826  

   713                                            const int32_t      aPort,

   827  NS_IMETHODIMP

   714                                            nsACString & aResult)

   828  nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {

   715  {

   829    // dbus prevents us from being threadsafe, but this routine should not block

   830    // anyhow

   831 @@ -488,16 +490,19 @@ nsresult nsUnixSystemProxySettings::GetP

   832    return NS_OK;

   833  }

   834  

   835  nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec,

   836                                                     const nsACString& aScheme,

   837                                                     const nsACString& aHost,

   838                                                     const int32_t aPort,

   839                                                     nsACString& aResult) {

   721      if (NS_SUCCEEDED(rv))

   845      if (NS_SUCCEEDED(rv)) return rv;

   722 @@ -545,3 +550,29 @@ static const mozilla::Module kUnixProxyM

   846    }

   723  };

   847    if (mGConf) return GetProxyFromGConf(aScheme, aHost, aPort, aResult);

   848  

   849    return GetProxyFromEnvironment(aScheme, aHost, aPort, aResult);

   850  }

   851 @@ -521,8 +526,34 @@ static const mozilla::Module::CIDEntry k

   852  static const mozilla::Module::ContractIDEntry kUnixProxyContracts[] = {

   853      {NS_SYSTEMPROXYSETTINGS_CONTRACTID, &kNS_UNIXSYSTEMPROXYSERVICE_CID},

   854      {nullptr}};

   855  

   856  static const mozilla::Module kUnixProxyModule = {

   857      mozilla::Module::kVersion, kUnixProxyCIDs, kUnixProxyContracts};

   752 Index: firefox-60.2.0/toolkit/xre/moz.build

   886 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build

   753 ===================================================================

   887 --- a/toolkit/xre/moz.build

   754 --- firefox-60.2.0.orig/toolkit/xre/moz.build	2018-09-05 21:49:23.106829422 +0200

   888 +++ b/toolkit/xre/moz.build

   755 +++ firefox-60.2.0/toolkit/xre/moz.build	2018-09-05 21:49:31.498872824 +0200

   889 @@ -65,17 +65,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co

   756 @@ -70,7 +70,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui

   890          '../components/printingui',

   891      ]

   892  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':

   893      UNIFIED_SOURCES += [

   894          'nsNativeAppSupportDefault.cpp',

   766 Index: firefox-60.2.0/toolkit/xre/nsKDEUtils.cpp

   904      UNIFIED_SOURCES += [

   767 ===================================================================

   905          'nsNativeAppSupportDefault.cpp',

   768 --- /dev/null	1970-01-01 00:00:00.000000000 +0000

   906      ]

   769 +++ firefox-60.2.0/toolkit/xre/nsKDEUtils.cpp	2018-09-05 21:49:31.498872824 +0200

   907  

   908  if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':

   909 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp

   910 new file mode 100644

   911 --- /dev/null

   912 +++ b/toolkit/xre/nsKDEUtils.cpp

  1115 Index: firefox-60.2.0/toolkit/xre/nsKDEUtils.h

  1258 diff --git a/toolkit/xre/nsKDEUtils.h b/toolkit/xre/nsKDEUtils.h

  1116 ===================================================================

  1259 new file mode 100644

  1117 --- /dev/null	1970-01-01 00:00:00.000000000 +0000

  1260 --- /dev/null

  1118 +++ firefox-60.2.0/toolkit/xre/nsKDEUtils.h	2018-09-05 21:49:31.498872824 +0200

  1261 +++ b/toolkit/xre/nsKDEUtils.h

  1168 Index: firefox-60.2.0/uriloader/exthandler/HandlerServiceParent.cpp

  1311 diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp

  1169 ===================================================================

  1312 --- a/uriloader/exthandler/HandlerServiceParent.cpp

  1170 --- firefox-60.2.0.orig/uriloader/exthandler/HandlerServiceParent.cpp	2018-09-05 21:49:23.106829422 +0200

  1313 +++ b/uriloader/exthandler/HandlerServiceParent.cpp

  1171 +++ firefox-60.2.0/uriloader/exthandler/HandlerServiceParent.cpp	2018-09-05 21:49:31.502872845 +0200

  1314 @@ -1,16 +1,16 @@

  1172 @@ -5,7 +5,7 @@

  1315  #include "mozilla/Logging.h"

  1316  #include "HandlerServiceParent.h"

  1317  #include "nsIHandlerService.h"

  1318  #include "nsIMIMEInfo.h"

  1181 @@ -269,7 +269,7 @@ HandlerServiceParent::RecvExistsForProto

  1329  using mozilla::dom::RemoteHandlerApp;

  1182  {

  1330  

  1331  namespace {

  1332 @@ -245,17 +245,17 @@ mozilla::ipc::IPCResult HandlerServicePa

  1333    handlerSvc->Exists(info, exists);

  1334    return IPC_OK();

  1335  }

  1336  

  1337  mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocol(

  1338      const nsCString& aProtocolScheme, bool* aHandlerExists) {

  1190 Index: firefox-60.2.0/uriloader/exthandler/moz.build

  1346    return IPC_OK();

  1191 ===================================================================

  1347  }

  1192 --- firefox-60.2.0.orig/uriloader/exthandler/moz.build	2018-09-05 21:49:23.106829422 +0200

  1348  

  1193 +++ firefox-60.2.0/uriloader/exthandler/moz.build	2018-09-05 21:49:31.502872845 +0200

  1349  mozilla::ipc::IPCResult HandlerServiceParent::RecvGetTypeFromExtension(

  1194 @@ -82,7 +82,9 @@ else:

  1350      const nsCString& aFileExtension, nsCString* type) {

  1351 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build

  1352 --- a/uriloader/exthandler/moz.build

  1353 +++ b/uriloader/exthandler/moz.build

  1354 @@ -77,17 +77,19 @@ else:

  1355      SOURCES += [

  1356          osdir + '/nsOSHelperAppService.cpp',

  1357      ]

  1358      if CONFIG['CC_TYPE'] in ('clang', 'gcc'):

  1359          CXXFLAGS += ['-Wno-error=shadow']

  1204 @@ -129,6 +131,7 @@ LOCAL_INCLUDES += [

  1369      UNIFIED_SOURCES += [

  1370          'android/nsAndroidHandlerApp.cpp',

  1371          'android/nsExternalSharingAppService.cpp',

  1372          'android/nsExternalURLHandlerService.cpp',

  1373          'android/nsMIMEInfoAndroid.cpp',

  1374 @@ -124,16 +126,17 @@ include('/ipc/chromium/chromium-config.m

  1375  FINAL_LIBRARY = 'xul'

  1376  

  1377  LOCAL_INCLUDES += [

  1378      '/docshell/base',

  1379      '/dom/base',

  1212 Index: firefox-60.2.0/uriloader/exthandler/unix/nsCommonRegistry.cpp

  1387      CXXFLAGS += CONFIG['TK_CFLAGS']

  1213 ===================================================================

  1388      CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']

  1214 --- /dev/null	1970-01-01 00:00:00.000000000 +0000

  1389  

  1215 +++ firefox-60.2.0/uriloader/exthandler/unix/nsCommonRegistry.cpp	2018-09-05 21:49:31.502872845 +0200

  1390  if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':

  1391      CXXFLAGS += CONFIG['TK_CFLAGS']

  1392 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp

  1393 new file mode 100644

  1394 --- /dev/null

  1395 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp

  1270 Index: firefox-60.2.0/uriloader/exthandler/unix/nsCommonRegistry.h

  1450 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler/unix/nsCommonRegistry.h

  1271 ===================================================================

  1451 new file mode 100644

  1272 --- /dev/null	1970-01-01 00:00:00.000000000 +0000

  1452 --- /dev/null

  1273 +++ firefox-60.2.0/uriloader/exthandler/unix/nsCommonRegistry.h	2018-09-05 21:49:31.502872845 +0200

  1453 +++ b/uriloader/exthandler/unix/nsCommonRegistry.h

  1303 Index: firefox-60.2.0/uriloader/exthandler/unix/nsKDERegistry.cpp

  1483 diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp

  1304 ===================================================================

  1484 new file mode 100644

  1305 --- /dev/null	1970-01-01 00:00:00.000000000 +0000

  1485 --- /dev/null

  1306 +++ firefox-60.2.0/uriloader/exthandler/unix/nsKDERegistry.cpp	2018-09-05 21:49:31.502872845 +0200

  1486 +++ b/uriloader/exthandler/unix/nsKDERegistry.cpp

  1395 Index: firefox-60.2.0/uriloader/exthandler/unix/nsKDERegistry.h

  1575 diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h

  1396 ===================================================================

  1576 new file mode 100644

  1397 --- /dev/null	1970-01-01 00:00:00.000000000 +0000

  1577 --- /dev/null

  1398 +++ firefox-60.2.0/uriloader/exthandler/unix/nsKDERegistry.h	2018-09-05 21:49:31.502872845 +0200

  1578 +++ b/uriloader/exthandler/unix/nsKDERegistry.h

  1434 Index: firefox-60.2.0/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp

  1614 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp

  1435 ===================================================================

  1615 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp

  1436 --- firefox-60.2.0.orig/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2018-09-05 21:49:23.106829422 +0200

  1616 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp

  1437 +++ firefox-60.2.0/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2018-09-05 21:49:31.502872845 +0200

  1617 @@ -1,47 +1,50 @@

  1438 @@ -5,7 +5,7 @@

  1618  /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 2 -*-

  1619   *

  1620   * This Source Code Form is subject to the terms of the Mozilla Public

  1621   * License, v. 2.0. If a copy of the MPL was not distributed with this

  1447 @@ -13,11 +13,14 @@

  1630  #include "nsAutoPtr.h"

  1455  nsresult

  1638  nsresult nsMIMEInfoUnix::LoadUriInternal(nsIURI *aURI) {

  1456  nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI)

  1457  {

  1463 @@ -32,14 +35,14 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo

  1644  nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval) {

  1645    // if mDefaultApplication is set, it means the application has been set from

  1646    // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to

  1647    // give the GNOME answer.

  1648    if (mDefaultApplication) return nsMIMEInfoImpl::GetHasDefaultHandler(_retval);

  1649  

  1470 -    RefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);

  1656      RefPtr<nsMIMEInfoBase> mimeInfo =

  1471 +    RefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);

  1657 -        nsGNOMERegistry::GetFromType(mSchemeOrType);

  1658 +        nsCommonRegistry::GetFromType(mSchemeOrType);

  1480      if (mimeInfo)

  1667      if (mimeInfo) *_retval = true;

  1481 @@ -64,6 +67,23 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns

  1668    }

  1669  

  1670    if (*_retval) return NS_OK;

  1671  

  1672    return NS_OK;

  1673 @@ -51,16 +54,33 @@ nsresult nsMIMEInfoUnix::LaunchDefaultWi

  1674    // if mDefaultApplication is set, it means the application has been set from

  1675    // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to

  1676    // give the GNOME answer.

  1677    if (mDefaultApplication) return nsMIMEInfoImpl::LaunchDefaultWithFile(aFile);

  1678  

  1505 Index: firefox-60.2.0/uriloader/exthandler/unix/nsOSHelperAppService.cpp

  1702    }

  1506 ===================================================================

  1703  

  1507 --- firefox-60.2.0.orig/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2018-09-05 21:49:23.106829422 +0200

  1704    // nsGIOMimeApp->Launch wants a URI string instead of local file

  1508 +++ firefox-60.2.0/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2018-09-05 21:49:31.502872845 +0200

  1705    nsresult rv;

  1509 @@ -10,7 +10,7 @@

  1706    nsCOMPtr<nsIIOService> ioservice =

  1707 diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp

  1708 --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp

  1709 +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp

  1710 @@ -5,17 +5,17 @@

  1711   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

  1712  

  1713  #include <sys/types.h>

  1714  #include <sys/stat.h>

  1715  

  1518 @@ -1133,7 +1133,7 @@ nsresult nsOSHelperAppService::OSProtoco

  1724  #include "nsReadableUtils.h"

  1725  #include "nsUnicharUtils.h"

  1726  #include "nsIURL.h"

  1727  #include "nsIFileStreams.h"

  1728  #include "nsILineInputStream.h"

  1729 @@ -1040,17 +1040,17 @@ nsresult nsOSHelperAppService::GetHandle

  1730  

  1731  nsresult nsOSHelperAppService::OSProtocolHandlerExists(

  1732      const char* aProtocolScheme, bool* aHandlerExists) {

  1733    nsresult rv = NS_OK;

  1734  

  1527 @@ -1151,7 +1151,7 @@ nsresult nsOSHelperAppService::OSProtoco

  1743    } else {

  1528  NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval)

  1744      *aHandlerExists = false;

  1529  {

  1745      nsCOMPtr<nsIHandlerService> handlerSvc =

  1746          do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv);

  1747      if (NS_SUCCEEDED(rv) && handlerSvc) {

  1748 @@ -1060,17 +1060,17 @@ nsresult nsOSHelperAppService::OSProtoco

  1749    }

  1750  

  1751    return rv;

  1752  }

  1753  

  1754  NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription(

  1755      const nsACString& aScheme, nsAString& _retval) {

  1536 @@ -1248,7 +1248,7 @@ nsOSHelperAppService::GetFromExtension(c

  1762  #endif

  1763  }

  1764  

  1765  nsresult nsOSHelperAppService::GetFileTokenForPath(

  1766      const char16_t* platformAppPath, nsIFile** aFile) {

  1767 @@ -1151,17 +1151,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel

  1768    nsresult rv =

  1769        LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType,

  1770                                 minorType, mime_types_description, true);

  1771  

  1772    if (NS_FAILED(rv) || majorType.IsEmpty()) {

  1540 -      nsGNOMERegistry::GetFromExtension(aFileExt);

  1776 -        nsGNOMERegistry::GetFromExtension(aFileExt);

  1541 +      nsCommonRegistry::GetFromExtension(aFileExt);

  1777 +        nsCommonRegistry::GetFromExtension(aFileExt);

  1545 @@ -1369,7 +1369,7 @@ nsOSHelperAppService::GetFromType(const

  1781      }

  1782  #endif

  1783  

  1784      rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType,

  1785                                    minorType, mime_types_description, false);

  1786 @@ -1263,17 +1263,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel

  1787  

  1788    // Now look up our extensions

  1789    nsAutoString extensions, mime_types_description;

  1790    LookUpExtensionsAndDescription(majorType, minorType, extensions,

  1791                                   mime_types_description);

  1552        LOG(("Got MIMEInfo from GNOME registry without extensions; setting them "

  1798        LOG(

  1553             "to %s\n", NS_LossyConvertUTF16toASCII(extensions).get()));

  1799            ("Got MIMEInfo from GNOME registry without extensions; setting them "

  1554 Index: firefox-60.2.0/widget/gtk/moz.build

  1800             "to %s\n",

  1555 ===================================================================

  1801             NS_LossyConvertUTF16toASCII(extensions).get()));

  1556 --- firefox-60.2.0.orig/widget/gtk/moz.build	2018-09-05 21:49:23.106829422 +0200

  1802  

  1557 +++ firefox-60.2.0/widget/gtk/moz.build	2018-09-05 21:49:31.502872845 +0200

  1803        NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?");

  1558 @@ -126,6 +126,7 @@ LOCAL_INCLUDES += [

  1804        gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions));

  1805 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build

  1806 --- a/widget/gtk/moz.build

  1807 +++ b/widget/gtk/moz.build

  1808 @@ -121,16 +121,17 @@ else:

  1809  include('/ipc/chromium/chromium-config.mozbuild')

  1810  

  1811  FINAL_LIBRARY = 'xul'

  1812  

  1813  LOCAL_INCLUDES += [

  1566 Index: firefox-60.2.0/widget/gtk/nsFilePicker.cpp

  1821  

  1567 ===================================================================

  1822  if CONFIG['MOZ_X11']:

  1568 --- firefox-60.2.0.orig/widget/gtk/nsFilePicker.cpp	2018-09-05 21:49:23.106829422 +0200

  1823      LOCAL_INCLUDES += [

  1569 +++ firefox-60.2.0/widget/gtk/nsFilePicker.cpp	2018-09-05 21:49:31.502872845 +0200

  1824          '/widget/x11',

  1570 @@ -9,6 +9,7 @@

  1825      ]

  1826 diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp

  1827 --- a/widget/gtk/nsFilePicker.cpp

  1828 +++ b/widget/gtk/nsFilePicker.cpp

  1829 @@ -4,32 +4,34 @@

  1830   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

  1831  

  1832  #include "mozilla/Types.h"

  1833  #include <sys/types.h>

  1834  #include <sys/stat.h>

  1578 @@ -25,6 +26,7 @@

  1842  #include "nsIURI.h"

  1843  #include "nsIWidget.h"

  1844  #include "nsIFile.h"

  1845  #include "nsIStringBundle.h"

  1846  

  1847  #include "nsArrayEnumerator.h"

  1848  #include "nsMemory.h"

  1849  #include "nsEnumeratorUtils.h"

  1850  #include "nsNetUtil.h"

  1851  #include "nsReadableUtils.h"

  1586 @@ -251,7 +253,9 @@ nsFilePicker::AppendFilter(const nsAStri

  1859  #define MAX_PREVIEW_SIZE 180

  1587  {

  1860  // bug 1184009

  1861  #define MAX_PREVIEW_SOURCE_SIZE 4096

  1862  

  1863  nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;

  1864 @@ -225,17 +227,19 @@ nsFilePicker::AppendFilters(int32_t aFil

  1865    mAllowURLs = !!(aFilterMask & filterAllowURLs);

  1866    return nsBaseFilePicker::AppendFilters(aFilterMask);

  1867  }

  1868  

  1869  NS_IMETHODIMP

  1870  nsFilePicker::AppendFilter(const nsAString &aTitle, const nsAString &aFilter) {

  1597 @@ -376,6 +380,29 @@ nsFilePicker::Open(nsIFilePickerShownCal

  1880    CopyUTF16toUTF8(aFilter, filter);

  1598    if (mRunning)

  1881    CopyUTF16toUTF8(aTitle, name);

  1599      return NS_ERROR_NOT_AVAILABLE;

  1882  

  1883    mFilters.AppendElement(filter);

  1884    mFilterNames.AppendElement(name);

  1885 @@ -335,16 +339,39 @@ nsresult nsFilePicker::Show(int16_t *aRe

  1886    return NS_OK;

  1887  }

  1888  

  1889  NS_IMETHODIMP

  1890  nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) {

  1891    // Can't show two dialogs concurrently with the same filepicker

  1892    if (mRunning) return NS_ERROR_NOT_AVAILABLE;

  1627 @@ -613,3 +640,228 @@ nsFilePicker::Done(GtkWidget* file_choos

  1920    GtkWindow *parent_widget =

  1921        GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));

  1922  

  1923    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);

  1924  

  1925 @@ -572,8 +599,233 @@ void nsFilePicker::Done(GtkWidget *file_

  1926    if (mCallback) {

  1927      mCallback->Done(result);

  1928      mCallback = nullptr;

  1929    } else {

  1930      mResult = result;

  1856 Index: firefox-60.2.0/widget/gtk/nsFilePicker.h

  2159 diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h

  1857 ===================================================================

  2160 --- a/widget/gtk/nsFilePicker.h

  1858 --- firefox-60.2.0.orig/widget/gtk/nsFilePicker.h	2018-09-05 21:49:23.106829422 +0200

  2161 +++ b/widget/gtk/nsFilePicker.h

  1859 +++ firefox-60.2.0/widget/gtk/nsFilePicker.h	2018-09-05 21:49:31.502872845 +0200

  2162 @@ -67,14 +67,20 @@ class nsFilePicker : public nsBaseFilePi

  1860 @@ -74,6 +74,12 @@ protected:

  2163    nsString mDefaultExtension;

  1861  private:

  2164  

  1862    static nsIFile *mPrevDisplayDirectory;

  2165    nsTArray<nsCString> mFilters;

  2166    nsTArray<nsCString> mFilterNames;

  2167  

  2168   private:

  2169    static nsIFile* mPrevDisplayDirectory;

  1871    GtkFileChooserWidget *mFileChooserDelegate;

  2178    GtkFileChooserWidget* mFileChooserDelegate;

  1873 Index: firefox-60.2.0/xpcom/components/ManifestParser.cpp

  2180  };

  1874 ===================================================================

  2181  

  1875 --- firefox-60.2.0.orig/xpcom/components/ManifestParser.cpp	2018-09-05 21:49:23.106829422 +0200

  2182  #endif

  1876 +++ firefox-60.2.0/xpcom/components/ManifestParser.cpp	2018-09-05 21:49:31.502872845 +0200

  2183 diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp

  1877 @@ -38,6 +38,7 @@

  2184 --- a/xpcom/components/ManifestParser.cpp

  2185 +++ b/xpcom/components/ManifestParser.cpp

  2186 @@ -33,16 +33,17 @@

  2187  #include "nsTextFormatter.h"

  2188  #include "nsVersionComparator.h"

  2189  #include "nsXPCOMCIDInternal.h"

  2190  

  2191  #include "nsIConsoleService.h"

  1885 @@ -449,6 +450,7 @@ ParseManifest(NSLocationType aType, File

  2199  struct ManifestDirective {

  2200    const char* directive;

  2201    int argc;

  2202  

  2203    // Binary components are only allowed for APP locations.

  2204 @@ -418,16 +419,17 @@ void ParseManifest(NSLocationType aType,

  2205    NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");

  2206    NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");

  2207    NS_NAMED_LITERAL_STRING(kApplication, "application");

  2208    NS_NAMED_LITERAL_STRING(kAppVersion, "appversion");

  2209    NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion");

  1893 @@ -504,6 +506,7 @@ ParseManifest(NSLocationType aType, File

  2217  #endif

  2218  

  2219    NS_NAMED_LITERAL_STRING(kMain, "main");

  2220    NS_NAMED_LITERAL_STRING(kContent, "content");

  2221  

  2222 @@ -473,39 +475,44 @@ void ParseManifest(NSLocationType aType,

  2223          CopyUTF8toUTF16(s, abi);

  2224          abi.Insert(char16_t('_'), 0);

  2225          abi.Insert(osTarget, 0);

  2226        }

  2227      }

  1900  #pragma warning(disable:4996) // VC12+ deprecates GetVersionEx

  2234  #pragma warning(disable : 4996)  // VC12+ deprecates GetVersionEx

  1901 @@ -513,6 +516,7 @@ ParseManifest(NSLocationType aType, File

  2235    OSVERSIONINFO info = {sizeof(OSVERSIONINFO)};

  1902                                info.dwMajorVersion,

  2236    if (GetVersionEx(&info)) {

  2237      nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", info.dwMajorVersion,

  1909 @@ -520,10 +524,12 @@ ParseManifest(NSLocationType aType, File

  2244    SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor();

  1910    nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",

  2245    nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", majorVersion, minorVersion);

  1911                              majorVersion,

  1912                              minorVersion);

  1915    nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",

  2248    nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", gtk_major_version,

  1916                              gtk_major_version,

  1922 @@ -532,6 +538,7 @@ ParseManifest(NSLocationType aType, File

  2254      mozilla::AndroidBridge::Bridge()->GetStaticStringField(

  1923                                                             osVersion);

  2255          "android/os/Build$VERSION", "RELEASE", osVersion);

  1930 @@ -643,6 +650,7 @@ ParseManifest(NSLocationType aType, File

  2262      process = kContent;

  2263    } else {

  2264      process = kMain;

  2265    }

  2266  

  2267 @@ -608,25 +615,27 @@ void ParseManifest(NSLocationType aType,

  2268      TriState stOsVersion = eUnspecified;

  2269      TriState stOs = eUnspecified;

  2270      TriState stABI = eUnspecified;

  2271      TriState stProcess = eUnspecified;

  2272  #if defined(MOZ_WIDGET_ANDROID)

  1938 @@ -652,6 +660,7 @@ ParseManifest(NSLocationType aType, File

  2280        ToLowerCase(token);

  2281        NS_ConvertASCIItoUTF16 wtoken(token);

  2282  

  1946 @@ -706,6 +715,7 @@ ParseManifest(NSLocationType aType, File

  2290            CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion,

  1947          stGeckoVersion == eBad ||

  2291                             stGeckoVersion)) {

  1948          stOs == eBad ||

  2292          continue;

  1949          stOsVersion == eBad ||

  2293        }

  1950 +        stDesktop == eBad ||

  2294  

  2295 @@ -663,17 +672,17 @@ void ParseManifest(NSLocationType aType,

  2296        }

  2297  

  2298        LogMessageWithContext(

  2299            aFile, line, "Unrecognized chrome manifest modifier '%s'.", token);

  2300        ok = false;

  2301      }

  2302  

  2303      if (!ok || stApp == eBad || stAppVersion == eBad ||

  2304 -        stGeckoVersion == eBad || stOs == eBad || stOsVersion == eBad ||

  2305 +        stGeckoVersion == eBad || stOs == eBad || stOsVersion == eBad || stDesktop == eBad ||

  1954 Index: firefox-60.2.0/xpcom/components/moz.build

  2309          stABI == eBad || stProcess == eBad) {

  1955 ===================================================================

  2310        continue;

  1956 --- firefox-60.2.0.orig/xpcom/components/moz.build	2018-09-05 21:49:23.110829442 +0200

  2311      }

  1957 +++ firefox-60.2.0/xpcom/components/moz.build	2018-09-05 21:49:31.502872845 +0200

  2312  

  1958 @@ -49,6 +49,7 @@ LOCAL_INCLUDES += [

  2313      if (directive->regfunc) {

  2314 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build

  2315 --- a/xpcom/components/moz.build

  2316 +++ b/xpcom/components/moz.build

  2317 @@ -44,12 +44,13 @@ FINAL_LIBRARY = 'xul'

  2318  LOCAL_INCLUDES += [

  2319      '!..',

  2320      '../base',

  2321      '../build',

  2322      '../ds',

  1966 Index: firefox-60.2.0/xpcom/io/nsLocalFileUnix.cpp

  2330      CXXFLAGS += CONFIG['TK_CFLAGS']

  1967 ===================================================================

  2331 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp

  1968 --- firefox-60.2.0.orig/xpcom/io/nsLocalFileUnix.cpp	2018-09-05 21:49:23.110829442 +0200

  2332 --- a/xpcom/io/nsLocalFileUnix.cpp

  1969 +++ firefox-60.2.0/xpcom/io/nsLocalFileUnix.cpp	2018-09-05 21:56:47.649117623 +0200

  2333 +++ b/xpcom/io/nsLocalFileUnix.cpp

  1970 @@ -52,6 +52,7 @@

  2334 @@ -47,16 +47,17 @@

  2335  #include "prproces.h"

  2336  #include "nsIDirectoryEnumerator.h"

  2337  #include "nsISimpleEnumerator.h"

  2338  #include "private/pprio.h"

  2339  #include "prlink.h"

  1978 @@ -2010,18 +2011,16 @@ nsLocalFile::Reveal()

  2347  #include <Carbon/Carbon.h>

  2348  #include "CocoaFileUtils.h"

  2349  #include "prmem.h"

  2350  #include "plbase64.h"

  2351  

  2352 @@ -1901,62 +1902,77 @@ nsLocalFile::SetPersistentDescriptor(con

  2353  

  2354  NS_IMETHODIMP

  2355  nsLocalFile::Reveal() {

  2356    if (!FilePreferences::IsAllowedPath(mPath)) {

  2357      return NS_ERROR_FILE_ACCESS_DENIED;

  2000 @@ -2035,7 +2034,7 @@ nsLocalFile::Reveal()

  2379    }

  2380    nsCOMPtr<nsIFile> parentDir;

  2381    nsAutoCString dirPath;

  2382    if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) {

  2383      return NS_ERROR_FAILURE;

  2384    }

  2385    if (NS_FAILED(parentDir->GetNativePath(dirPath))) {

  2009 @@ -2047,6 +2046,17 @@ nsLocalFile::Reveal()

  2394      nsresult rv = CocoaFileUtils::RevealFileInFinder(url);

  2395      ::CFRelease(url);

  2396      return rv;

  2397    }

  2398    return NS_ERROR_FAILURE;

  2027 @@ -2057,6 +2067,12 @@ nsLocalFile::Launch()

  2416  nsLocalFile::Launch() {

  2417    if (!FilePreferences::IsAllowedPath(mPath)) {

  2418      return NS_ERROR_FILE_ACCESS_DENIED;