From 17d724736414e79144a26f002b1938777292e2ae Mon Sep 17 00:00:00 2001
From: Tigro <ashejn@yandex-team.ru>
Date: Tue, 12 May 2015 19:15:30 +0300
Subject: [PATCH] update to 38.0

---
 .abf.yml                                     |   2 +-
 firefox-37-kde.patch => firefox-38-kde.patch | 122 ++++++++-------
 firefox.spec                                 |   6 +-
 mozilla-37-kde.patch => mozilla-38-kde.patch | 154 +++++++------------
 4 files changed, 130 insertions(+), 154 deletions(-)
 rename firefox-37-kde.patch => firefox-38-kde.patch (95%)
 rename mozilla-37-kde.patch => mozilla-38-kde.patch (96%)

diff --git a/.abf.yml b/.abf.yml
index 80db6b6..ae7c8c7 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
 sources:
   firefox-searchengines-bing.xml: ccdb7c0cc2d288714f70f8a92f0adfc2766f2b36
-  firefox-37.0.2.source.tar.bz2: 6e306d56e4e00ffdc2ddbdfbbabe4cb9fc527071
+  firefox-38.0.source.tar.bz2: 3812a31287d3a8d9ebb1326e131a944fd27f0f2d
diff --git a/firefox-37-kde.patch b/firefox-38-kde.patch
similarity index 95%
rename from firefox-37-kde.patch
rename to firefox-38-kde.patch
index 5204801..86d02ec 100644
--- a/firefox-37-kde.patch
+++ b/firefox-38-kde.patch
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  409c60c5454efb61ebecf0edc8822a0e92f563f3
+# Parent  a21f91aa3ed60b4e95b47f45715dfda379dab7c8
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1288 @@
+@@ -0,0 +1,1302 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -154,8 +154,13 @@ new file mode 100644
 +    <!-- for url bar autocomplete -->
 +    <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
 +
-+    <!-- for select dropdowns -->
-+    <menupopup id="ContentSelectDropdown" rolluponmousewheel="true" hidden="true"/>
++    <!-- for select dropdowns. The menupopup is what shows the list of options,
++         and the popuponly menulist makes things like the menuactive attributes
++         work correctly on the menupopup. ContentSelectDropdown expects the
++         popuponly menulist to be its immediate parent. -->
++    <menulist popuponly="true" id="ContentSelectDropdown" hidden="true">
++      <menupopup rolluponmousewheel="true"/>
++    </menulist>
 +
 +    <!-- for invalid form error message -->
 +    <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent">
@@ -248,41 +253,6 @@ new file mode 100644
 +           mousethrough="always">
 +      <box id="UITourHighlight"></box>
 +    </panel>
-+    <!-- Used to highlight the new search experience -->
-+    <panel id="SearchHighlight1"
-+           class="SearchHighlight"
-+           type="arrow"
-+           hidden="true"
-+           noautofocus="true"
-+           noautohide="true"
-+           orient="vertical"
-+           align="stretch">
-+      <label class="SearchHighlightTitle">&SearchHighlight1.title;</label>
-+      <description class="SearchHighlightText" flex="1">&SearchHighlight1.text;</description>
-+      <hbox class="SearchHighlightFooter" align="center">
-+        <spacer class="dot filled"/>
-+        <spacer class="dot"/>
-+        <spacer flex="1"/>
-+        <button label="&SearchHighlightNext;"/>
-+      </hbox>
-+    </panel>
-+    <panel id="SearchHighlight2"
-+           class="SearchHighlight"
-+           type="arrow"
-+           hidden="true"
-+           noautofocus="true"
-+           noautohide="true"
-+           orient="vertical"
-+           align="stretch">
-+      <label class="SearchHighlightTitle">&SearchHighlight2.title;</label>
-+      <description class="SearchHighlightText" flex="1">&SearchHighlight2.text;</description>
-+      <hbox class="SearchHighlightFooter" align="center">
-+        <spacer class="dot"/>
-+        <spacer class="dot filled"/>
-+        <spacer flex="1"/>
-+        <button label="&SearchHighlightClose;"/>
-+      </hbox>
-+    </panel>
 +
 +    <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true"
 +           onclick="this.hidePopup()">
@@ -342,6 +312,26 @@ new file mode 100644
 +           orient="horizontal"
 +           hidden="true"/>
 +
