From 4a07a296988c9065d3572052f782907ac8679c21 Mon Sep 17 00:00:00 2001
From: Tigro <ashejn@gmail.com>
Date: Tue, 20 Jan 2015 08:52:20 +0300
Subject: [PATCH] update kde patches

---
 firefox-34-kde.patch => firefox-35-kde.patch | 95 +++++++++++++++-----
 firefox.spec                                 |  4 +-
 mozilla-34-kde.patch => mozilla-35-kde.patch | 70 +++++++--------
 3 files changed, 110 insertions(+), 59 deletions(-)
 rename firefox-34-kde.patch => firefox-35-kde.patch (96%)
 rename mozilla-34-kde.patch => mozilla-35-kde.patch (98%)

diff --git a/firefox-34-kde.patch b/firefox-35-kde.patch
similarity index 96%
rename from firefox-34-kde.patch
rename to firefox-35-kde.patch
index 3aaaaa2..931e37b 100644
--- a/firefox-34-kde.patch
+++ b/firefox-35-kde.patch
@@ -1,8 +1,11 @@
+# HG changeset patch
+# Parent  6697591ddc0a1b18171c31a7bf18d99be9825aab
+
 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,1224 @@
+@@ -0,0 +1,1272 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -145,6 +148,9 @@ new file mode 100644
 +    <!-- for search and content formfill/pw manager -->
 +    <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
 +
++    <!-- for search with one-off buttons -->
++    <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/>
++
 +    <!-- for url bar autocomplete -->
 +    <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
 +
@@ -242,6 +248,48 @@ 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">One-Click Searches</label>
++      <description class="SearchHighlightText" flex="1">Search any of these sites instantly, without changing your default.</description>
++      <hbox class="SearchHighlightFooter" align="center">
++        <spacer class="dot filled"/>
++        <spacer class="dot"/>
++        <spacer flex="1"/>
++        <button label="Next"/>
++      </hbox>
++    </panel>
++    <panel id="SearchHighlight2"
++           class="SearchHighlight"
++           type="arrow"
++           hidden="true"
++           noautofocus="true"
++           noautohide="true"
++           orient="vertical"
++           align="stretch">
++      <label class="SearchHighlightTitle">Smart Suggestions</label>
++      <description class="SearchHighlightText" flex="1">Suggestions from your default search engine appear as you type.</description>
++      <hbox class="SearchHighlightFooter" align="center">
++        <spacer class="dot"/>
++        <spacer class="dot filled"/>
++        <spacer flex="1"/>
++        <button label="Thanks!"/>
++      </hbox>
++    </panel>
++
++    <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true">
++      <hbox id="abouthome-search-panel-manage"
++            onclick="openPreferences('paneSearch')">
++        <label>&cmd_engineManager.label;</label>
++      </hbox>
++    </panel>
 +
 +    <panel id="social-share-panel"
 +           class="social-panel"
@@ -251,7 +299,11 @@ new file mode 100644
 +           onpopuphidden="SocialShare.onHidden()"
 +           hidden="true">
 +      <vbox class="social-share-toolbar">
-+        <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"/>
++        <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1">
++          <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio"
++                         group="share-providers" tooltiptext="&findShareServices.label;"
++                         oncommand="SocialShare.showDirectory()"/>
++        </arrowscrollbox>
 +      </vbox>
 +    </panel>
 +
@@ -501,6 +553,11 @@ new file mode 100644
 +#endif
 +    </tooltip>
 +
++    <tooltip id="share-button-tooltip" onpopupshowing="SocialShare.createTooltip(event);">
++      <label class="tooltip-label"/>
++      <label class="tooltip-label"/>
++    </tooltip>
++
 +#include popup-notifications.inc
 +
 +#include ../../components/customizableui/content/panelUI.inc.xul
@@ -674,7 +731,11 @@ new file mode 100644
 +             aria-label="&navbarCmd.label;"
 +             fullscreentoolbar="true" mode="icons" customizable="true"
 +             iconsize="small"
