From e45ae96171d1876685b56d46ccac468a8513cfb5 Mon Sep 17 00:00:00 2001
From: Tigro <ashejn@gmail.com>
Date: Tue, 4 Feb 2014 20:55:03 +0400
Subject: [PATCH] update to 27.0

---
 .abf.yml                                     |  2 +-
 firefox-26-kde.patch => firefox-27-kde.patch | 57 ++++++++----
 firefox.spec                                 |  6 +-
 mozilla-26-kde.patch => mozilla-27-kde.patch | 98 ++++++++++----------
 4 files changed, 95 insertions(+), 68 deletions(-)
 rename firefox-26-kde.patch => firefox-27-kde.patch (98%)
 rename mozilla-26-kde.patch => mozilla-27-kde.patch (98%)

diff --git a/.abf.yml b/.abf.yml
index ba1d3db..f66445a 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  firefox-26.0.source.tar.bz2: f7c6642d6f62aea8d4eced48dd27aba0634edcd5
+  firefox-27.0.source.tar.bz2: ec2031385237e30be829817ac79caa8e80cc2a14
diff --git a/firefox-26-kde.patch b/firefox-27-kde.patch
similarity index 98%
rename from firefox-26-kde.patch
rename to firefox-27-kde.patch
index b89366b..3750591 100644
--- a/firefox-26-kde.patch
+++ b/firefox-27-kde.patch
@@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1158 @@
+@@ -0,0 +1,1184 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -27,6 +27,7 @@ new file mode 100644
 +<window id="main-window"
 +        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 +        xmlns:svg="http://www.w3.org/2000/svg"
++        xmlns:html="http://www.w3.org/1999/xhtml"
 +        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 +        onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();"
 +        title="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
@@ -187,6 +188,22 @@ new file mode 100644
 +      </hbox>
 +    </panel>
 +
++    <!-- UI tour experience -->
++    <panel id="UITourTooltip"
++           type="arrow"
++           hidden="true"
++           consumeoutsideclicks="false"
++           noautofocus="true"
++           align="start"
++           orient="vertical"
++           role="alert">
++      <label id="UITourTooltipTitle" flex="1"/>
++      <description id="UITourTooltipDescription" flex="1"/>
++    </panel>
++    <html:div id="UITourHighlightContainer" style="position:relative">
++      <html:div id="UITourHighlight"></html:div>
++    </html:div>
++
 +    <panel id="socialActivatedNotification"
 +           type="arrow"
 +           hidden="true"
@@ -346,7 +363,11 @@ new file mode 100644
 +        </vbox>
 +      </hbox>
 +      <!-- Footer button to open security page info -->
-+      <hbox id="identity-popup-button-container" pack="end">
++      <hbox id="identity-popup-button-container" align="center">
++        <button id="identity-popup-help-icon"
++               oncommand="gIdentityHandler.handleHelpCommand(event);"
++               tooltiptext="&identity.help.tooltip;"/>
++        <spacer flex="1"/>
 +        <button id="identity-popup-more-info-button"
 +                label="&identity.moreInfoLinkText;"
 +                oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
@@ -396,6 +417,11 @@ new file mode 100644
 +
 +#include popup-notifications.inc
 +
++    <hbox id="downloads-animation-container" mousethrough="always">
++      <vbox id="downloads-notification-anchor">
++        <vbox id="downloads-indicator-notification"/>
++      </vbox>
++    </hbox>
 +  </popupset>
 +
 +#ifdef CAN_DRAW_IN_TITLEBAR
@@ -547,7 +573,7 @@ new file mode 100644
 +                   onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
 +            <image id="star-button"
 +                   class="urlbar-icon"
-+                   onclick="BookmarkingUI.onCommand(event);"/>
++                   onclick="if (event.button === 0) BookmarkingUI.onCommand(event);"/>
 +            <image id="go-button"
 +                   class="urlbar-icon"
 +                   tooltiptext="&goEndCap.tooltip;"
@@ -1021,7 +1047,7 @@ new file mode 100644
 +
 +    <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
 +    <vbox id="appcontent" flex="1">
-+      <tabbrowser id="content" disablehistory="true"
++      <tabbrowser id="content"
 +                  flex="1" contenttooltip="aHTMLTooltip"
 +                  tabcontainer="tabbrowser-tabs"
 +                  contentcontextmenu="contentAreaContextMenu"