++    <menupopup id="processHangOptions"
++               onpopupshowing="ProcessHangMonitor.refreshMenu(window);">
++      <menuitem id="processHangTerminateScript"
++                oncommand="ProcessHangMonitor.terminateScript(window)"
++                accesskey="&processHang.terminateScript.accessKey;"
++                label="&processHang.terminateScript.label;"/>
++      <menuitem id="processHangDebugScript"
++                oncommand="ProcessHangMonitor.debugScript(window)"
++                accesskey="&processHang.debugScript.accessKey;"
++                label="&processHang.debugScript.label;"/>
++      <menuitem id="processHangTerminatePlugin"
++                oncommand="ProcessHangMonitor.terminatePlugin(window)"
++                accesskey="&processHang.terminatePlugin.accessKey;"
++                label="&processHang.terminatePlugin.label;"/>
++      <menuitem id="processHangTerminateProcess"
++                oncommand="ProcessHangMonitor.terminateProcess(window)"
++                accesskey="&processHang.terminateProcess.accessKey;"
++                label="&processHang.terminateProcess.label;"/>
++    </menupopup>
++
 +    <menupopup id="toolbar-context-menu"
 +               onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
@@ -588,12 +578,12 @@ new file mode 100644
 +
 +    <menupopup id="emeNotificationsPopup">
 +      <menuitem id="emeNotificationsNotNow"
-+                label="Not now"
-+                acceskey="N"
++                label="&emeNotificationsNotNow.label;"
++                acceskey="&emeNotificationsNotNow.accesskey;"
 +                oncommand="gEMEHandler.onNotNow(this);"/>
 +      <menuitem id="emeNotificationsDontAskAgain"
-+                label="Don't ask me again"
-+                acceskey="D"
++                label="&emeNotificationsDontAskAgain.label;"
++                acceskey="&emeNotificationsDontAskAgain.accesskey;"
 +                oncommand="gEMEHandler.onDontAskAgain(this);"/>
 +    </menupopup>
 +  </popupset>
@@ -845,6 +835,14 @@ new file mode 100644
 +                       hidden="true"
 +                       tooltiptext="&pageReportIcon.tooltip;"
 +                       onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
++                <image id="readinglist-addremove-button"
++                       class="urlbar-icon"
++                       hidden="true"
++                       onclick="ReadingListUI.togglePageByBrowser(gBrowser.selectedBrowser);"/>
++                <image id="reader-mode-button"
++                       class="urlbar-icon"
++                       hidden="true"
++                       onclick="ReaderParent.buttonClick(event);"/>
 +              </hbox>
 +              <toolbarbutton id="urlbar-go-button"
 +                             class="chromeclass-toolbar-additional"
@@ -898,7 +896,7 @@ new file mode 100644
 +                      class="subviewbutton"
 +                      label="&viewBookmarksSidebar2.label;"
 +                      type="checkbox"
-+                      oncommand="toggleSidebar('viewBookmarksSidebar');">
++                      oncommand="SidebarUI.toggle('viewBookmarksSidebar');">
 +              <observes element="viewBookmarksSidebar" attribute="checked"/>
 +            </menuitem>
 +            <!-- NB: temporary solution for bug 985024, this should go away soon. -->
@@ -963,6 +961,22 @@ new file mode 100644
 +                                           new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
 +                                                          PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
 +            </menu>
++            <menuseparator>
++              <observes element="readingListSidebar" attribute="hidden"/>
++            </menuseparator>
++            <menu id="BMB_readingList"
++                  class="menu-iconic bookmark-item subviewbutton"
++                  label="&readingList.label;"
++                  container="true">
++              <observes element="readingListSidebar" attribute="hidden"/>
++              <menupopup id="BMB_readingListPopup"
++                         placespopup="true"
++                         onpopupshowing="ReadingListUI.onReadingListPopupShowing(this);">
++                <menuitem id="BMB_viewReadingListSidebar" class="subviewbutton"
++                          oncommand="SidebarUI.show('readingListSidebar');"
++                          label="&readingList.showSidebar.label;"/>
++              </menupopup>
++            </menu>
 +            <menuseparator/>
 +            <!-- Bookmarks menu items will go here -->
 +            <menuitem id="BMB_bookmarksShowAll"
@@ -1151,10 +1165,10 @@ new file mode 100644
 +        <sidebarheader id="sidebar-header" align="center">
 +          <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
 +          <image id="sidebar-throbber"/>