-+             defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item"
++#ifdef MOZ_DEV_EDITION
++             defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button"
++#else
++             defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button"
++#endif
 +             customizationtarget="nav-bar-customization-target"
 +             overflowable="true"
 +             overflowbutton="nav-bar-overflow-button"
@@ -728,7 +789,6 @@ new file mode 100644
 +                <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="bad-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="bad-content-unblocked-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
@@ -761,7 +821,7 @@ new file mode 100644
 +                </hbox>
 +              </box>
 +              <box id="urlbar-display-box" align="center">
-+                <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
++                <label class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/>
 +              </box>
 +              <hbox id="urlbar-icons">
 +                <image id="page-report-button"
@@ -922,15 +982,6 @@ new file mode 100644
 +                       onclick="BrowserGoHome(event);"
 +                       cui-areatype="toolbar"
 +                       aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
-+
-+        <toolbarbutton id="social-share-button"
-+                       class="toolbarbutton-1 chromeclass-toolbar-additional"
-+                       label="&sharePageCmd.label;"
-+                       tooltiptext="&sharePageCmd.label;"
-+                       cui-areatype="toolbar"
-+                       removable="true"
-+                       hidden="true"
-+                       command="Social:SharePage"/>
 +      </hbox>
 +
 +      <toolbarbutton id="nav-bar-overflow-button"
@@ -1075,7 +1126,7 @@ new file mode 100644
 +    </toolbarpalette>
 +  </toolbox>
 +
-+  <hbox id="fullscr-toggler" collapsed="true"/>
++  <hbox id="fullscr-toggler" hidden="true"/>
 +
 +  <deck id="content-deck" flex="1">
 +    <hbox flex="1" id="browser">
@@ -1230,7 +1281,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
-@@ -171,17 +171,17 @@
+@@ -174,17 +174,17 @@
                      class="editBookmarkPanelHeaderButton"
                      oncommand="StarUI.removeBookmarkButtonCommand();"
                      accesskey="&editBookmark.removeBookmark.accessKey;"/>
@@ -1249,7 +1300,7 @@ diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
          <button id="editBookmarkPanelDeleteButton"
                  class="editBookmarkPanelBottomButton"
                  label="&editBookmark.cancel.label;"
-@@ -1150,17 +1150,17 @@
+@@ -1198,17 +1198,17 @@
  
    <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
      <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@@ -1271,10 +1322,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
-@@ -70,16 +70,18 @@ browser.jar:
-         content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
+@@ -69,16 +69,18 @@ browser.jar:
          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
          content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
+         content/browser/aboutProviderDirectory.xhtml  (content/aboutProviderDirectory.xhtml)
          content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
          content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
  *       content/browser/browser.css                   (content/browser.css)
@@ -1376,7 +1427,7 @@ diff --git a/browser/components/preferences/main.js b/browser/components/prefere
      // 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.
