From 5894d6fffd275b6c777012e25e6cedef384924b0dcca7a206e90bf1cc5469119 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Sun, 2 Apr 2017 21:22:13 +0000
Subject: [PATCH] Accepting request 483796 from
 home:AndreasStieger:branches:mozilla:Factory

- fix build on Leap and Tumbleweed
- take tarball from release tag
- adjust mozilla-kde.patch to match

OBS-URL: https://build.opensuse.org/request/show/483796
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=360
---
 MozillaThunderbird.changes     |   7 +
 MozillaThunderbird.spec        |   4 +
 compare-locales.tar.xz         |   4 +-
 create-tar.sh                  |   2 +-
 l10n-52.0.tar.xz               |   4 +-
 mozilla-kde.patch              | 764 +++++++--------------------------
 thunderbird-52.0-source.tar.xz |   4 +-
 7 files changed, 180 insertions(+), 609 deletions(-)

diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes
index 6533bab..e17d41e 100644
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar 30 11:24:00 UTC 2017 - astieger@suse.com
+
+- fix build on Leap and Tumbleweed
+- take tarball from release tag
+- adjust mozilla-kde.patch to match
+
 -------------------------------------------------------------------
 Wed Mar 22 13:17:06 UTC 2017 - wr@rosenauer.org
 
diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec
index eab0f82..eb3c818 100644
--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@@ -472,6 +472,10 @@ exit 0
 %{progdir}/plugin-container
 %{progdir}/run-mozilla.sh
 %{progdir}/thunderbird-bin
+%if 0%{?mozilla_use_gtk3}
+%dir %{progdir}/gtk2
+%{progdir}/gtk2/libmozgtk.so
+%endif
 # crashreporter files
 %if %crashreporter
 %{progdir}/crashreporter
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index a9f0b60..e80e0ed 100644
--- a/compare-locales.tar.xz
+++ b/compare-locales.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a718cfbfdaa7e349b75114652dbb257ac02b8835f11b74ac62f8c77b70758286
-size 28376
+oid sha256:f8fe1abdae815902971d01f60f2956eaef73fb256a0f6c4053326d81c58b84cc
+size 28476
diff --git a/create-tar.sh b/create-tar.sh
index de92716..c365f7c 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -2,7 +2,7 @@
 
 CHANNEL="esr52"
 BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="be61b0b74793df0a2ae8c940516bcab4beef60da"
+RELEASE_TAG="37a1e30b18a24b27e75145fd19c8ffe566e384b1"
 VERSION="52.0"
 
 echo "cloning $BRANCH..."
diff --git a/l10n-52.0.tar.xz b/l10n-52.0.tar.xz
index 8ae3995..8de9294 100644
--- a/l10n-52.0.tar.xz
+++ b/l10n-52.0.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa36492aeb63ccb85a3e9bae3e1d1b5489d0c7c9f6f36de32610b97f7bb37252
-size 26087576
+oid sha256:66a15207433836281eba61817417db9f6ef5ea4ee39009db2d37790c5e1deb0b
+size 26027828
diff --git a/mozilla-kde.patch b/mozilla-kde.patch
index 2f50f68..8c83852 100644
--- a/mozilla-kde.patch
+++ b/mozilla-kde.patch
@@ -6,15 +6,11 @@ Author: Lubos Lunak <lunak@suse.com>
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
      https://bugzilla.novell.com/show_bug.cgi?id=170055
 
-diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
---- a/modules/libpref/Preferences.cpp
-+++ b/modules/libpref/Preferences.cpp
-@@ -31,16 +31,17 @@
- #include "nsIZipReader.h"
- #include "nsPrefBranch.h"
- #include "nsXPIDLString.h"
- #include "nsCRT.h"
- #include "nsCOMArray.h"
+Index: mozilla/modules/libpref/Preferences.cpp
+===================================================================
+--- mozilla.orig/modules/libpref/Preferences.cpp	2017-03-30 10:04:31.348433261 +0200
++++ mozilla/modules/libpref/Preferences.cpp	2017-03-30 10:04:37.624487962 +0200
+@@ -36,6 +36,7 @@
  #include "nsXPCOMCID.h"
  #include "nsAutoPtr.h"
  #include "nsPrintfCString.h"
@@ -22,17 +18,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
  
  #include "nsQuickSort.h"
  #include "PLDHashTable.h"