@@ -1181,8 +1207,8 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
          content/browser/newtab/newTab.xul             (content/newtab/newTab.xul)
  *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
          content/browser/newtab/newTab.css             (content/newtab/newTab.css)
+         content/browser/newtab/preloaderContent.js    (content/newtab/preloaderContent.js)
  *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
-         content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
 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
@@ -1246,7 +1272,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
 --- a/browser/components/preferences/advanced.js
 +++ b/browser/components/preferences/advanced.js
-@@ -23,16 +23,22 @@ var gAdvancedPane = {
+@@ -24,16 +24,22 @@ var gAdvancedPane = {
      if (extraArgs && extraArgs["advancedTab"]){
        advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
      } else {
@@ -1269,7 +1295,7 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
      // when the user will select the default.  We refresh here periodically
      // in case the default changes.  On other Windows OS's defaults can also
      // be set while the prefs are open.
-@@ -860,14 +866,25 @@ var gAdvancedPane = {
+@@ -903,14 +909,25 @@ var gAdvancedPane = {
     * Set browser as the operating system default browser.
     */
    setDefaultBrowser: function()
@@ -1298,7 +1324,7 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
 --- a/browser/components/shell/src/Makefile.in
 +++ b/browser/components/shell/src/Makefile.in
-@@ -9,10 +9,12 @@ USE_STATIC_LIBS = 1
+@@ -8,10 +8,12 @@ USE_STATIC_LIBS = 1
  
  include $(topsrcdir)/config/rules.mk
  
@@ -1314,21 +1340,20 @@ diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell
 diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build
 --- a/browser/components/shell/src/moz.build
 +++ b/browser/components/shell/src/moz.build
-@@ -11,17 +11,19 @@ if CONFIG['OS_ARCH'] == 'WINNT':
-         'nsWindowsShellService.cpp',
+@@ -12,16 +12,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
      ]
  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-     CPP_SOURCES += [
+     SOURCES += [
          'nsMacShellService.cpp',
      ]
  elif CONFIG['MOZ_WIDGET_GTK']:
-     CPP_SOURCES += [
-+        'nsUnixShellService.cpp',
+     SOURCES += [
          'nsGNOMEShellService.cpp',
-+	'nsKDEShellService.cpp'
++        'nsKDEShellService.cpp',
++        'nsUnixShellService.cpp'
      ]
  
- if CPP_SOURCES:
+ if SOURCES:
      LIBRARY_NAME = 'shellservice_s'
  
  EXTRA_COMPONENTS += [
@@ -1747,7 +1772,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
-@@ -593,19 +593,21 @@
+@@ -613,19 +613,21 @@
  @BINPATH@/defaults/autoconfig/prefcalls.js
  @BINPATH@/browser/defaults/profile/prefs.js
  
diff --git a/firefox.spec b/firefox.spec
index 8688174..5765b53 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 26.0
+%define major 27.0
 %define ff_epoch 0
 # (tpg) set version HERE !!!
 %define realver %{major}
@@ -55,8 +55,8 @@ Patch8:		firefox-25.0-disable-check-default-browser.patch
 Patch9:         firefox-5.0-asciidel.patch
 Patch10:	firefox-3.5.3-default-mail-handler.patch
 # Patches for kde integration of FF 
-Patch11:	firefox-26-kde.patch
-Patch12:	mozilla-26-kde.patch
+Patch11:	firefox-27-kde.patch
+Patch12:	mozilla-27-kde.patch
 Patch34:	xulrunner_nojit.patch
 
 # Upstream patches
diff --git a/mozilla-26-kde.patch b/mozilla-27-kde.patch
similarity index 98%
rename from mozilla-26-kde.patch
rename to mozilla-27-kde.patch
index 07af3b8..1d54c46 100644
--- a/mozilla-26-kde.patch
+++ b/mozilla-27-kde.patch
@@ -7,7 +7,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
 --- a/modules/libpref/src/Makefile.in
 +++ b/modules/libpref/src/Makefile.in
-@@ -35,14 +35,15 @@ endif
+@@ -33,14 +33,15 @@ endif
  # Optimizer bug with GCC 3.2.2 on OS/2
  ifeq ($(OS_ARCH), OS2)
  nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
@@ -26,7 +26,7 @@ diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
 diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp
 --- a/modules/libpref/src/Preferences.cpp
 +++ b/modules/libpref/src/Preferences.cpp
-@@ -26,16 +26,17 @@
+@@ -27,16 +27,17 @@
  #include "nsIZipReader.h"
  #include "nsPrefBranch.h"
  #include "nsXPIDLString.h"
@@ -44,7 +44,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  #include "prefread.h"
  #include "prefapi_private_data.h"
  
-@@ -1098,16 +1099,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -1100,16 +1101,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
  {
@@ -79,7 +79,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
      return NS_OK;
  
    bool hasMore;
-@@ -1123,17 +1142,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1125,17 +1144,17 @@ static nsresult pref_LoadPrefsInDirList(
  
      nsAutoCString leaf;
      path->GetNativeLeafName(leaf);
@@ -98,7 +98,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  {
    nsZipItemPtr<char> manifest(jarReader, name, true);
    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1227,28 +1246,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1229,28 +1248,40 @@ static nsresult pref_InitInitialObjects(
    /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
    static const char* specialFiles[] = {
  #if defined(XP_MACOSX)
@@ -2137,7 +2137,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
  nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
  {
    // dbus prevents us from being threadsafe, but this routine should not block anyhow
-@@ -498,16 +501,19 @@ nsUnixSystemProxySettings::GetProxyFromG
+@@ -504,16 +507,19 @@ nsUnixSystemProxySettings::GetProxyFromG
  
  nsresult
  nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
@@ -2157,7 +2157,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
    if (mGConf)
      return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
  
-@@ -533,8 +539,34 @@ static const mozilla::Module::ContractID
+@@ -539,8 +545,34 @@ static const mozilla::Module::ContractID
  
  static const mozilla::Module kUnixProxyModule = {
    mozilla::Module::kVersion,
@@ -2195,27 +2195,28 @@ 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
-@@ -44,18 +44,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+@@ -43,18 +43,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
          'nsNativeAppSupportQt.cpp',
          'nsQAppInstance.cpp',
      ]
  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
-     CPP_SOURCES += [
+     SOURCES += [
          'nsNativeAppSupportOS2.cpp',
      ]
  elif CONFIG['MOZ_ENABLE_GTK']:
 +    EXPORTS += ['nsKDEUtils.h']
-     CPP_SOURCES += [
-         'nsNativeAppSupportUnix.cpp',
-+	'nsKDEUtils.cpp'
+     SOURCES += [
+-        'nsNativeAppSupportUnix.cpp',
++        'nsKDEUtils.cpp',
++        'nsNativeAppSupportUnix.cpp'
      ]
  else:
-     CPP_SOURCES += [
+     SOURCES += [
          'nsNativeAppSupportDefault.cpp',
      ]
  
  if CONFIG['MOZ_X11']:
-     CPP_SOURCES += [
+     SOURCES += [
 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
 new file mode 100644
 --- /dev/null
@@ -2616,12 +2617,12 @@ new file mode 100644
 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 --- a/uriloader/exthandler/Makefile.in
 +++ b/uriloader/exthandler/Makefile.in
-@@ -45,9 +45,10 @@ ifdef MOZ_ENABLE_DBUS
+@@ -44,9 +44,10 @@ endif
+ ifdef MOZ_ENABLE_DBUS
  LOCAL_INCLUDES   += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
  endif
  
  include $(topsrcdir)/config/rules.mk
- include $(topsrcdir)/ipc/chromium/chromium-config.mk
  
  ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT)))
  CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
@@ -2630,25 +2631,26 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -73,16 +73,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
+@@ -73,17 +73,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
      ]
  else:
-     CPP_SOURCES += [
-         'nsOSHelperAppService.cpp',
+     SOURCES += [
+         osdir + '/nsOSHelperAppService.cpp',
      ]
  
  if CONFIG['MOZ_ENABLE_GTK']:
-     CPP_SOURCES += [
-+        'nsCommonRegistry.cpp',
-+	'nsKDERegistry.cpp',
-         'nsGNOMERegistry.cpp',
-         'nsMIMEInfoUnix.cpp',
+     SOURCES += [
++        'unix/nsCommonRegistry.cpp',
+         'unix/nsGNOMERegistry.cpp',
++        'unix/nsKDERegistry.cpp',
+         'unix/nsMIMEInfoUnix.cpp',
      ]
  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-     CPP_SOURCES += [
-         'nsMIMEInfoAndroid.cpp',
-         'nsAndroidHandlerApp.cpp',
-         'nsExternalSharingAppService.cpp',
+     SOURCES += [
+         'android/nsAndroidHandlerApp.cpp',
+         'android/nsExternalSharingAppService.cpp',
+         'android/nsExternalURLHandlerService.cpp',
+         'android/nsMIMEInfoAndroid.cpp',
 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
 new file mode 100644
 --- /dev/null
@@ -3069,10 +3071,10 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  #endif
  
    // Now look up our extensions
-diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
---- a/widget/gtk2/Makefile.in
-+++ b/widget/gtk2/Makefile.in
-@@ -38,11 +38,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
+diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in
+--- a/widget/gtk/Makefile.in
++++ b/widget/gtk/Makefile.in
+@@ -26,11 +26,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
  
  INCLUDES	+= \
  		-I$(srcdir)/../xpwidgets \
@@ -3087,9 +3089,9 @@ diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
  ifdef MOZ_X11
  INCLUDES   	+= -I$(srcdir)/../shared/x11
  endif
-diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
---- a/widget/gtk2/nsFilePicker.cpp
-+++ b/widget/gtk2/nsFilePicker.cpp
+diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
+--- a/widget/gtk/nsFilePicker.cpp
++++ b/widget/gtk/nsFilePicker.cpp
 @@ -1,32 +1,34 @@
  /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
  /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -3125,7 +3127,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
  nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
  
  void
-@@ -225,17 +227,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -226,17 +228,19 @@ nsFilePicker::AppendFilters(int32_t aFil
    return nsBaseFilePicker::AppendFilters(aFilterMask);
  }
  
@@ -3146,7 +3148,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -349,16 +353,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -350,16 +354,32 @@ nsFilePicker::Show(int16_t *aReturn)
  
  NS_IMETHODIMP
  nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3179,7 +3181,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
  
    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
    const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -537,8 +557,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -538,8 +558,235 @@ nsFilePicker::Done(GtkWidget* file_choos
    if (mCallback) {
      mCallback->Done(result);
      mCallback = nullptr;
@@ -3415,9 +3417,9 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
 +    return NS_OK;
 +    }
 +
-diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
---- a/widget/gtk2/nsFilePicker.h
-+++ b/widget/gtk2/nsFilePicker.h
+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:
    nsString  mDefault;
    nsString  mDefaultExtension;
@@ -3547,7 +3549,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
      bool contentAccessible = false;
 +    TriState stDesktop = eUnspecified;
  
-     while (NULL != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) {
+     while (nullptr != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) {
        ToLowerCase(token);
        NS_ConvertASCIItoUTF16 wtoken(token);
  
@@ -3584,8 +3586,8 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
 --- a/xpcom/io/Makefile.in
 +++ b/xpcom/io/Makefile.in
-@@ -7,9 +7,9 @@ include $(topsrcdir)/config/rules.mk
- include $(topsrcdir)/ipc/chromium/chromium-config.mk
+@@ -6,9 +6,9 @@ MOZILLA_INTERNAL_API = 1
+ include $(topsrcdir)/config/rules.mk
  
  ifeq ($(OS_ARCH),Linux)
  ifneq (,$(findstring lib64,$(libdir)))
@@ -3598,11 +3600,11 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -42,16 +42,17 @@
- #include "prproces.h"
+@@ -43,16 +43,17 @@
  #include "nsIDirectoryEnumerator.h"
  #include "nsISimpleEnumerator.h"
  #include "private/pprio.h"
+ #include "prlink.h"
  
  #ifdef MOZ_WIDGET_GTK
  #include "nsIGIOService.h"
@@ -3616,7 +3618,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1727,44 +1728,51 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1728,44 +1729,51 @@ nsLocalFile::SetPersistentDescriptor(con
      return InitWithNativePath(aPersistentDescriptor);
  #endif
  }
@@ -3682,7 +3684,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
        return rv;
      }
      return NS_ERROR_FAILURE;
-@@ -1772,16 +1780,23 @@ nsLocalFile::Reveal()
+@@ -1773,16 +1781,23 @@ nsLocalFile::Reveal()
      return NS_ERROR_FAILURE;
  #endif
  }