-@@ -497,16 +503,27 @@ var gMainPane = {
+@@ -572,16 +578,27 @@ var gMainPane = {
     */
    setDefaultBrowser: function()
    {
@@ -1393,7 +1444,7 @@ diff --git a/browser/components/preferences/main.js b/browser/components/prefere
 +                                .createInstance(Components.interfaces.nsIProcess);
 +        process.init(shellObj);
 +        var args = ["--file", "kdeglobals", "--group", "General", "--key",
-+            "BrowserApplication", "MozillaFirefox"];
++            "BrowserApplication", "firefox"];
 +        process.run(false, args, args.length);
 +      }
      } catch (ex) {
@@ -1844,7 +1895,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
-@@ -685,19 +685,21 @@
+@@ -698,19 +698,21 @@
  @BINPATH@/defaults/autoconfig/prefcalls.js
  @BINPATH@/browser/defaults/profile/prefs.js
  
diff --git a/firefox.spec b/firefox.spec
index 1725ce8..ed23269 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -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-34-kde.patch
-Patch12:	mozilla-34-kde.patch
+Patch11:	firefox-35-kde.patch
+Patch12:	mozilla-35-kde.patch
 #Patch13:	mozilla-kde-background.patch
 Patch34:	xulrunner_nojit.patch
 
diff --git a/mozilla-34-kde.patch b/mozilla-35-kde.patch
similarity index 98%
rename from mozilla-34-kde.patch
rename to mozilla-35-kde.patch
index c400cb3..7d6db7a 100644
--- a/mozilla-34-kde.patch
+++ b/mozilla-35-kde.patch
@@ -44,7 +44,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
  #include "prefread.h"
  #include "prefapi_private_data.h"
  
-@@ -1167,16 +1168,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -1172,16 +1173,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
  {
@@ -79,7 +79,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
      return NS_OK;
  
    bool hasMore;
-@@ -1192,17 +1211,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1197,17 +1216,17 @@ static nsresult pref_LoadPrefsInDirList(
  
      nsAutoCString leaf;
      path->GetNativeLeafName(leaf);
@@ -98,7 +98,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
  {
    nsZipItemPtr<char> manifest(jarReader, name, true);
    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1296,26 +1315,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1301,26 +1320,38 @@ 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)
@@ -140,8 +140,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
 --- a/python/mozbuild/mozpack/chrome/flags.py
 +++ b/python/mozbuild/mozpack/chrome/flags.py
-@@ -208,16 +208,17 @@ class Flags(OrderedDict):
-         'platformversion': VersionFlag,
+@@ -209,16 +209,17 @@ class Flags(OrderedDict):
          'contentaccessible': Flag,
          'os': StringFlag,
          'osversion': VersionFlag,
@@ -149,7 +148,8 @@ diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/c
          'platform': Flag,
          'xpcnativewrappers': Flag,
          'tablet': Flag,
-+	'desktop': StringFlag,
+         'process': StringFlag,
++        'desktop': StringFlag,
      }
      RE = re.compile(r'([!<>=]+)')
  
@@ -161,8 +161,7 @@ diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/c
 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py
 --- a/python/mozbuild/mozpack/chrome/manifest.py
 +++ b/python/mozbuild/mozpack/chrome/manifest.py
-@@ -30,16 +30,17 @@ class ManifestEntry(object):
-     allowed_flags = [
+@@ -31,16 +31,17 @@ class ManifestEntry(object):
          'application',
          'platformversion',
          'os',
@@ -170,7 +169,8 @@ diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpac
          'abi',
          'xpcnativewrappers',
          'tablet',
-+	'desktop',
+         'process',
++        'desktop',
      ]
  
      def __init__(self, base, *flags):
@@ -202,7 +202,7 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloa
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -43,16 +43,20 @@
+@@ -44,16 +44,20 @@
  #ifdef XP_WIN
  #include <shlobj.h>
  #include "nsWindowsHelpers.h"
@@ -223,7 +223,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
  #include "AndroidBridge.h"
  using namespace mozilla::widget::android;
  #endif
-@@ -2711,16 +2715,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2712,16 +2716,25 @@ nsDownload::SetState(DownloadState aStat
        nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
  
        // Master pref to control this function.
@@ -249,7 +249,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
          int64_t goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2751,16 +2764,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2752,16 +2765,17 @@ nsDownload::SetState(DownloadState aStat
                    NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
                    message, !removeWhenDone,
                    mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
@@ -2630,9 +2630,9 @@ new file mode 100644
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -75,17 +75,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
+@@ -68,17 +68,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
  else:
-     # These files can't be built in unified mode because they force NSPR logging.
+     # These files can't be built in unified mode because they redefine LOG.
      SOURCES += [
          osdir + '/nsOSHelperAppService.cpp',
      ]
@@ -2650,7 +2650,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
          'android/nsExternalSharingAppService.cpp',
          'android/nsExternalURLHandlerService.cpp',
          'android/nsMIMEInfoAndroid.cpp',
-@@ -129,16 +131,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -121,16 +123,17 @@ include('/ipc/chromium/chromium-config.m
  FINAL_LIBRARY = 'xul'
  
  LOCAL_INCLUDES += [
@@ -3104,7 +3104,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -88,16 +88,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -81,16 +81,17 @@ include('/ipc/chromium/chromium-config.m
  FINAL_LIBRARY = 'xul'
  
  LOCAL_INCLUDES += [
@@ -3160,7 +3160,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
  
  void
-@@ -226,17 +228,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -224,17 +226,19 @@ nsFilePicker::AppendFilters(int32_t aFil
    return nsBaseFilePicker::AppendFilters(aFilterMask);
  }
  
@@ -3181,7 +3181,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -351,16 +355,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -349,16 +353,32 @@ nsFilePicker::Show(int16_t *aReturn)
  
  NS_IMETHODIMP
  nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3214,7 +3214,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  
    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
    const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -539,8 +559,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -537,8 +557,235 @@ nsFilePicker::Done(GtkWidget* file_choos
    if (mCallback) {
      mCallback->Done(result);
      mCallback = nullptr;
@@ -3502,15 +3502,15 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
    NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
    NS_NAMED_LITERAL_STRING(kABI, "abi");
 +  NS_NAMED_LITERAL_STRING(kDesktop, "desktop");
+   NS_NAMED_LITERAL_STRING(kProcess, "process");
  #if defined(MOZ_WIDGET_ANDROID)
    NS_NAMED_LITERAL_STRING(kTablet, "tablet");
  #endif
  
-   // Obsolete
-   NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers");
+   NS_NAMED_LITERAL_STRING(kMain, "main");
+   NS_NAMED_LITERAL_STRING(kContent, "content");
  
-   nsAutoString appID;
-@@ -543,44 +545,49 @@ ParseManifest(NSLocationType aType, File
+@@ -548,44 +550,49 @@ ParseManifest(NSLocationType aType, File
          CopyUTF8toUTF16(s, abi);
          abi.Insert(char16_t('_'), 0);
          abi.Insert(osTarget, 0);
@@ -3554,16 +3554,16 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
 +  desktop = NS_LITERAL_STRING("android");
  #endif
  
-   // Because contracts must be registered after CIDs, we save and process them
-   // at the end.
-   nsTArray<CachedDirective> contracts;
+   if (XRE_GetProcessType() == GeckoProcessType_Content) {
+     process = kContent;
+   } else {
+     process = kMain;
+   }
  
-   char* token;
-   char* newline = aBuf;
-@@ -669,25 +676,27 @@ ParseManifest(NSLocationType aType, File
-     TriState stOsVersion = eUnspecified;
+@@ -681,25 +688,27 @@ ParseManifest(NSLocationType aType, File
      TriState stOs = eUnspecified;
      TriState stABI = eUnspecified;
+     TriState stProcess = eUnspecified;
  #if defined(MOZ_WIDGET_ANDROID)
      TriState stTablet = eUnspecified;
  #endif
@@ -3580,6 +3580,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
            CheckStringFlag(kOs, wtoken, osTarget, stOs) ||
            CheckStringFlag(kABI, wtoken, abi, stABI) ||
 +          CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||
+           CheckStringFlag(kProcess, wtoken, process, stProcess) ||
            CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
            CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
            CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) {
@@ -3587,8 +3588,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
        }
  
  #if defined(MOZ_WIDGET_ANDROID)
-       bool tablet = false;
-@@ -718,16 +727,17 @@ ParseManifest(NSLocationType aType, File
+@@ -731,16 +740,17 @@ ParseManifest(NSLocationType aType, File
      }
  
      if (!ok ||
@@ -3601,15 +3601,15 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  #ifdef MOZ_WIDGET_ANDROID
          stTablet == eBad ||
  #endif
-         stABI == eBad) {
+         stABI == eBad ||
+         stProcess == eBad) {
        continue;
      }
  
- #ifdef MOZ_B2G_LOADER
 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 --- a/xpcom/components/moz.build
 +++ b/xpcom/components/moz.build
-@@ -47,12 +47,13 @@ FINAL_LIBRARY = 'xul'
+@@ -48,12 +48,13 @@ FINAL_LIBRARY = 'xul'
  GENERATED_INCLUDES += ['..']
  LOCAL_INCLUDES += [
      '../base',