- 
- #include "prefapi.h"
- #include "prefread.h"
- #include "prefapi_private_data.h"
- 
-@@ -1174,16 +1175,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
- 
- static nsresult pref_LoadPrefsInDirList(const char *listId)
- {
-   nsresult rv;
-   nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
+@@ -1179,6 +1180,24 @@ static nsresult pref_LoadPrefsInDirList(
    if (NS_FAILED(rv))
      return rv;
  
@@ -57,17 +43,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
    nsCOMPtr<nsISimpleEnumerator> list;
    dirSvc->Get(listId,
                NS_GET_IID(nsISimpleEnumerator),
-               getter_AddRefs(list));
-   if (!list)
-     return NS_OK;
- 
-   bool hasMore;
-@@ -1199,17 +1218,17 @@ static nsresult pref_LoadPrefsInDirList(
- 
-     nsAutoCString leaf;
-     path->GetNativeLeafName(leaf);
- 
-     // Do we care if a file provided by this process fails to load?
+@@ -1204,7 +1223,7 @@ static nsresult pref_LoadPrefsInDirList(
      if (Substring(leaf, leaf.Length() - 4).EqualsLiteral(".xpi"))
        ReadExtensionPrefs(path);
      else
@@ -76,17 +52,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
    }
    return NS_OK;
  }
- 
- static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
- {
-   nsZipItemPtr<char> manifest(jarReader, name, true);
-   NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1303,24 +1322,36 @@ 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)
-     "macprefs.js"
- #elif defined(XP_WIN)
+@@ -1308,6 +1327,7 @@ static nsresult pref_InitInitialObjects(
      "winpref.js"
  #elif defined(XP_UNIX)
      "unix.js"
@@ -94,8 +60,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
  #if defined(_AIX)
      , "aix.js"
  #endif
- #elif defined(XP_BEOS)
-     "beos.js"
+@@ -1316,6 +1336,17 @@ static nsresult pref_InitInitialObjects(
  #endif
    };
  
@@ -113,20 +78,11 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
    rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, ArrayLength(specialFiles));
    if (NS_FAILED(rv))
      NS_WARNING("Error parsing application default preferences.");
- 
-   // Load jar:$app/omni.jar!/defaults/preferences/*.js
-   // or jar:$gre/omni.jar!/defaults/preferences/*.js.
-   RefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
-   // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which
-diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
---- a/modules/libpref/moz.build
-+++ b/modules/libpref/moz.build
-@@ -31,16 +31,20 @@ UNIFIED_SOURCES += [
-     'prefread.cpp',
- ]
- 
- # prefapi.cpp cannot be built in unified mode because it uses plarena.h
- SOURCES += [
+Index: mozilla/modules/libpref/moz.build
+===================================================================
+--- mozilla.orig/modules/libpref/moz.build	2017-03-30 10:04:31.348433261 +0200
++++ mozilla/modules/libpref/moz.build	2017-03-30 10:04:37.624487962 +0200
+@@ -36,6 +36,10 @@ SOURCES += [
      'prefapi.cpp',
  ]
  
@@ -137,20 +93,11 @@ diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
  include('/ipc/chromium/chromium-config.mozbuild')
  
  FINAL_LIBRARY = 'xul'
- 
- DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
- DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
- 
- FINAL_TARGET_PP_FILES += [
-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
-@@ -211,16 +211,17 @@ class Flags(OrderedDict):
-         'contentaccessible': Flag,
-         'os': StringFlag,
-         'osversion': VersionFlag,
-         'abi': StringFlag,
-         'platform': Flag,
+Index: mozilla/python/mozbuild/mozpack/chrome/flags.py
+===================================================================
+--- mozilla.orig/python/mozbuild/mozpack/chrome/flags.py	2017-03-30 10:04:31.348433261 +0200
++++ mozilla/python/mozbuild/mozpack/chrome/flags.py	2017-03-30 10:04:37.628487997 +0200
+@@ -216,6 +216,7 @@ class Flags(OrderedDict):
          'xpcnativewrappers': Flag,
          'tablet': Flag,
          'process': StringFlag,
@@ -158,20 +105,11 @@ diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/c
      }
      RE = re.compile(r'([!<>=]+)')
  
-     def __init__(self, *flags):
-         '''
-         Initialize a set of flags given in string form.
-            flags = Flags('contentaccessible=yes', 'appversion>=3.5')
-         '''
-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
-@@ -33,16 +33,17 @@ class ManifestEntry(object):
-         'application',
-         'platformversion',
-         'os',
-         'osversion',
-         'abi',
+Index: mozilla/python/mozbuild/mozpack/chrome/manifest.py
+===================================================================
+--- mozilla.orig/python/mozbuild/mozpack/chrome/manifest.py	2017-03-30 10:04:31.348433261 +0200
++++ mozilla/python/mozbuild/mozpack/chrome/manifest.py	2017-03-30 10:04:37.628487997 +0200
+@@ -38,6 +38,7 @@ class ManifestEntry(object):
          'xpcnativewrappers',
          'tablet',
          'process',
@@ -179,20 +117,11 @@ diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpac
      ]
  
      def __init__(self, base, *flags):
-         '''
-         Initialize a manifest entry with the given base path and flags.
-         '''
-         self.base = base
-         self.flags = Flags(*flags)
-diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
---- a/toolkit/components/downloads/moz.build
-+++ b/toolkit/components/downloads/moz.build
-@@ -57,16 +57,17 @@ if not CONFIG['MOZ_SUITE']:
-         'nsDownloadManagerUI.manifest',
-     ]
- 
- FINAL_LIBRARY = 'xul'
- 
+Index: mozilla/toolkit/components/downloads/moz.build
+===================================================================
+--- mozilla.orig/toolkit/components/downloads/moz.build	2017-03-30 10:04:31.348433261 +0200
++++ mozilla/toolkit/components/downloads/moz.build	2017-03-30 10:04:37.628487997 +0200
+@@ -62,6 +62,7 @@ FINAL_LIBRARY = 'xul'
  LOCAL_INCLUDES += [
      '../protobuf',
      '/ipc/chromium/src',
@@ -200,20 +129,11 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloa
      'chromium'
  ]
  
- DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
- DEFINES['GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER'] = True
- 
- CXXFLAGS += CONFIG['TK_CFLAGS']
- 
-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
-@@ -52,16 +52,20 @@
- #ifdef XP_WIN
- #include <shlobj.h>
- #include "nsWindowsHelpers.h"
- #ifdef DOWNLOAD_SCANNER
- #include "nsDownloadScanner.h"
+Index: mozilla/toolkit/components/downloads/nsDownloadManager.cpp
+===================================================================
+--- mozilla.orig/toolkit/components/downloads/nsDownloadManager.cpp	2017-03-30 10:04:31.352433296 +0200
++++ mozilla/toolkit/components/downloads/nsDownloadManager.cpp	2017-03-30 10:04:37.628487997 +0200
+@@ -57,6 +57,10 @@
  #endif
  #endif
  
@@ -224,17 +144,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
  #ifdef XP_MACOSX
  #include <CoreFoundation/CoreFoundation.h>
  #endif
- 
- #ifdef MOZ_WIDGET_ANDROID
- #include "FennecJNIWrappers.h"
- #endif
- 
-@@ -2723,16 +2727,25 @@ nsDownload::SetState(DownloadState aStat
-       nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
- 
-       // Master pref to control this function.
-       bool showTaskbarAlert = true;
-       if (pref)
+@@ -2728,6 +2732,15 @@ nsDownload::SetState(DownloadState aStat
          pref->GetBoolPref(PREF_BDM_SHOWALERTONCOMPLETE, &showTaskbarAlert);
  
        if (showTaskbarAlert) {
@@ -250,17 +160,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
          int32_t alertInterval = 2000;
          if (pref)
            pref->GetIntPref(PREF_BDM_SHOWALERTINTERVAL, &alertInterval);
- 
-         int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;
-         int64_t goat = PR_Now() - mStartTime;
-         showTaskbarAlert = goat > alertIntervalUSec;
- 
-@@ -2764,16 +2777,17 @@ nsDownload::SetState(DownloadState aStat
-                   message, !removeWhenDone,
-                   mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
-                   mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"),
-                   EmptyString(), EmptyString(), nullptr, mPrivate,
-                   false /* requireInteraction */);
+@@ -2769,6 +2782,7 @@ nsDownload::SetState(DownloadState aStat
              }
          }
        }
@@ -268,20 +168,11 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
  
  #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK)
        nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
-       nsCOMPtr<nsIFile> file;
-       nsAutoString path;
- 
-       if (fileURL &&
-           NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) &&
-diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
---- a/toolkit/content/jar.mn
-+++ b/toolkit/content/jar.mn
-@@ -71,29 +71,33 @@ toolkit.jar:
-    content/global/bindings/button.xml          (widgets/button.xml)
-    content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
-    content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)
-    content/global/bindings/datetimepicker.xml  (widgets/datetimepicker.xml)
-    content/global/bindings/datetimepopup.xml   (widgets/datetimepopup.xml)
+Index: mozilla/toolkit/content/jar.mn
+===================================================================
+--- mozilla.orig/toolkit/content/jar.mn	2017-03-30 09:15:54.406803350 +0200
++++ mozilla/toolkit/content/jar.mn	2017-03-30 10:06:07.401270868 +0200
+@@ -75,6 +75,8 @@ toolkit.jar:
     content/global/bindings/datetimebox.xml     (widgets/datetimebox.xml)
     content/global/bindings/datetimebox.css     (widgets/datetimebox.css)
  *  content/global/bindings/dialog.xml          (widgets/dialog.xml)
@@ -290,13 +181,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
     content/global/bindings/editor.xml          (widgets/editor.xml)
     content/global/bindings/expander.xml        (widgets/expander.xml)
     content/global/bindings/filefield.xml       (widgets/filefield.xml)
- *  content/global/bindings/findbar.xml         (widgets/findbar.xml)
-    content/global/bindings/general.xml         (widgets/general.xml)
-    content/global/bindings/groupbox.xml        (widgets/groupbox.xml)
-    content/global/bindings/listbox.xml         (widgets/listbox.xml)
-    content/global/bindings/menu.xml            (widgets/menu.xml)
-    content/global/bindings/menulist.xml        (widgets/menulist.xml)
-    content/global/bindings/notification.xml    (widgets/notification.xml)
+@@ -88,6 +90,8 @@ toolkit.jar:
     content/global/bindings/numberbox.xml       (widgets/numberbox.xml)
     content/global/bindings/popup.xml           (widgets/popup.xml)
  *  content/global/bindings/preferences.xml     (widgets/preferences.xml)
@@ -305,27 +190,10 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
     content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)
     content/global/bindings/radio.xml           (widgets/radio.xml)
     content/global/bindings/remote-browser.xml  (widgets/remote-browser.xml)
