# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1518337530 -3600
# Node ID 51bfdd19b9e92a9811d2d87110ee399b708763fd
# Parent  8220ea23b47d48a8c4c6e9899cd09af19d38a096
rebased everything to apply cleanly

diff -r 8220ea23b47d -r 51bfdd19b9e9 firefox-kde.patch
--- a/firefox-kde.patch	Fri Feb 09 16:30:49 2018 +0100
+++ b/firefox-kde.patch	Sun Feb 11 09:25:30 2018 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  89cbe8c49d05965b87815143d1944ab6964f12c7
+# Parent  2bfd3982be72061c3f5879a5fbceb4c33f96a0cd
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
@@ -1257,7 +1257,7 @@
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -52,16 +52,18 @@ browser.jar:
+@@ -45,16 +45,18 @@ browser.jar:
          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
          content/browser/aboutTabCrashed.css           (content/aboutTabCrashed.css)
@@ -1339,7 +1339,7 @@
 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
 --- a/browser/components/preferences/in-content/main.js
 +++ b/browser/components/preferences/in-content/main.js
-@@ -193,16 +193,23 @@ var gMainPane = {
+@@ -330,16 +330,23 @@ var gMainPane = {
            this._backoffIndex++ : backoffTimes.length - 1]);
        };
  
@@ -1363,7 +1363,7 @@
      performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
  
      this.updateDefaultPerformanceSettingsPref();
-@@ -898,16 +905,27 @@ var gMainPane = {
+@@ -1035,16 +1042,27 @@ var gMainPane = {
        // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
        this._backoffIndex = 0;
  
@@ -1707,7 +1707,7 @@
 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
-@@ -657,16 +657,18 @@
+@@ -649,16 +649,18 @@
  @RESPATH@/browser/defaults/blocklists
  @RESPATH@/browser/defaults/pinning
  
diff -r 8220ea23b47d -r 51bfdd19b9e9 mozilla-aarch64-startup-crash.patch
--- a/mozilla-aarch64-startup-crash.patch	Fri Feb 09 16:30:49 2018 +0100
+++ b/mozilla-aarch64-startup-crash.patch	Sun Feb 11 09:25:30 2018 +0100
@@ -1,12 +1,12 @@
 # HG changeset patch
 # Parent a5cfa3aa11a9d3391df49de6fc5a0e5232c12c10
-# Parent  6906d2adcc834114de3118365cb75b113df8564e
+# Parent  3005da37da3f1e2c568b1675307d10860182d214
 Bug 991344 - Rpi3: Firefox crashes after a few seconds of usage
 
 diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
 --- a/netwerk/base/nsIOService.cpp
 +++ b/netwerk/base/nsIOService.cpp
-@@ -892,17 +892,23 @@ nsIOService::NewChannelFromURIWithProxyF
+@@ -887,17 +887,23 @@ nsIOService::NewChannelFromURIWithProxyF
                      "doesn't support nsIUploadChannel2. An extension has "
                      "supplied a non-functional http protocol handler. This will "
                      "break behavior and in future releases not work at all.");
diff -r 8220ea23b47d -r 51bfdd19b9e9 mozilla-kde.patch
--- a/mozilla-kde.patch	Fri Feb 09 16:30:49 2018 +0100
+++ b/mozilla-kde.patch	Sun Feb 11 09:25:30 2018 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  0a40cd14044b87117b99763e7a155b6deb5ab180
+# Parent  97234138e3aafe66fc7f17c8f530e7c534af2fc2
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -1262,7 +1262,7 @@
 +#ifndef nsKDEUtils_h__
 +#define nsKDEUtils_h__
 +
-+#include "nsStringGlue.h"
++#include "nsString.h"
 +#include "nsTArray.h"
 +#include <stdio.h>
 +
diff -r 8220ea23b47d -r 51bfdd19b9e9 mozilla-no-stdcxx-check.patch
--- a/mozilla-no-stdcxx-check.patch	Fri Feb 09 16:30:49 2018 +0100
+++ b/mozilla-no-stdcxx-check.patch	Sun Feb 11 09:25:30 2018 +0100
@@ -1,11 +1,11 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent  8f6d1846ca837387965573161577b1c5a483bcda
+# Parent  f62746698c37af9593338fe75fbff6b319cd370c
 
 diff --git a/config/config.mk b/config/config.mk
 --- a/config/config.mk
 +++ b/config/config.mk
-@@ -579,17 +579,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+@@ -471,17 +471,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android)
  # of the linker command line), if libmozglue.so ends up after libc.so, all
  # hell breaks loose, so better safe than sorry, and check it's actually the
  # case.
diff -r 8220ea23b47d -r 51bfdd19b9e9 mozilla-ntlm-full-path.patch
--- a/mozilla-ntlm-full-path.patch	Fri Feb 09 16:30:49 2018 +0100
+++ b/mozilla-ntlm-full-path.patch	Sun Feb 11 09:25:30 2018 +0100
@@ -1,13 +1,13 @@
 # HG changeset patch
 # User Petr Cerny <pcerny@novell.com>
 # Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6
-# Parent  6a285f641aa53b55ec6480a8a7945a179e5c1506
+# Parent  46dd9332e67440fb779e99a694a2bf0edf5c203e
 Bug 634334 - call to the ntlm_auth helper fails
 
 diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp
 --- a/extensions/auth/nsAuthSambaNTLM.cpp
 +++ b/extensions/auth/nsAuthSambaNTLM.cpp
-@@ -169,17 +169,17 @@ static uint8_t* ExtractMessage(const nsA
+@@ -170,17 +170,17 @@ static uint8_t* ExtractMessage(const nsA
  nsresult
  nsAuthSambaNTLM::SpawnNTLMAuthHelper()
  {