-+          <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
++          <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
 +        </sidebarheader>
 +        <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
-+                  style="min-width: 14em; width: 18em; max-width: 36em;"/>
++                  style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
 +      </vbox>
 +
 +      <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
@@ -1165,7 +1179,7 @@ new file mode 100644
 +                    tabcontainer="tabbrowser-tabs"
 +                    contentcontextmenu="contentAreaContextMenu"
 +                    autocompletepopup="PopupAutoComplete"
-+                    selectpopup="ContentSelectDropdown"/>
++                    selectmenulist="ContentSelectDropdown"/>
 +        <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
 +      </vbox>
 +      <splitter id="social-sidebar-splitter"
@@ -1297,7 +1311,7 @@ new file mode 100644
 diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
 --- a/browser/base/content/browser.xul
 +++ b/browser/base/content/browser.xul
-@@ -174,17 +174,17 @@
+@@ -179,17 +179,17 @@
                      class="editBookmarkPanelHeaderButton"
                      oncommand="StarUI.removeBookmarkButtonCommand();"
                      accesskey="&editBookmark.removeBookmark.accessKey;"/>
@@ -1316,7 +1330,7 @@ diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
          <button id="editBookmarkPanelDeleteButton"
                  class="editBookmarkPanelBottomButton"
                  label="&editBookmark.cancel.label;"
-@@ -1214,17 +1214,17 @@
+@@ -1228,17 +1228,17 @@
  
    <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
      <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@@ -1338,10 +1352,10 @@ diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -69,16 +69,18 @@ browser.jar:
-         content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
+@@ -70,16 +70,18 @@ browser.jar:
          content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
          content/browser/aboutProviderDirectory.xhtml  (content/aboutProviderDirectory.xhtml)
+         content/browser/aboutTabCrashed.css           (content/aboutTabCrashed.css)
          content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
          content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
  *       content/browser/browser.css                   (content/browser.css)
@@ -1349,7 +1363,6 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
  *       content/browser/browser.xul                   (content/browser.xul)
 +*       content/browser/browser-kde.xul               (content/browser-kde.xul)
 +%       override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
- *       content/browser/browser-eme.properties        (content/browser-eme.properties)
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
  *       content/browser/chatWindow.xul                (content/chatWindow.xul)
          content/browser/content.js                    (content/content.js)
@@ -1357,6 +1370,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
          content/browser/defaultthemes/1.header.jpg    (content/defaultthemes/1.header.jpg)
          content/browser/defaultthemes/1.icon.jpg      (content/defaultthemes/1.icon.jpg)
          content/browser/defaultthemes/1.preview.jpg   (content/defaultthemes/1.preview.jpg)
+         content/browser/defaultthemes/2.footer.jpg    (content/defaultthemes/2.footer.jpg)
 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 --- a/browser/components/build/nsModule.cpp
 +++ b/browser/components/build/nsModule.cpp
@@ -1784,7 +1798,7 @@ new file mode 100644
 +#include "nsStringAPI.h"
 +#include "mozilla/Attributes.h"
 +