-    content/global/bindings/resizer.xml         (widgets/resizer.xml)
-    content/global/bindings/richlistbox.xml     (widgets/richlistbox.xml)
-    content/global/bindings/scale.xml           (widgets/scale.xml)
-    content/global/bindings/scrollbar.xml       (widgets/scrollbar.xml)
-    content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)
-@@ -113,9 +117,9 @@ toolkit.jar:
-    content/global/bindings/videocontrols.css   (widgets/videocontrols.css)
- *  content/global/bindings/wizard.xml          (widgets/wizard.xml)
- #ifdef XP_MACOSX
-    content/global/macWindowMenu.js
- #endif
-    content/global/svg/svgBindings.xml          (/layout/svg/resources/content/svgBindings.xml)
-    content/global/gmp-sources/eme-adobe.json   (gmp-sources/eme-adobe.json)
-    content/global/gmp-sources/openh264.json    (gmp-sources/openh264.json)
--   content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
-\ No newline at end of file
-+   content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
-diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
-new file mode 100644
---- /dev/null
-+++ b/toolkit/content/widgets/dialog-kde.xml
+Index: mozilla/toolkit/content/widgets/dialog-kde.xml
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/toolkit/content/widgets/dialog-kde.xml	2017-03-30 10:04:37.628487997 +0200
 @@ -0,0 +1,457 @@
 +<?xml version="1.0"?>
 +<!-- This Source Code Form is subject to the terms of the Mozilla Public
@@ -784,10 +652,10 @@ new file mode 100644
 +  </binding>
 +
 +</bindings>
-diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widgets/preferences-kde.xml
-new file mode 100644
---- /dev/null
-+++ b/toolkit/content/widgets/preferences-kde.xml
+Index: mozilla/toolkit/content/widgets/preferences-kde.xml
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/toolkit/content/widgets/preferences-kde.xml	2017-03-30 10:04:37.628487997 +0200
 @@ -0,0 +1,1411 @@
 +<?xml version="1.0"?>
 +
@@ -2200,15 +2068,11 @@ new file mode 100644
 +#    PrefWindow II  (???)
 +#    PrefWindow I   (June 4, 1999)
 +#
-diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
---- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
-+++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
-@@ -627,17 +627,17 @@ nsUnknownContentTypeDialog.prototype = {
-       else
-         typeString = mimeInfo.MIMEType;
-     }
-     // When the length is unknown, contentLength would be -1
-     if (this.mLauncher.contentLength >= 0) {
+Index: mozilla/toolkit/mozapps/downloads/nsHelperAppDlg.js
+===================================================================
+--- mozilla.orig/toolkit/mozapps/downloads/nsHelperAppDlg.js	2017-03-30 10:04:31.356433331 +0200
++++ mozilla/toolkit/mozapps/downloads/nsHelperAppDlg.js	2017-03-30 10:04:37.632488032 +0200
+@@ -632,7 +632,7 @@ nsUnknownContentTypeDialog.prototype = {
        let [size, unit] = DownloadUtils.
                           convertByteUnits(this.mLauncher.contentLength);
        type.value = this.dialogElement("strings")
@@ -2217,17 +2081,7 @@ diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downl
                                             [typeString, size, unit]);
      }
      else {
-       type.value = typeString;
-     }
-   },
- 
-   // Returns true if opening the default application makes sense.
-@@ -801,17 +801,17 @@ nsUnknownContentTypeDialog.prototype = {
-       switch (this.dialogElement("openHandler").selectedIndex) {
-       case 0:
-         // No app need be specified in this case.
-         ok = true;
-         break;
+@@ -806,7 +806,7 @@ nsUnknownContentTypeDialog.prototype = {
        case 1:
          // only enable the OK button if we have a default app to use or if
          // the user chose an app....
@@ -2236,17 +2090,7 @@ diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downl
          break;
        }
      }
- 
-     // Enable Ok button if ok to press.
-     this.mDialog.document.documentElement.getButton("accept").disabled = !ok;
-   },
- 
-@@ -1068,30 +1068,56 @@ nsUnknownContentTypeDialog.prototype = {
-           params.handlerApp.executable &&
-           params.handlerApp.executable.isFile()) {
-         // Remember the file they chose to run.
-         this.chosenApp = params.handlerApp;
-       }
+@@ -1073,20 +1073,46 @@ nsUnknownContentTypeDialog.prototype = {
      }
      else {
  #if MOZ_WIDGET_GTK == 3
@@ -2306,20 +2150,11 @@ diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downl
  #else
        var nsIFilePicker = Components.interfaces.nsIFilePicker;
        var fp = Components.classes["@mozilla.org/filepicker;1"]
-                          .createInstance(nsIFilePicker);
-       fp.init(this.mDialog,
-               this.dialogElement("strings").getString("chooseAppFilePickerTitle"),
-               nsIFilePicker.modeOpen);
- 
-diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
---- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -15,16 +15,17 @@
- #include "nsPrintfCString.h"
- #include "nsNetCID.h"
- #include "nsNetUtil.h"
- #include "nsISupportsPrimitives.h"
- #include "nsIGSettingsService.h"
+Index: mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+===================================================================
+--- mozilla.orig/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2017-03-30 10:04:31.356433331 +0200
++++ mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2017-03-30 10:04:37.632488032 +0200
+@@ -20,6 +20,7 @@
  #include "nsInterfaceHashtable.h"
  #include "mozilla/Attributes.h"
  #include "nsIURI.h"
@@ -2327,17 +2162,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
  
  class nsUnixSystemProxySettings final : public nsISystemProxySettings {
  public:
-   NS_DECL_ISUPPORTS
-   NS_DECL_NSISYSTEMPROXYSETTINGS
- 
-   nsUnixSystemProxySettings()
-     : mSchemeProxySettings(4)
-@@ -39,16 +40,17 @@ private:
-   nsCOMPtr<nsIGSettingsService> mGSettings;
-   nsCOMPtr<nsIGSettingsCollection> mProxySettings;
-   nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings;
-   bool IsProxyMode(const char* aMode);
-   nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult);
+@@ -44,6 +45,7 @@ private:
    nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult);
    nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult);
    nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult);
@@ -2345,17 +2170,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
  };
  
  NS_IMPL_ISUPPORTS(nsUnixSystemProxySettings, nsISystemProxySettings)
- 
- NS_IMETHODIMP
- nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
- {
-   // dbus prevents us from being threadsafe, but this routine should not block anyhow
-@@ -505,16 +507,19 @@ nsUnixSystemProxySettings::GetProxyFromG
- 
- nsresult
- nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
-                                           const nsACString & aScheme,
-                                           const nsACString & aHost,
+@@ -510,6 +512,9 @@ nsUnixSystemProxySettings::GetProxyForUR
                                            const int32_t      aPort,
                                            nsACString & aResult)
  {
@@ -2365,17 +2180,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
    if (mProxySettings) {
      nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult);
      if (NS_SUCCEEDED(rv))
-       return rv;
-   }
-   if (mGConf)
-     return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
- 
-@@ -540,8 +545,34 @@ static const mozilla::Module::ContractID
- 
- static const mozilla::Module kUnixProxyModule = {
-   mozilla::Module::kVersion,
-   kUnixProxyCIDs,
-   kUnixProxyContracts
+@@ -545,3 +550,29 @@ static const mozilla::Module kUnixProxyM
  };
  
  NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule;
@@ -2405,15 +2210,11 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 +  return NS_OK;
 +}
 +
-diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
---- a/toolkit/xre/moz.build
-+++ b/toolkit/xre/moz.build
-@@ -40,17 +40,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
-         'updaterfileutils_osx.mm',
-     ]
- elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
-     UNIFIED_SOURCES += [
-         'nsNativeAppSupportDefault.cpp',
+Index: mozilla/toolkit/xre/moz.build
+===================================================================
+--- mozilla.orig/toolkit/xre/moz.build	2017-03-30 10:04:31.356433331 +0200
++++ mozilla/toolkit/xre/moz.build	2017-03-30 10:04:37.632488032 +0200
+@@ -45,7 +45,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui
          'UIKitDirProvider.mm',
      ]
  elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
@@ -2423,15 +2224,10 @@ diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
          'nsNativeAppSupportUnix.cpp',
      ]
  else:
-     UNIFIED_SOURCES += [
-         'nsNativeAppSupportDefault.cpp',
-     ]
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
-diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
-new file mode 100644
---- /dev/null
-+++ b/toolkit/xre/nsKDEUtils.cpp
+Index: mozilla/toolkit/xre/nsKDEUtils.cpp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/toolkit/xre/nsKDEUtils.cpp	2017-03-30 10:04:37.632488032 +0200
 @@ -0,0 +1,344 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -2777,10 +2573,10 @@ new file mode 100644
 +    fputs( "\\E\n", commandFile ); // done as \E, so it cannot happen in normal data
 +    fflush( commandFile );
 +    }