-+class nsKDEShellService MOZ_FINAL : public nsIShellService
++class nsKDEShellService final : public nsIShellService
 +{
 +public:
 +  nsKDEShellService() : mCheckedThisSession(false) { }
@@ -1911,7 +1925,7 @@ new file mode 100644
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -688,19 +688,21 @@
+@@ -698,19 +698,21 @@
  @RESPATH@/defaults/autoconfig/prefcalls.js
  @RESPATH@/browser/defaults/profile/prefs.js
  
diff --git a/firefox.spec b/firefox.spec
index 0c8e12a..599f2d8 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -7,7 +7,7 @@
 # This also means only STABLE upstream releases, NO betas.
 # This is a discussed topic. Please, do not flame it again.
 
-%define major 37.0.2
+%define major 38.0
 %define ff_epoch 0
 # (tpg) set version HERE !!!
 %define realver %{major}
@@ -52,8 +52,8 @@ Patch2:         firefox-vendor.patch
 Patch8:		firefox-25.0-disable-check-default-browser.patch
 Patch10:	firefox-3.5.3-default-mail-handler.patch
 # Patches for kde integration of FF 
-Patch11:	firefox-37-kde.patch
-Patch12:	mozilla-37-kde.patch
+Patch11:	firefox-38-kde.patch
+Patch12:	mozilla-38-kde.patch
 #Patch13:	mozilla-kde-background.patch
 Patch34:	xulrunner_nojit.patch
 Patch35:	firefox-37-build-with-time-independent-uuids.patch
diff --git a/mozilla-37-kde.patch b/mozilla-38-kde.patch
similarity index 96%
rename from mozilla-37-kde.patch
rename to mozilla-38-kde.patch
index b10abda..2f70003 100644
--- a/mozilla-37-kde.patch
+++ b/mozilla-38-kde.patch
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  2b183c17f6e4693372442af1a8ee0be364f8cba0
+# Parent  214f99f3ce4f1f8ae9b3d18da44e5d66b3105663
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -1836,8 +1836,8 @@ new file mode 100644
 +            secMan.isSystemPrincipal(window.opener.document.nodePrincipal)) {
 +          var psvc = Components.classes["@mozilla.org/preferences-service;1"]
 +                               .getService(Components.interfaces.nsIPrefBranch);
-+          var instantApply = psvc.getBoolPref("browser.preferences.instantApply");
-+          if (instantApply) {
++          var pdocEl = window.opener.document.documentElement;
++          if (pdocEl.instantApply) {
 +            var panes = this.preferencePanes;
 +            for (var i = 0; i < panes.length; ++i)
 +              panes[i].writePreferences(true);
@@ -2136,7 +2136,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 +#include "nsVoidArray.h"
 +#include "nsKDEUtils.h"
  
- class nsUnixSystemProxySettings MOZ_FINAL : public nsISystemProxySettings {
+ class nsUnixSystemProxySettings final : public nsISystemProxySettings {
  public:
    NS_DECL_ISUPPORTS
    NS_DECL_NSISYSTEMPROXYSETTINGS
@@ -2219,7 +2219,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -43,17 +43,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+@@ -45,17 +45,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
      GENERATED_SOURCES += [
          'moc_nsNativeAppSupportQt.cpp',
      ]
@@ -2666,9 +2666,9 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
  LOCAL_INCLUDES += [
      '/dom/base',
      '/dom/ipc',
-     '/netwerk/base/src',
+     '/netwerk/base',
      '/netwerk/protocol/http',
-+    '/toolkit/xre'
++    '/toolkit/xre',
  ]
  
  if CONFIG['MOZ_ENABLE_DBUS']:
@@ -2904,7 +2904,7 @@ new file mode 100644
 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-@@ -7,33 +7,36 @@
+@@ -7,32 +7,35 @@
  #ifdef MOZ_WIDGET_QT
  #if (MOZ_ENABLE_CONTENTACTION)
  #include <contentaction/contentaction.h>
@@ -2918,7 +2918,6 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
  #include "nsIGIOService.h"
  #include "nsNetCID.h"
  #include "nsIIOService.h"
- #include "nsIGnomeVFSService.h"
  #include "nsAutoPtr.h"
  #ifdef MOZ_ENABLE_DBUS
  #include "nsDBusHandlerApp.h"
@@ -2943,7 +2942,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
  #endif
  
    return rv;
-@@ -46,24 +49,24 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
+@@ -45,24 +48,24 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
    // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to
    // give the GNOME answer.
    if (mDefaultApplication)
@@ -2951,7 +2950,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
  
    *_retval = false;
  
-   if (mClass ==  eProtocolInfo) {
+   if (mClass == eProtocolInfo) {
 -    *_retval = nsGNOMERegistry::HandlerExists(mSchemeOrType.get());
 +    *_retval = nsCommonRegistry::HandlerExists(mSchemeOrType.get());
    } else {
@@ -2971,7 +2970,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
  
    if (*_retval)
      return NS_OK;
-@@ -98,16 +101,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -97,16 +100,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
      ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
    if (action.isValid()) {
      action.trigger();
@@ -2998,32 +2997,13 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
 +  }
 +
    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-   nsAutoCString uriSpec;
-   if (giovfs) {
-     // nsGIOMimeApp->Launch wants a URI string instead of local file
-     nsresult rv;
-     nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
-     NS_ENSURE_SUCCESS(rv, rv);
-     nsCOMPtr<nsIURI> uri;
-@@ -125,17 +145,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
-     /* Fallback to GnomeVFS */
-     nsCOMPtr<nsIGnomeVFSMimeApp> app;
-     if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
-       return app->Launch(nativePath);
+   if (!giovfs) {
+     return NS_ERROR_FAILURE;
    }
  
-   // If we haven't got an app we try to get a valid one by searching for the
-   // extension mapped type
--  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath);
-+  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromExtension(nativePath);
-   if (mimeInfo) {
-     nsAutoCString type;
-     mimeInfo->GetType(type);
-     if (giovfs) {
-       nsCOMPtr<nsIGIOMimeApp> app;
-       if (NS_SUCCEEDED(giovfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
-         return app->Launch(uriSpec);
-     } else if (gnomevfs) {
+   // nsGIOMimeApp->Launch wants a URI string instead of local file
+   nsresult rv;
+   nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
 diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
@@ -3054,7 +3034,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  #endif
  
  #ifdef MOZ_WIDGET_GTK
-   // Check the GConf registry for a protocol handler
+   // Check the GNOME registry for a protocol handler
 -  *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
 +  *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);
  #endif
@@ -3094,25 +3074,25 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  
      rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
                                    majorType,
-@@ -1372,17 +1372,17 @@ nsOSHelperAppService::GetFromType(const 
+@@ -1373,17 +1373,17 @@ nsOSHelperAppService::GetFromType(const 
+   nsAutoString extensions, mime_types_description;
+   LookUpExtensionsAndDescription(majorType,
+                                  minorType,
+                                  extensions,
+                                  mime_types_description);
+ 
  #ifdef MOZ_WIDGET_GTK
-   nsRefPtr<nsMIMEInfoBase> gnomeInfo;
    if (handler.IsEmpty()) {
-     // No useful data yet.  Check the GNOME registry.  Unfortunately, newer
-     // GNOME versions no longer have type-to-extension mappings, so we might
-     // get back a MIMEInfo without any extensions set.  In that case we'll have
-     // to look in our mime.types files for the extensions.
-     LOG(("Looking in GNOME registry\n"));
--    gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
-+    gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType);
-     if (gnomeInfo && gnomeInfo->HasExtensions()) {
-       LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
+-    nsRefPtr<nsMIMEInfoBase> gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
++    nsRefPtr<nsMIMEInfoBase> gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType);
+     if (gnomeInfo) {
+       LOG(("Got MIMEInfo from GNOME registry without extensions; setting them "
+            "to %s\n", NS_LossyConvertUTF16toASCII(extensions).get()));
+ 
+       NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?");
+       gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions));
        return gnomeInfo.forget();
      }
-   }
- #endif
- 
-   // Now look up our extensions
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
@@ -3465,7 +3445,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
 diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
 --- a/widget/gtk/nsFilePicker.h
 +++ b/widget/gtk/nsFilePicker.h
-@@ -66,11 +66,17 @@ protected:
+@@ -68,11 +68,17 @@ protected:
    nsString  mDefault;
    nsString  mDefaultExtension;
  
@@ -3504,9 +3484,9 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  #define XPTONLY_MANIFEST nullptr
  #define XPTONLY_XPT nullptr
  #endif
-@@ -488,16 +489,17 @@ ParseManifest(NSLocationType aType, File
-   NS_NAMED_LITERAL_STRING(kPlatform, "platform");
-   NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible");
+@@ -489,16 +490,17 @@ ParseManifest(NSLocationType aType, File
+   NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
+   NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
    NS_NAMED_LITERAL_STRING(kApplication, "application");
    NS_NAMED_LITERAL_STRING(kAppVersion, "appversion");
    NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion");
@@ -3522,7 +3502,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
    NS_NAMED_LITERAL_STRING(kMain, "main");
    NS_NAMED_LITERAL_STRING(kContent, "content");
  
-@@ -548,44 +550,49 @@ ParseManifest(NSLocationType aType, File
+@@ -549,44 +551,49 @@ ParseManifest(NSLocationType aType, File
          CopyUTF8toUTF16(s, abi);
          abi.Insert(char16_t('_'), 0);
          abi.Insert(osTarget, 0);
@@ -3573,14 +3553,14 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
    }
  
 @@ -681,25 +688,27 @@ ParseManifest(NSLocationType aType, File
+     TriState stOsVersion = eUnspecified;
      TriState stOs = eUnspecified;
      TriState stABI = eUnspecified;
      TriState stProcess = eUnspecified;
  #if defined(MOZ_WIDGET_ANDROID)
      TriState stTablet = eUnspecified;
  #endif
-     bool platform = false;
-     bool contentAccessible = false;
+     int flags = 0;
 +    TriState stDesktop = eUnspecified;
  
      while ((token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) &&
@@ -3600,7 +3580,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
        }
  
  #if defined(MOZ_WIDGET_ANDROID)
-@@ -731,16 +740,17 @@ ParseManifest(NSLocationType aType, File
+@@ -749,16 +758,17 @@ ParseManifest(NSLocationType aType, File
      }
  
      if (!ok ||
@@ -3638,7 +3618,8 @@ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -45,16 +45,17 @@
+@@ -44,16 +44,17 @@
+ #include "prproces.h"
  #include "nsIDirectoryEnumerator.h"
  #include "nsISimpleEnumerator.h"
  #include "private/pprio.h"
@@ -3646,7 +3627,6 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  
  #ifdef MOZ_WIDGET_GTK
  #include "nsIGIOService.h"
- #include "nsIGnomeVFSService.h"
 +#include "nsKDEUtils.h"
  #endif
  
@@ -3656,7 +3636,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1965,55 +1966,57 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1964,42 +1965,52 @@ nsLocalFile::SetPersistentDescriptor(con
    return InitWithNativePath(aPersistentDescriptor);
  #endif
  }
@@ -3666,14 +3646,11 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  {
  #ifdef MOZ_WIDGET_GTK
 -  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
--  nsCOMPtr<nsIGnomeVFSService> gnomevfs =
--    do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
--  if (!giovfs && !gnomevfs) {
+-  if (!giovfs) {
 -    return NS_ERROR_FAILURE;
 -  }
--
-+
 +  nsAutoCString url;
+ 
    bool isDirectory;
    if (NS_FAILED(IsDirectory(&isDirectory))) {
      return NS_ERROR_FAILURE;
@@ -3681,16 +3658,9 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  
 +  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
    if (isDirectory) {
--    if (giovfs) {
--      return giovfs->ShowURIForInput(mPath);
--    } else
--      /* Fallback to GnomeVFS */
--    {
--      return gnomevfs->ShowURIForInput(mPath);
--    }
+-    return giovfs->ShowURIForInput(mPath);
 +    url = mPath;
-   } else if (giovfs &&
-              NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
+   } else if (NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
      return NS_OK;
    } else {
      nsCOMPtr<nsIFile> parentDir;
@@ -3702,11 +3672,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
        return NS_ERROR_FAILURE;
      }
  
--    if (giovfs) {
--      return giovfs->ShowURIForInput(dirPath);
--    } else {
--      return gnomevfs->ShowURIForInput(dirPath);
--    }
+-    return giovfs->ShowURIForInput(dirPath);
 +    url = dirPath;
    }
 +
@@ -3717,14 +3683,10 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +  }
 +
-+  nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
-+  if (!giovfs && !gnomevfs)
++  if (!giovfs)
 +    return NS_ERROR_FAILURE;
 +
-+  if (giovfs)
-+    return giovfs->ShowURIForInput(url);
-+  else
-+    return gnomevfs->ShowURIForInput(url);
++  return giovfs->ShowURIForInput(url);
  #elif defined(MOZ_WIDGET_COCOA)
    CFURLRef url;
    if (NS_SUCCEEDED(GetCFURL(&url))) {
@@ -3733,7 +3695,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
      return rv;
    }
    return NS_ERROR_FAILURE;
-@@ -2021,16 +2024,22 @@ nsLocalFile::Reveal()
+@@ -2007,16 +2018,22 @@ nsLocalFile::Reveal()
    return NS_ERROR_FAILURE;
  #endif
  }
@@ -3749,10 +3711,10 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +  }
    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-   nsCOMPtr<nsIGnomeVFSService> gnomevfs =
-     do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
-   if (giovfs) {
-     return giovfs->ShowURIForInput(mPath);
-   } else if (gnomevfs) {
-     /* GnomeVFS fallback */
-     return gnomevfs->ShowURIForInput(mPath);
+   if (!giovfs) {
+     return NS_ERROR_FAILURE;
+   }
+ 
+   return giovfs->ShowURIForInput(mPath);
+ #elif defined(MOZ_ENABLE_CONTENTACTION)
+   QUrl uri = QUrl::fromLocalFile(QString::fromUtf8(mPath.get()));