-diff --git a/toolkit/xre/nsKDEUtils.h b/toolkit/xre/nsKDEUtils.h
-new file mode 100644
---- /dev/null
-+++ b/toolkit/xre/nsKDEUtils.h
+Index: mozilla/toolkit/xre/nsKDEUtils.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/toolkit/xre/nsKDEUtils.h	2017-03-30 10:04:37.632488032 +0200
 @@ -0,0 +1,48 @@
 +/* -*- 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
@@ -2830,15 +2626,11 @@ new file mode 100644
 +    };
 +
 +#endif // nsKDEUtils
-diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
---- a/uriloader/exthandler/moz.build
-+++ b/uriloader/exthandler/moz.build
-@@ -77,17 +77,19 @@ else:
-     SOURCES += [
-         osdir + '/nsOSHelperAppService.cpp',
-     ]
-     if CONFIG['GNU_CXX']:
-         CXXFLAGS += ['-Wno-error=shadow']
+Index: mozilla/uriloader/exthandler/moz.build
+===================================================================
+--- mozilla.orig/uriloader/exthandler/moz.build	2017-03-30 10:04:31.356433331 +0200
++++ mozilla/uriloader/exthandler/moz.build	2017-03-30 10:04:37.632488032 +0200
+@@ -82,7 +82,9 @@ else:
  
  if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
      UNIFIED_SOURCES += [
@@ -2848,17 +2640,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
          'unix/nsMIMEInfoUnix.cpp',
      ]
  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-     UNIFIED_SOURCES += [
-         'android/nsAndroidHandlerApp.cpp',
-         'android/nsExternalSharingAppService.cpp',
-         'android/nsExternalURLHandlerService.cpp',
-         'android/nsMIMEInfoAndroid.cpp',
-@@ -123,16 +125,17 @@ include('/ipc/chromium/chromium-config.m
- 
- FINAL_LIBRARY = 'xul'
- 
- LOCAL_INCLUDES += [
-     '/dom/base',
+@@ -128,6 +130,7 @@ LOCAL_INCLUDES += [
      '/dom/ipc',
      '/netwerk/base',
      '/netwerk/protocol/http',
@@ -2866,15 +2648,10 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
  ]
  
  if CONFIG['MOZ_ENABLE_DBUS']:
-     CXXFLAGS += CONFIG['TK_CFLAGS']
-     CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
-     CXXFLAGS += CONFIG['TK_CFLAGS']
-diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
-new file mode 100644
---- /dev/null
-+++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp
+Index: mozilla/uriloader/exthandler/unix/nsCommonRegistry.cpp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/uriloader/exthandler/unix/nsCommonRegistry.cpp	2017-03-30 10:04:37.632488032 +0200
 @@ -0,0 +1,53 @@
 +/* -*- 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
@@ -2929,10 +2706,10 @@ new file mode 100644
 +        return nsKDERegistry::GetFromType( aMIMEType );
 +    return nsGNOMERegistry::GetFromType( aMIMEType );
 +}
-diff --git a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler/unix/nsCommonRegistry.h
-new file mode 100644
---- /dev/null
-+++ b/uriloader/exthandler/unix/nsCommonRegistry.h
+Index: mozilla/uriloader/exthandler/unix/nsCommonRegistry.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/uriloader/exthandler/unix/nsCommonRegistry.h	2017-03-30 10:04:37.632488032 +0200
 @@ -0,0 +1,28 @@
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -2962,10 +2739,10 @@ new file mode 100644
 +};
 +
 +#endif
-diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp
-new file mode 100644
---- /dev/null
-+++ b/uriloader/exthandler/unix/nsKDERegistry.cpp
+Index: mozilla/uriloader/exthandler/unix/nsKDERegistry.cpp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/uriloader/exthandler/unix/nsKDERegistry.cpp	2017-03-30 10:04:37.632488032 +0200
 @@ -0,0 +1,88 @@
 +/* -*- 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
@@ -3055,10 +2832,10 @@ new file mode 100644
 +        }
 +    return nullptr;
 +}
-diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h
-new file mode 100644
---- /dev/null
-+++ b/uriloader/exthandler/unix/nsKDERegistry.h
+Index: mozilla/uriloader/exthandler/unix/nsKDERegistry.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/uriloader/exthandler/unix/nsKDERegistry.h	2017-03-30 10:04:37.632488032 +0200
 @@ -0,0 +1,34 @@
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -3094,14 +2871,11 @@ new file mode 100644
 +};
 +
 +#endif //nsKDERegistry_h__
-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
-@@ -1,50 +1,53 @@
- /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-  *
-  * This Source Code Form is subject to the terms of the Mozilla Public
-  * License, v. 2.0. If a copy of the MPL was not distributed with this
+Index: mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+===================================================================
+--- mozilla.orig/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2017-03-30 10:04:31.356433331 +0200
++++ mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2017-03-30 10:04:37.632488032 +0200
+@@ -5,7 +5,7 @@
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
  #include "nsMIMEInfoUnix.h"
@@ -3110,7 +2884,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
  #include "nsIGIOService.h"
  #include "nsNetCID.h"
  #include "nsIIOService.h"
- #include "nsAutoPtr.h"
+@@ -13,11 +13,14 @@
  #ifdef MOZ_ENABLE_DBUS
  #include "nsDBusHandlerApp.h"
  #endif
@@ -3126,14 +2900,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
  }
  
  NS_IMETHODIMP
- nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval)
- {
-   // if mDefaultApplication is set, it means the application has been set from
-   // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to
-   // give the GNOME answer.
-   if (mDefaultApplication)
-     return nsMIMEInfoImpl::GetHasDefaultHandler(_retval);
- 
+@@ -32,14 +35,14 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
    *_retval = false;
  
    if (mClass == eProtocolInfo) {
@@ -3151,17 +2918,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
        }
      }
      if (mimeInfo)
-       *_retval = true;
-   }
- 
-   if (*_retval)
-     return NS_OK;
-@@ -79,16 +82,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
-     ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
-   if (action.isValid()) {
-     action.trigger();
-     return NS_OK;
-   }
+@@ -84,6 +87,23 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
    return NS_ERROR_FAILURE;
  #endif
  
@@ -3185,20 +2942,11 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
    if (!giovfs) {
      return NS_ERROR_FAILURE;
-   }
- 
-   // 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
-@@ -10,17 +10,17 @@
- #if defined(MOZ_ENABLE_CONTENTACTION)
- #include <contentaction/contentaction.h>
- #include <QString>
- #endif
- 
+Index: mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+===================================================================
+--- mozilla.orig/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2017-03-30 10:04:31.360433366 +0200
++++ mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2017-03-30 10:04:37.632488032 +0200
+@@ -15,7 +15,7 @@
  #include "nsOSHelperAppService.h"
  #include "nsMIMEInfoUnix.h"
  #ifdef MOZ_WIDGET_GTK
@@ -3207,17 +2955,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  #endif
  #include "nsISupports.h"
  #include "nsString.h"
- #include "nsReadableUtils.h"
- #include "nsUnicharUtils.h"
- #include "nsXPIDLString.h"
- #include "nsIURL.h"
- #include "nsIFileStreams.h"
-@@ -1146,26 +1146,26 @@ nsresult nsOSHelperAppService::OSProtoco
-     ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
- 
-   if (action.isValid())
-     *aHandlerExists = true;
- #endif
+@@ -1151,7 +1151,7 @@ nsresult nsOSHelperAppService::OSProtoco
  
  #ifdef MOZ_WIDGET_GTK
    // Check the GNOME registry for a protocol handler
@@ -3226,8 +2964,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  #endif
  
    return NS_OK;
- }
- 
+@@ -1160,7 +1160,7 @@ nsresult nsOSHelperAppService::OSProtoco
  NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval)
  {
  #ifdef MOZ_WIDGET_GTK
@@ -3236,17 +2973,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
    return _retval.IsEmpty() ? NS_ERROR_NOT_AVAILABLE : NS_OK;
  #else
    return NS_ERROR_NOT_AVAILABLE;
- #endif
- }
- 
- nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile)
- {
-@@ -1252,17 +1252,17 @@ nsOSHelperAppService::GetFromExtension(c
-                                          mime_types_description,
-                                          true);
- 
-   if (NS_FAILED(rv) || majorType.IsEmpty()) {
- 
+@@ -1257,7 +1257,7 @@ nsOSHelperAppService::GetFromExtension(c
  #ifdef MOZ_WIDGET_GTK
      LOG(("Looking in GNOME registry\n"));
      RefPtr<nsMIMEInfoBase> gnomeInfo =
@@ -3255,17 +2982,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
      if (gnomeInfo) {
        LOG(("Got MIMEInfo from GNOME registry\n"));
        return gnomeInfo.forget();
-     }
- #endif
- 
-     rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
-                                   majorType,
-@@ -1373,17 +1373,17 @@ nsOSHelperAppService::GetFromType(const 
-   nsAutoString extensions, mime_types_description;
-   LookUpExtensionsAndDescription(majorType,
-                                  minorType,
-                                  extensions,
-                                  mime_types_description);
+@@ -1378,7 +1378,7 @@ nsOSHelperAppService::GetFromType(const
  
  #ifdef MOZ_WIDGET_GTK
    if (handler.IsEmpty()) {
@@ -3274,20 +2991,11 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
      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();
-     }
-diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
---- a/widget/gtk/moz.build
-+++ b/widget/gtk/moz.build
-@@ -101,16 +101,17 @@ else:
- include('/ipc/chromium/chromium-config.mozbuild')
- 
- FINAL_LIBRARY = 'xul'
- 
- LOCAL_INCLUDES += [
+Index: mozilla/widget/gtk/moz.build
+===================================================================
+--- mozilla.orig/widget/gtk/moz.build	2017-03-30 10:04:31.360433366 +0200
++++ mozilla/widget/gtk/moz.build	2017-03-30 10:04:37.632488032 +0200
+@@ -106,6 +106,7 @@ LOCAL_INCLUDES += [
      '/layout/generic',
      '/layout/xul',
      '/other-licenses/atk-1.0',
@@ -3295,20 +3003,11 @@ diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
      '/widget',
  ]
  
- if CONFIG['MOZ_X11']:
-     LOCAL_INCLUDES += [
-         '/widget/x11',
-     ]
- 
-diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
---- a/widget/gtk/nsFilePicker.cpp
-+++ b/widget/gtk/nsFilePicker.cpp
-@@ -4,32 +4,34 @@
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
- #include "mozilla/Types.h"
- #include <sys/types.h>
- #include <sys/stat.h>
+Index: mozilla/widget/gtk/nsFilePicker.cpp
+===================================================================
+--- mozilla.orig/widget/gtk/nsFilePicker.cpp	2017-03-30 10:04:31.360433366 +0200
++++ mozilla/widget/gtk/nsFilePicker.cpp	2017-03-30 10:04:37.632488032 +0200
+@@ -9,6 +9,7 @@
  #include <unistd.h>
  
  #include <gtk/gtk.h>
@@ -3316,16 +3015,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  
  #include "nsGtkUtils.h"
  #include "nsIFileURL.h"
- #include "nsIURI.h"
- #include "nsIWidget.h"
- #include "nsIFile.h"
- #include "nsIStringBundle.h"
- 
- #include "nsArrayEnumerator.h"
- #include "nsMemory.h"
- #include "nsEnumeratorUtils.h"
- #include "nsNetUtil.h"
- #include "nsReadableUtils.h"
+@@ -25,6 +26,7 @@
  #include "mozcontainer.h"
  
  #include "nsFilePicker.h"
@@ -3333,17 +3023,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  
  using namespace mozilla;
  
- #define MAX_PREVIEW_SIZE 180
- // bug 1184009
- #define MAX_PREVIEW_SOURCE_SIZE 4096
- 
- nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
-@@ -246,17 +248,19 @@ nsFilePicker::AppendFilters(int32_t aFil
-   return nsBaseFilePicker::AppendFilters(aFilterMask);
- }
- 
- NS_IMETHODIMP
- nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter)
+@@ -251,7 +253,9 @@ nsFilePicker::AppendFilter(const nsAStri
  {
    if (aFilter.EqualsLiteral("..apps")) {
      // No platform specific thing we can do here, really....
@@ -3354,17 +3034,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
    }
  
    nsAutoCString filter, name;
-   CopyUTF16toUTF8(aFilter, filter);
-   CopyUTF16toUTF8(aTitle, name);
- 
-   mFilters.AppendElement(filter);
-   mFilterNames.AppendElement(name);
-@@ -371,16 +375,32 @@ nsFilePicker::Show(int16_t *aReturn)
- 
- NS_IMETHODIMP
- nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
- {
-   // Can't show two dialogs concurrently with the same filepicker
+@@ -376,6 +380,22 @@ nsFilePicker::Open(nsIFilePickerShownCal
    if (mRunning)
      return NS_ERROR_NOT_AVAILABLE;
  
@@ -3387,17 +3057,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
    nsXPIDLCString title;
    title.Adopt(ToNewUTF8String(mTitle));
  
-   GtkWindow *parent_widget =
-     GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));
- 
-   GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
- 
-@@ -603,8 +623,235 @@ nsFilePicker::Done(GtkWidget* file_choos
-   if (mCallback) {
-     mCallback->Done(result);
-     mCallback = nullptr;
-   } else {
-     mResult = result;
+@@ -608,3 +628,230 @@ nsFilePicker::Done(GtkWidget* file_choos
    }
    NS_RELEASE_THIS();
  }
@@ -3628,15 +3288,11 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
 +    return NS_OK;
 +    }
 +
-diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
---- a/widget/gtk/nsFilePicker.h
-+++ b/widget/gtk/nsFilePicker.h
-@@ -69,14 +69,20 @@ protected:
-   nsString  mDefaultExtension;
- 
-   nsTArray<nsCString> mFilters;
-   nsTArray<nsCString> mFilterNames;
- 
+Index: mozilla/widget/gtk/nsFilePicker.h
+===================================================================
+--- mozilla.orig/widget/gtk/nsFilePicker.h	2017-03-30 10:04:31.360433366 +0200
++++ mozilla/widget/gtk/nsFilePicker.h	2017-03-30 10:04:37.632488032 +0200
+@@ -74,6 +74,12 @@ protected:
  private:
    static nsIFile *mPrevDisplayDirectory;
  
@@ -3649,18 +3305,11 @@ diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
  #if (MOZ_WIDGET_GTK == 3)
    GtkFileChooserWidget *mFileChooserDelegate;
  #endif
- };
- 
- #endif
-diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
---- a/xpcom/components/ManifestParser.cpp
-+++ b/xpcom/components/ManifestParser.cpp
-@@ -32,16 +32,17 @@
- #include "nsTextFormatter.h"
- #include "nsVersionComparator.h"
- #include "nsXPCOMCIDInternal.h"
- 
- #include "nsIConsoleService.h"
+Index: mozilla/xpcom/components/ManifestParser.cpp
+===================================================================
+--- mozilla.orig/xpcom/components/ManifestParser.cpp	2017-03-30 10:04:31.360433366 +0200
++++ mozilla/xpcom/components/ManifestParser.cpp	2017-03-30 10:04:37.632488032 +0200
+@@ -37,6 +37,7 @@
  #include "nsIScriptError.h"
  #include "nsIXULAppInfo.h"
  #include "nsIXULRuntime.h"
@@ -3668,17 +3317,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  
  using namespace mozilla;
  
- struct ManifestDirective
- {
-   const char* directive;
-   int argc;
- 
-@@ -472,16 +473,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");
+@@ -477,6 +478,7 @@ ParseManifest(NSLocationType aType, File
    NS_NAMED_LITERAL_STRING(kOs, "os");
    NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
    NS_NAMED_LITERAL_STRING(kABI, "abi");
@@ -3686,17 +3325,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
    NS_NAMED_LITERAL_STRING(kProcess, "process");
  #if defined(MOZ_WIDGET_ANDROID)
    NS_NAMED_LITERAL_STRING(kTablet, "tablet");
- #endif
- 
-   NS_NAMED_LITERAL_STRING(kMain, "main");
-   NS_NAMED_LITERAL_STRING(kContent, "content");
- 
-@@ -532,44 +534,49 @@ ParseManifest(NSLocationType aType, File
-         CopyUTF8toUTF16(s, abi);
-         abi.Insert(char16_t('_'), 0);
-         abi.Insert(osTarget, 0);
-       }
-     }
+@@ -537,6 +539,7 @@ ParseManifest(NSLocationType aType, File
    }
  
    nsAutoString osVersion;
@@ -3704,9 +3333,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  #if defined(XP_WIN)
  #pragma warning(push)
  #pragma warning(disable:4996) // VC12+ deprecates GetVersionEx
-   OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };
-   if (GetVersionEx(&info)) {
-     nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
+@@ -546,6 +549,7 @@ ParseManifest(NSLocationType aType, File
                                info.dwMajorVersion,
                                info.dwMinorVersion);
    }
@@ -3714,7 +3341,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  #pragma warning(pop)
  #elif defined(MOZ_WIDGET_COCOA)
    SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor();
-   SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor();
+@@ -553,10 +557,12 @@ ParseManifest(NSLocationType aType, File
    nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
                              majorVersion,
                              minorVersion);
@@ -3727,8 +3354,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  #elif defined(MOZ_WIDGET_ANDROID)
    bool isTablet = false;
    if (mozilla::AndroidBridge::Bridge()) {
-     mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION",
-                                                            "RELEASE",
+@@ -565,6 +571,7 @@ ParseManifest(NSLocationType aType, File
                                                             osVersion);
      isTablet = java::GeckoAppShell::IsTablet();
    }
@@ -3736,17 +3362,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  #endif
  
    if (XRE_IsContentProcess()) {
-     process = kContent;
-   } else {
-     process = kMain;
-   }
- 
-@@ -672,25 +679,27 @@ ParseManifest(NSLocationType aType, File
-     TriState stOsVersion = eUnspecified;
-     TriState stOs = eUnspecified;
-     TriState stABI = eUnspecified;
-     TriState stProcess = eUnspecified;
- #if defined(MOZ_WIDGET_ANDROID)
+@@ -677,6 +684,7 @@ ParseManifest(NSLocationType aType, File
      TriState stTablet = eUnspecified;
  #endif
      int flags = 0;
@@ -3754,9 +3370,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  
      while ((token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) &&
             ok) {
-       ToLowerCase(token);
-       NS_ConvertASCIItoUTF16 wtoken(token);
- 
+@@ -686,6 +694,7 @@ ParseManifest(NSLocationType aType, File
        if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||
            CheckStringFlag(kOs, wtoken, osTarget, stOs) ||
            CheckStringFlag(kABI, wtoken, abi, stABI) ||
@@ -3764,17 +3378,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
            CheckStringFlag(kProcess, wtoken, process, stProcess) ||
            CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
            CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
-           CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) {
-         continue;
-       }
- 
- #if defined(MOZ_WIDGET_ANDROID)
-@@ -740,16 +749,17 @@ ParseManifest(NSLocationType aType, File
-     }
- 
-     if (!ok ||
-         stApp == eBad ||
-         stAppVersion == eBad ||
+@@ -745,6 +754,7 @@ ParseManifest(NSLocationType aType, File
          stGeckoVersion == eBad ||
          stOs == eBad ||
          stOsVersion == eBad ||
@@ -3782,20 +3386,11 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  #ifdef MOZ_WIDGET_ANDROID
          stTablet == eBad ||
  #endif
-         stABI == eBad ||
-         stProcess == eBad) {
-       continue;
-     }
- 
-diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
---- a/xpcom/components/moz.build
-+++ b/xpcom/components/moz.build
-@@ -44,12 +44,13 @@ FINAL_LIBRARY = 'xul'
- LOCAL_INCLUDES += [
-     '!..',
-     '../base',
-     '../build',
-     '../ds',
+Index: mozilla/xpcom/components/moz.build
+===================================================================
+--- mozilla.orig/xpcom/components/moz.build	2017-03-30 10:04:31.360433366 +0200
++++ mozilla/xpcom/components/moz.build	2017-03-30 10:04:37.632488032 +0200
+@@ -49,6 +49,7 @@ LOCAL_INCLUDES += [
      '../reflect/xptinfo',
      '/chrome',
      '/modules/libjar',
@@ -3803,16 +3398,11 @@ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
  ]
  
  if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-     CXXFLAGS += CONFIG['TK_CFLAGS']
-diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
---- a/xpcom/io/nsLocalFileUnix.cpp
-+++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -46,16 +46,17 @@
- #include "prproces.h"
- #include "nsIDirectoryEnumerator.h"
- #include "nsISimpleEnumerator.h"
- #include "private/pprio.h"
- #include "prlink.h"
+Index: mozilla/xpcom/io/nsLocalFileUnix.cpp
+===================================================================
+--- mozilla.orig/xpcom/io/nsLocalFileUnix.cpp	2017-03-30 10:04:31.364433401 +0200
++++ mozilla/xpcom/io/nsLocalFileUnix.cpp	2017-03-30 10:04:37.636488066 +0200
+@@ -51,6 +51,7 @@
  
  #ifdef MOZ_WIDGET_GTK
  #include "nsIGIOService.h"
@@ -3820,17 +3410,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  #endif
  
  #ifdef MOZ_WIDGET_COCOA
- #include <Carbon/Carbon.h>
- #include "CocoaFileUtils.h"
- #include "prmem.h"
- #include "plbase64.h"
- 
-@@ -1948,42 +1949,52 @@ nsLocalFile::SetPersistentDescriptor(con
-   return InitWithNativePath(aPersistentDescriptor);
- #endif
- }
- 
- NS_IMETHODIMP
+@@ -1953,18 +1954,16 @@ NS_IMETHODIMP
  nsLocalFile::Reveal()
  {
  #ifdef MOZ_WIDGET_GTK
@@ -3852,12 +3432,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
    } else if (NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
      return NS_OK;
    } else {
-     nsCOMPtr<nsIFile> parentDir;
-     nsAutoCString dirPath;
-     if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) {
-       return NS_ERROR_FAILURE;
-     }
-     if (NS_FAILED(parentDir->GetNativePath(dirPath))) {
+@@ -1977,8 +1976,20 @@ nsLocalFile::Reveal()
        return NS_ERROR_FAILURE;
      }
  
@@ -3879,17 +3454,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  #elif defined(MOZ_WIDGET_COCOA)
    CFURLRef url;
    if (NS_SUCCEEDED(GetCFURL(&url))) {
-     nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
-     ::CFRelease(url);
-     return rv;
-   }
-   return NS_ERROR_FAILURE;
-@@ -1991,16 +2002,22 @@ nsLocalFile::Reveal()
-   return NS_ERROR_FAILURE;
- #endif
- }
- 
- NS_IMETHODIMP
+@@ -1996,6 +2007,12 @@ NS_IMETHODIMP
  nsLocalFile::Launch()
  {
  #ifdef MOZ_WIDGET_GTK
@@ -3902,8 +3467,3 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
    if (!giovfs) {
      return NS_ERROR_FAILURE;
-   }
- 
-   return giovfs->ShowURIForInput(mPath);
- #elif defined(MOZ_ENABLE_CONTENTACTION)
-   QUrl uri = QUrl::fromLocalFile(QString::fromUtf8(mPath.get()));
diff --git a/thunderbird-52.0-source.tar.xz b/thunderbird-52.0-source.tar.xz
index 091ab84..e4fc389 100644
--- a/thunderbird-52.0-source.tar.xz
+++ b/thunderbird-52.0-source.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd8912074f482ee6bb4d5ffec58fd6d445cb2ecafa60d1e41eccdb983361a65d
-size 240002516
+oid sha256:f7a094cfe061cafd763ecdefaf00b1aaf587e0b983fca5a1fe23d24e1f9934c7
+size 240540592