Update to 68.0

2019-09-03 13:59:05 +02:00 · 2019-09-03 13:59:05 +02:00 · c65ef0279a
commit c65ef0279a
parent 3f8a092a69
17 changed files with 69 additions and 5369 deletions
--- a/.gitignore
+++ b/.gitignore
@ -254,3 +254,6 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
 /thunderbird-60.8.0.source.tar.xz
 /thunderbird-langpacks-60.8.0-20190704.tar.xz
 /lightning-langpacks-60.8.0.tar.xz
+/thunderbird-68.0.source.tar.xz
+/thunderbird-langpacks-68.0-20190829.tar.xz
+/lightning-langpacks-68.0.tar.xz
--- a/build-aarch64-skia.patch
+++ b/build-aarch64-skia.patch
@ -1,21 +0,0 @@
-diff -up thunderbird-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia thunderbird-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp
--- thunderbird-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia	2018-08-28 14:36:13.555012053 +0200
-+++ thunderbird-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp	2018-08-28 14:38:17.160274150 +0200
-@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
- }
- 
- SI F from_half(U16 h) {
-#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-+#if 0 && defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-     return vcvt_f32_f16(h);
- 
- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
-@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
- }
- 
- SI U16 to_half(F f) {
-#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-+#if 0 && defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-     return vcvt_f16_f32(f);
- 
- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
--- a/build-disable-elfhack.patch
+++ b/build-disable-elfhack.patch
@ -1,12 +1,12 @@
-diff -up firefox-62.0.2/toolkit/moz.configure.elfhack firefox-62.0.2/toolkit/moz.configure
--- firefox-62.0.2/toolkit/moz.configure.elfhack	2018-09-27 14:32:56.549507561 +0200
-+++ firefox-62.0.2/toolkit/moz.configure	2018-09-27 14:33:08.219532121 +0200
-@@ -1195,7 +1195,7 @@ with only_when(has_elfhack):
-     option('--disable-elf-hack', help='Disable elf hacks')
+diff -up thunderbird-68.0/toolkit/moz.configure.elfhack thunderbird-68.0/toolkit/moz.configure
+--- thunderbird-68.0/toolkit/moz.configure.elfhack	2019-08-29 16:33:28.491708653 +0200
+++ thunderbird-68.0/toolkit/moz.configure	2019-08-29 16:33:58.019805525 +0200
+@@ -1130,7 +1130,7 @@ with only_when('--enable-compile-environ
+                help='{Enable|Disable} elf hacks')
 
-     set_config('USE_ELF_HACK',
-               depends_if('--enable-elf-hack')(lambda _: True))
-+               depends_if('--enable-elf-hack')(lambda _: False))
+         set_config('USE_ELF_HACK',
+-                   depends_if('--enable-elf-hack')(lambda _: True))
+                   depends_if('--enable-elf-hack')(lambda _: False))
 
 
 @depends(check_build_environment)
--- a/build-jit-atomic-always-lucky.patch
+++ b/build-jit-atomic-always-lucky.patch
@ -1,12 +0,0 @@
-diff -up firefox-60.5.0/js/src/jit/AtomicOperations.h.jit-atomic-lucky firefox-60.5.0/js/src/jit/AtomicOperations.h
--- firefox-60.5.0/js/src/jit/AtomicOperations.h.jit-atomic-lucky	2019-01-22 10:20:27.993697161 +0100
-+++ firefox-60.5.0/js/src/jit/AtomicOperations.h	2019-01-22 10:23:15.337873762 +0100
-@@ -394,7 +394,7 @@ inline bool AtomicOperations::isLockfree
- #elif defined(__s390__) || defined(__s390x__)
- #include "jit/none/AtomicOperations-feeling-lucky.h"
- #else
-#error "No AtomicOperations support provided for this platform"
-+#include "jit/none/AtomicOperations-feeling-lucky.h"
- #endif
- 
- #endif  // jit_AtomicOperations_h
--- a/firefox-SIOCGSTAMP.patch
+++ b/firefox-SIOCGSTAMP.patch
@ -0,0 +1,16 @@
+diff -up firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
+diff -up firefox-68.0/media/webrtc/trunk/Makefile.old firefox-68.0/media/webrtc/trunk/Makefile
+diff -up firefox-68.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc.old firefox-68.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc
+--- firefox-68.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc.old	2019-07-10 20:10:04.420328534 +0200
+++ firefox-68.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc	2019-07-10 20:13:48.766658793 +0200
+@@ -62,6 +62,10 @@ typedef void* SockOptArg;
+ 
+ #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) && !defined(__native_client__)
+ 
+#ifndef SIOCGSTAMP
+#define SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
+#endif
+
+ int64_t GetSocketRecvTimestamp(int socket) {
+   struct timeval tv_ioctl;
+   int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl);
--- a/firefox-wayland.patch
+++ b/firefox-wayland.patch
--- a/mozilla-1353817.patch
+++ b/mozilla-1353817.patch
@ -1,27 +1,12 @@
-From 1cc652f5525f458b0b4ceb12af24bf5a4367db32 Mon Sep 17 00:00:00 2001
-From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
-Date: Tue, 23 May 2017 13:09:48 -0400
-Subject: [PATCH] Bug 1353817: Include SkNx_neon.h for ARM64 too
-
-This fixes build errors as arm_neon.h was missing along with some
-missing converters.
---
- gfx/skia/skia/src/core/SkNx.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gfx/skia/skia/src/core/SkNx.h b/gfx/skia/skia/src/core/SkNx.h
-index 6bca856..b0427aa 100644
--- a/gfx/skia/skia/src/core/SkNx.h
-+++ b/gfx/skia/skia/src/core/SkNx.h
-@@ -299,7 +299,7 @@ typedef SkNx<4, uint32_t> Sk4u;
+diff -up thunderbird-68.0/gfx/skia/skia/include/private/SkNx.h.1353817 thunderbird-68.0/gfx/skia/skia/include/private/SkNx.h
+--- thunderbird-68.0/gfx/skia/skia/include/private/SkNx.h.1353817	2019-08-29 16:31:20.892290062 +0200
+++ thunderbird-68.0/gfx/skia/skia/include/private/SkNx.h	2019-08-29 16:32:05.430436157 +0200
+@@ -416,7 +416,7 @@ typedef SkNx<8, uint32_t> Sk8u;
 // Include platform specific specializations if available.
 #if !defined(SKNX_NO_SIMD) && SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
-     #include "../opts/SkNx_sse.h"
+     #include "SkNx_sse.h"
 -#elif !defined(SKNX_NO_SIMD) && defined(SK_ARM_HAS_NEON)
 +#elif !defined(SKNX_NO_SIMD) && (defined(SK_ARM_HAS_NEON) || defined(SK_CPU_ARM64))
-     #include "../opts/SkNx_neon.h"
+     #include "SkNx_neon.h"
 #else
 
-- 
-2.9.4
-
--- a/mozilla-1460871-ldap-query.patch
+++ b/mozilla-1460871-ldap-query.patch
@ -1,164 +0,0 @@
-diff -up thunderbird-60.2.1/comm/ldap/xpcom/public/nsILDAPOperation.idl.1460871-ldap-query thunderbird-60.2.1/comm/ldap/xpcom/public/nsILDAPOperation.idl
--- thunderbird-60.2.1/comm/ldap/xpcom/public/nsILDAPOperation.idl.1460871-ldap-query	2018-10-01 16:52:39.000000000 +0200
-+++ thunderbird-60.2.1/comm/ldap/xpcom/public/nsILDAPOperation.idl	2018-10-04 09:40:04.491575949 +0200
-@@ -52,6 +52,10 @@ interface nsILDAPOperation : nsISupports
-      * private parameter (anything caller desires)
-      */
-     attribute nsISupports closure;
-+    /**
-+     * number of the request for compare that the request is still valid.
-+     */
-+    attribute unsigned long requestNum;
- 
-     /**
-      * No time and/or size limit specified
-diff -up thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.cpp.1460871-ldap-query thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.cpp
--- thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.cpp.1460871-ldap-query	2018-10-01 16:52:39.000000000 +0200
-+++ thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.cpp	2018-10-04 09:40:04.491575949 +0200
-@@ -400,6 +400,19 @@ convertControlArray(nsIArray *aXpcomArra
-     return NS_OK;
- }
- 
-+  /* attribute unsigned long requestNum; */
-+NS_IMETHODIMP nsLDAPOperation::GetRequestNum(uint32_t *aRequestNum)
-+{
-+    *aRequestNum = mRequestNum;
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP nsLDAPOperation::SetRequestNum(uint32_t aRequestNum)
-+{
-+    mRequestNum = aRequestNum;
-+    return NS_OK;
-+}
-+
- NS_IMETHODIMP
- nsLDAPOperation::SearchExt(const nsACString& aBaseDn, int32_t aScope,
-                            const nsACString& aFilter,
-diff -up thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.h.1460871-ldap-query thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.h
--- thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.h.1460871-ldap-query	2018-10-01 16:52:39.000000000 +0200
-+++ thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.h	2018-10-04 09:40:04.491575949 +0200
-@@ -36,6 +36,8 @@ class nsLDAPOperation : public nsILDAPOp
-      * used to break cycles
-      */
-     void Clear();
-+    // Stores the request number for later check of the operation is still valid
-+    int32_t mRequestNum;
- 
-   private:
-     virtual ~nsLDAPOperation();
-diff -up thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp.1460871-ldap-query thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp
--- thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp.1460871-ldap-query	2018-10-01 16:52:43.000000000 +0200
-+++ thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp	2018-10-04 09:40:55.334670404 +0200
-@@ -22,6 +22,8 @@
- 
- using namespace mozilla;
- 
-+extern mozilla::LazyLogModule gLDAPLogModule; // defined in nsLDAPService.cpp
-+
- // nsAbLDAPListenerBase inherits nsILDAPMessageListener
- class nsAbQueryLDAPMessageListener : public nsAbLDAPListenerBase
- {
-@@ -66,7 +68,6 @@ protected:
- 
-   bool mFinished;
-   bool mCanceled;
-  bool mWaitingForPrevQueryToFinish;
- 
-   nsCOMPtr<nsIMutableArray> mServerSearchControls;
-   nsCOMPtr<nsIMutableArray> mClientSearchControls;
-@@ -94,7 +95,6 @@ nsAbQueryLDAPMessageListener::nsAbQueryL
-   mResultLimit(resultLimit),
-   mFinished(false),
-   mCanceled(false),
-  mWaitingForPrevQueryToFinish(false),
-   mServerSearchControls(serverSearchControls),
-   mClientSearchControls(clientSearchControls)
- {
-@@ -116,9 +116,6 @@ nsresult nsAbQueryLDAPMessageListener::C
-         return NS_OK;
- 
-     mCanceled = true;
-    if (!mFinished)
-      mWaitingForPrevQueryToFinish = true;
-
-     return NS_OK;
- }
- 
-@@ -129,6 +126,8 @@ NS_IMETHODIMP nsAbQueryLDAPMessageListen
- 
-   int32_t messageType;
-   rv = aMessage->GetType(&messageType);
-+  uint32_t requestNum;
-+  mOperation->GetRequestNum(&requestNum);
-   NS_ENSURE_SUCCESS(rv, rv);
- 
-   bool cancelOperation = false;
-@@ -137,6 +136,14 @@ NS_IMETHODIMP nsAbQueryLDAPMessageListen
-   {
-     MutexAutoLock lock (mLock);
- 
-+    if (requestNum != sCurrentRequestNum) {
-+      MOZ_LOG(gLDAPLogModule, mozilla::LogLevel::Debug,
-+           ("nsAbQueryLDAPMessageListener::OnLDAPMessage: Ignoring message with "
-+            "request num %d, current request num is %d.",
-+            requestNum, sCurrentRequestNum));
-+      return NS_OK;
-+    }
-+
-     if (mFinished)
-       return NS_OK;
- 
-@@ -166,11 +173,10 @@ NS_IMETHODIMP nsAbQueryLDAPMessageListen
-         rv = OnLDAPMessageSearchResult(aMessage);
-       break;
-     case nsILDAPMessage::RES_SEARCH_ENTRY:
-      if (!mFinished && !mWaitingForPrevQueryToFinish)
-+      if (!mFinished)
-         rv = OnLDAPMessageSearchEntry(aMessage);
-       break;
-     case nsILDAPMessage::RES_SEARCH_RESULT:
-      mWaitingForPrevQueryToFinish = false;
-       rv = OnLDAPMessageSearchResult(aMessage);
-       NS_ENSURE_SUCCESS(rv, rv);
-       break;
-@@ -207,6 +213,8 @@ nsresult nsAbQueryLDAPMessageListener::D
-   rv = mOperation->Init(mConnection, this, nullptr);
-   NS_ENSURE_SUCCESS(rv, rv);
- 
-+  mOperation->SetRequestNum(++sCurrentRequestNum);
-+
-   nsAutoCString dn;
-   rv = mSearchUrl->GetDn(dn);
-   NS_ENSURE_SUCCESS(rv, rv);
-diff -up thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp.1460871-ldap-query thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
--- thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp.1460871-ldap-query	2018-10-01 16:52:43.000000000 +0200
-+++ thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp	2018-10-04 09:40:04.492575951 +0200
-@@ -20,6 +20,8 @@
- 
- using namespace mozilla;
- 
-+uint32_t nsAbLDAPListenerBase::sCurrentRequestNum = 0;
-+
- nsAbLDAPListenerBase::nsAbLDAPListenerBase(nsILDAPURL* url,
-                                            nsILDAPConnection* connection,
-                                            const nsACString &login,
-@@ -249,6 +251,7 @@ NS_IMETHODIMP nsAbLDAPListenerBase::OnLD
-     InitFailed();
-     return rv;
-   }
-+  mOperation->SetRequestNum(++sCurrentRequestNum);
- 
-   // Try non-password mechanisms first
-   if (mSaslMechanism.EqualsLiteral("GSSAPI"))
-diff -up thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.h.1460871-ldap-query thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.h
--- thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.h.1460871-ldap-query	2018-10-01 16:52:43.000000000 +0200
-+++ thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.h	2018-10-04 09:40:04.492575951 +0200
-@@ -47,6 +47,7 @@ protected:
-   int32_t mTimeOut;
-   bool mBound;
-   bool mInitialized;
-+  static uint32_t sCurrentRequestNum;
- 
-   mozilla::Mutex mLock;
- };
--- a/mozilla-1508378.patch
+++ b/mozilla-1508378.patch
@ -1,55 +0,0 @@
-diff -up thunderbird-60.6.1/widget/gtk/WindowSurfaceWayland.cpp.1508378 thunderbird-60.6.1/widget/gtk/WindowSurfaceWayland.cpp
--- thunderbird-60.6.1/widget/gtk/WindowSurfaceWayland.cpp.1508378	2019-04-12 09:23:26.846503741 +0200
-+++ thunderbird-60.6.1/widget/gtk/WindowSurfaceWayland.cpp	2019-04-12 09:25:45.661937077 +0200
-@@ -567,6 +567,23 @@ static void WaylandBufferDelayCommitHand
-   }
- }
- 
-+void WindowSurfaceWayland::CalcRectScale(LayoutDeviceIntRect& aRect, int aScale) {
-+  if (aRect.x & 0x1) {
-+    aRect.width += 1;
-+  }
-+  aRect.x = aRect.x / aScale;
-+
-+  if (aRect.y & 0x1) {
-+    aRect.height += 1;
-+  }
-+  aRect.y = aRect.y / aScale;
-+
-+  aRect.width = (aRect.width & 0x1) ? aRect.width / aScale + 1 :
-+                                      aRect.width / aScale;
-+  aRect.height = (aRect.height & 0x1) ? aRect.height / aScale + 1 :
-+                                        aRect.height / aScale;
-+}
-+
- void WindowSurfaceWayland::CommitWaylandBuffer() {
-   MOZ_ASSERT(mPendingCommit, "Committing empty surface!");
- 
-@@ -617,11 +634,13 @@ void WindowSurfaceWayland::CommitWayland
-     gint scaleFactor = mWindow->GdkScaleFactor();
-     for (auto iter = mWaylandBufferDamage.RectIter(); !iter.Done();
-          iter.Next()) {
-      const mozilla::LayoutDeviceIntRect& r = iter.Get();
-+      mozilla::LayoutDeviceIntRect r = iter.Get();
-       // We need to remove the scale factor because the wl_surface_damage
-       // also multiplies by current  scale factor.
-      wl_surface_damage(waylandSurface, r.x / scaleFactor, r.y / scaleFactor,
-                        r.width / scaleFactor, r.height / scaleFactor);
-+      if (scaleFactor > 1) {
-+        CalcRectScale(r, scaleFactor);
-+      }
-+      wl_surface_damage(waylandSurface, r.x, r.y, r.width, r.height);
-     }
-   }
- 
-diff -up thunderbird-60.6.1/widget/gtk/WindowSurfaceWayland.h.1508378 thunderbird-60.6.1/widget/gtk/WindowSurfaceWayland.h
--- thunderbird-60.6.1/widget/gtk/WindowSurfaceWayland.h.1508378	2019-04-12 09:23:26.817503860 +0200
-+++ thunderbird-60.6.1/widget/gtk/WindowSurfaceWayland.h	2019-04-12 09:23:26.846503741 +0200
-@@ -101,6 +101,7 @@ class WindowSurfaceWayland : public Wind
-       const gfx::IntSize& aLockSize);
-   bool CommitImageSurfaceToWaylandBuffer(const LayoutDeviceIntRegion& aRegion);
-   void CommitWaylandBuffer();
-+  void CalcRectScale(LayoutDeviceIntRect& aRect, int scale);
- 
-   // TODO: Do we need to hold a reference to nsWindow object?
-   nsWindow* mWindow;
--- a/mozilla-1522780.patch
+++ b/mozilla-1522780.patch
@ -1,42 +0,0 @@
-diff -up thunderbird-60.5.0/toolkit/xre/nsAppRunner.cpp.1522780 thunderbird-60.5.0/toolkit/xre/nsAppRunner.cpp
--- thunderbird-60.5.0/toolkit/xre/nsAppRunner.cpp.1522780	2019-02-05 20:57:28.384820067 +0100
-+++ thunderbird-60.5.0/toolkit/xre/nsAppRunner.cpp	2019-02-05 21:05:27.623511428 +0100
-@@ -3872,10 +3872,26 @@ int XREMain::XRE_mainStartup(bool* aExit
-       saveDisplayArg = true;
-     }
- 
-      // On Wayland disabled builds read X11 DISPLAY env exclusively
-      // and don't care about different displays.
-#if !defined(MOZ_WAYLAND)
-    if (!display_name) {
-+    bool disableWayland = true;
-+#if defined(MOZ_WAYLAND)
-+    // Make X11 backend the default one.
-+    // Enable Wayland backend only when GDK_BACKEND is set and
-+    // Gtk+ >= 3.22 where we can expect recent enough
-+    // compositor & libwayland interface.
-+    disableWayland = (PR_GetEnv("GDK_BACKEND") == nullptr) ||
-+                     (gtk_check_version(3, 22, 0) != nullptr);
-+    // Enable Wayland on Gtk+ >= 3.22 where we can expect recent enough
-+    disableWayland = (gtk_check_version(3, 22, 0) != nullptr);
-+    if (!disableWayland) {
-+      // Make X11 backend the default one unless MOZ_ENABLE_WAYLAND or
-+      // GDK_BACKEND are specified.
-+      disableWayland = (PR_GetEnv("GDK_BACKEND") == nullptr) &&
-+                       (PR_GetEnv("MOZ_ENABLE_WAYLAND") == nullptr);
-+    }
-+#endif
-+    // On Wayland disabled builds read X11 DISPLAY env exclusively
-+    // and don't care about different displays.
-+    if (disableWayland && !display_name) {
-       display_name = PR_GetEnv("DISPLAY");
-       if (!display_name) {
-         PR_fprintf(PR_STDERR,
-@@ -3883,7 +3899,6 @@ int XREMain::XRE_mainStartup(bool* aExit
-         return 1;
-       }
-     }
-#endif
- 
-     if (display_name) {
-       mGdkDisplay = gdk_display_open(display_name);
--- a/mozilla-1526243.patch
+++ b/mozilla-1526243.patch
@ -1,340 +0,0 @@
-changeset:   465480:a86f3560fb17
-parent:      465477:26d9b7ffbd6b
-user:        Martin Stransky <stransky@redhat.com>
-date:        Fri Mar 29 15:30:15 2019 +0100
-summary:     Bug 1526243 - [Linux] Don't use nsGConfService in nsGNOMEShellService.cpp, r=glandium
-
-diff --git a/browser/components/shell/nsGNOMEShellService.cpp b/browser/components/shell/nsGNOMEShellService.cpp
--- a/browser/components/shell/nsGNOMEShellService.cpp
-+++ b/browser/components/shell/nsGNOMEShellService.cpp
-@@ -10,17 +10,16 @@
- #include "nsShellService.h"
- #include "nsIServiceManager.h"
- #include "nsIFile.h"
- #include "nsIProperties.h"
- #include "nsDirectoryServiceDefs.h"
- #include "nsIPrefService.h"
- #include "prenv.h"
- #include "nsString.h"
-#include "nsIGConfService.h"
- #include "nsIGIOService.h"
- #include "nsIGSettingsService.h"
- #include "nsIStringBundle.h"
- #include "nsIOutputStream.h"
- #include "nsIProcess.h"
- #include "nsServiceManagerUtils.h"
- #include "nsComponentManagerUtils.h"
- #include "nsIImageLoadingContent.h"
-@@ -65,48 +64,39 @@ static const ProtocolAssociation appProt
- 
- static const MimeTypeAssociation appTypes[] = {
-     // clang-format off
-   { "text/html",             "htm html shtml" },
-   { "application/xhtml+xml", "xhtml xht"      }
-     // clang-format on
- };
- 
-// GConf registry key constants
-#define DG_BACKGROUND "/desktop/gnome/background"
-
-#define kDesktopImageKey DG_BACKGROUND "/picture_filename"
-#define kDesktopOptionsKey DG_BACKGROUND "/picture_options"
-#define kDesktopDrawBGKey DG_BACKGROUND "/draw_background"
-#define kDesktopColorKey DG_BACKGROUND "/primary_color"
-
- #define kDesktopBGSchema "org.gnome.desktop.background"
- #define kDesktopImageGSKey "picture-uri"
- #define kDesktopOptionGSKey "picture-options"
- #define kDesktopDrawBGGSKey "draw-background"
- #define kDesktopColorGSKey "primary-color"
- 
- static bool IsRunningAsASnap() { return (PR_GetEnv("SNAP") != nullptr); }
- 
- nsresult nsGNOMEShellService::Init() {
-   nsresult rv;
- 
-   if (gfxPlatform::IsHeadless()) {
-     return NS_ERROR_NOT_AVAILABLE;
-   }
- 
-  // GConf, GSettings or GIO _must_ be available, or we do not allow
-+  // GSettings or GIO _must_ be available, or we do not allow
-   // CreateInstance to succeed.
- 
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-   nsCOMPtr<nsIGSettingsService> gsettings =
-       do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
- 
-  if (!gconf && !giovfs && !gsettings) return NS_ERROR_NOT_AVAILABLE;
-+  if (!giovfs && !gsettings) return NS_ERROR_NOT_AVAILABLE;
- 
-   // Check G_BROKEN_FILENAMES.  If it's set, then filenames in glib use
-   // the locale encoding.  If it's not set, they use UTF-8.
-   mUseLocaleFilenames = PR_GetEnv("G_BROKEN_FILENAMES") != nullptr;
- 
-   if (GetAppPathFromLauncher()) return NS_OK;
- 
-   nsCOMPtr<nsIProperties> dirSvc(
-@@ -212,35 +202,23 @@ nsGNOMEShellService::IsDefaultBrowser(bo
-     }
-     if (strcmp(output, "yes\n") == 0) {
-       *aIsDefaultBrowser = true;
-     }
-     g_free(output);
-     return NS_OK;
-   }
- 
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-
-  bool enabled;
-   nsAutoCString handler;
-   nsCOMPtr<nsIGIOMimeApp> gioApp;
- 
-   for (unsigned int i = 0; i < ArrayLength(appProtocols); ++i) {
-     if (!appProtocols[i].essential) continue;
- 
-    if (gconf) {
-      handler.Truncate();
-      gconf->GetAppForProtocol(nsDependentCString(appProtocols[i].name),
-                               &enabled, handler);
-
-      if (!CheckHandlerMatchesAppName(handler) || !enabled)
-        return NS_OK;  // the handler is disabled or set to another app
-    }
-
-     if (giovfs) {
-       handler.Truncate();
-       nsCOMPtr<nsIHandlerApp> handlerApp;
-       giovfs->GetAppForURIScheme(nsDependentCString(appProtocols[i].name),
-                                  getter_AddRefs(handlerApp));
-       gioApp = do_QueryInterface(handlerApp);
-       if (!gioApp) return NS_OK;
- 
-@@ -270,39 +248,17 @@ nsGNOMEShellService::SetDefaultBrowser(b
-     GSpawnFlags flags = static_cast<GSpawnFlags>(G_SPAWN_SEARCH_PATH |
-                                                  G_SPAWN_STDOUT_TO_DEV_NULL |
-                                                  G_SPAWN_STDERR_TO_DEV_NULL);
-     g_spawn_sync(nullptr, (gchar **)argv, nullptr, flags, nullptr, nullptr,
-                  nullptr, nullptr, nullptr, nullptr);
-     return NS_OK;
-   }
- 
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-  if (gconf) {
-    nsAutoCString appKeyValue;
-    if (mAppIsInPath) {
-      // mAppPath is in the users path, so use only the basename as the launcher
-      gchar *tmp = g_path_get_basename(mAppPath.get());
-      appKeyValue = tmp;
-      g_free(tmp);
-    } else {
-      appKeyValue = mAppPath;
-    }
-
-    appKeyValue.AppendLiteral(" %s");
-
-    for (unsigned int i = 0; i < ArrayLength(appProtocols); ++i) {
-      if (appProtocols[i].essential || aClaimAllTypes) {
-        gconf->SetAppForProtocol(nsDependentCString(appProtocols[i].name),
-                                 appKeyValue);
-      }
-    }
-  }
-
-   if (giovfs) {
-     nsresult rv;
-     nsCOMPtr<nsIStringBundleService> bundleService =
-         do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
-     NS_ENSURE_SUCCESS(rv, rv);
- 
-     nsCOMPtr<nsIStringBundle> brandBundle;
-     rv = bundleService->CreateBundle(BRAND_PROPERTIES,
-@@ -353,19 +309,21 @@ nsGNOMEShellService::SetDefaultBrowser(b
-   }
- 
-   return NS_OK;
- }
- 
- NS_IMETHODIMP
- nsGNOMEShellService::GetCanSetDesktopBackground(bool *aResult) {
-   // setting desktop background is currently only supported
-  // for Gnome or desktops using the same GSettings and GConf keys
-  const char *gnomeSession = getenv("GNOME_DESKTOP_SESSION_ID");
-  if (gnomeSession) {
-+  // for Gnome or desktops using the same GSettings keys
-+  const char *currentDesktop = getenv("XDG_CURRENT_DESKTOP");
-+  if (currentDesktop &&
-+      (strstr(currentDesktop, "GNOME-Flashback:GNOME") != nullptr ||
-+       strstr(currentDesktop, "GNOME") != nullptr)) {
-     *aResult = true;
-   } else {
-     *aResult = false;
-   }
- 
-   return NS_OK;
- }
- 
-@@ -439,20 +397,16 @@ nsGNOMEShellService::SetDesktopBackgroun
-   filePath.Append('/');
-   filePath.Append(NS_ConvertUTF16toUTF8(brandName));
-   filePath.AppendLiteral("_wallpaper.png");
- 
-   // write the image to a file in the home dir
-   rv = WriteImage(filePath, container);
-   NS_ENSURE_SUCCESS(rv, rv);
- 
-  // Try GSettings first. If we don't have GSettings or the right schema, fall
-  // back to using GConf instead. Note that if GSettings works ok, the changes
-  // get mirrored to GConf by the gsettings->gconf bridge in
-  // gnome-settings-daemon
-   nsCOMPtr<nsIGSettingsService> gsettings =
-       do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
-   if (gsettings) {
-     nsCOMPtr<nsIGSettingsCollection> background_settings;
-     gsettings->GetCollectionForSchema(NS_LITERAL_CSTRING(kDesktopBGSchema),
-                                       getter_AddRefs(background_settings));
-     if (background_settings) {
-       gchar *file_uri = g_filename_to_uri(filePath.get(), nullptr, nullptr);
-@@ -465,32 +419,17 @@ nsGNOMEShellService::SetDesktopBackgroun
-                                      nsDependentCString(file_uri));
-       g_free(file_uri);
-       background_settings->SetBoolean(NS_LITERAL_CSTRING(kDesktopDrawBGGSKey),
-                                       true);
-       return rv;
-     }
-   }
- 
-  // if the file was written successfully, set it as the system wallpaper
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-
-  if (gconf) {
-    gconf->SetString(NS_LITERAL_CSTRING(kDesktopOptionsKey), options);
-
-    // Set the image to an empty string first to force a refresh
-    // (since we could be writing a new image on top of an existing
-    // Firefox_wallpaper.png and nautilus doesn't monitor the file for changes)
-    gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey), EmptyCString());
-
-    gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey), filePath);
-    gconf->SetBool(NS_LITERAL_CSTRING(kDesktopDrawBGKey), true);
-  }
-
-  return rv;
-+  return NS_ERROR_FAILURE;
- }
- 
- #define COLOR_16_TO_8_BIT(_c) ((_c) >> 8)
- #define COLOR_8_TO_16_BIT(_c) ((_c) << 8 | (_c))
- 
- NS_IMETHODIMP
- nsGNOMEShellService::GetDesktopBackgroundColor(uint32_t *aColor) {
-   nsCOMPtr<nsIGSettingsService> gsettings =
-@@ -502,22 +441,16 @@ nsGNOMEShellService::GetDesktopBackgroun
-     gsettings->GetCollectionForSchema(NS_LITERAL_CSTRING(kDesktopBGSchema),
-                                       getter_AddRefs(background_settings));
-     if (background_settings) {
-       background_settings->GetString(NS_LITERAL_CSTRING(kDesktopColorGSKey),
-                                      background);
-     }
-   }
- 
-  if (!background_settings) {
-    nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-    if (gconf)
-      gconf->GetString(NS_LITERAL_CSTRING(kDesktopColorKey), background);
-  }
-
-   if (background.IsEmpty()) {
-     *aColor = 0;
-     return NS_OK;
-   }
- 
-   GdkColor color;
-   gboolean success = gdk_color_parse(background.get(), &color);
- 
-@@ -555,23 +488,17 @@ nsGNOMEShellService::SetDesktopBackgroun
-                                       getter_AddRefs(background_settings));
-     if (background_settings) {
-       background_settings->SetString(NS_LITERAL_CSTRING(kDesktopColorGSKey),
-                                      colorString);
-       return NS_OK;
-     }
-   }
- 
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-
-  if (gconf) {
-    gconf->SetString(NS_LITERAL_CSTRING(kDesktopColorKey), colorString);
-  }
-
-  return NS_OK;
-+  return NS_ERROR_FAILURE;
- }
- 
- NS_IMETHODIMP
- nsGNOMEShellService::OpenApplication(int32_t aApplication) {
-   nsAutoCString scheme;
-   if (aApplication == APPLICATION_MAIL)
-     scheme.AssignLiteral("mailto");
-   else if (aApplication == APPLICATION_NEWS)
-@@ -581,55 +508,17 @@ nsGNOMEShellService::OpenApplication(int
- 
-   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-   if (giovfs) {
-     nsCOMPtr<nsIHandlerApp> handlerApp;
-     giovfs->GetAppForURIScheme(scheme, getter_AddRefs(handlerApp));
-     if (handlerApp) return handlerApp->LaunchWithURI(nullptr, nullptr);
-   }
- 
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-  if (!gconf) return NS_ERROR_FAILURE;
-
-  bool enabled;
-  nsAutoCString appCommand;
-  gconf->GetAppForProtocol(scheme, &enabled, appCommand);
-
-  if (!enabled) return NS_ERROR_FAILURE;
-
-  // XXX we don't currently handle launching a terminal window.
-  // If the handler requires a terminal, bail.
-  bool requiresTerminal;
-  gconf->HandlerRequiresTerminal(scheme, &requiresTerminal);
-  if (requiresTerminal) return NS_ERROR_FAILURE;
-
-  // Perform shell argument expansion
-  int argc;
-  char **argv;
-  if (!g_shell_parse_argv(appCommand.get(), &argc, &argv, nullptr))
-    return NS_ERROR_FAILURE;
-
-  char **newArgv = new char *[argc + 1];
-  int newArgc = 0;
-
-  // Run through the list of arguments.  Copy all of them to the new
-  // argv except for %s, which we skip.
-  for (int i = 0; i < argc; ++i) {
-    if (strcmp(argv[i], "%s") != 0) newArgv[newArgc++] = argv[i];
-  }
-
-  newArgv[newArgc] = nullptr;
-
-  gboolean err = g_spawn_async(nullptr, newArgv, nullptr, G_SPAWN_SEARCH_PATH,
-                               nullptr, nullptr, nullptr, nullptr);
-
-  g_strfreev(argv);
-  delete[] newArgv;
-
-  return err ? NS_OK : NS_ERROR_FAILURE;
-+  return NS_ERROR_FAILURE;
- }
- 
- NS_IMETHODIMP
- nsGNOMEShellService::OpenApplicationWithURI(nsIFile *aApplication,
-                                             const nsACString &aURI) {
-   nsresult rv;
-   nsCOMPtr<nsIProcess> process =
-       do_CreateInstance("@mozilla.org/process/util;1", &rv);
-
--- a/mozilla-1533969.patch
+++ b/mozilla-1533969.patch
@ -1,18 +0,0 @@
-diff -up thunderbird-60.6.1/js/src/util/NativeStack.cpp.1533969 thunderbird-60.6.1/js/src/util/NativeStack.cpp
-diff -up thunderbird-60.6.1/tools/profiler/core/platform.h.1533969 thunderbird-60.6.1/tools/profiler/core/platform.h
--- thunderbird-60.6.1/tools/profiler/core/platform.h.1533969	2019-03-26 12:51:50.138988424 +0100
-+++ thunderbird-60.6.1/tools/profiler/core/platform.h	2019-03-26 12:54:57.576579732 +0100
-@@ -47,11 +47,11 @@
- #if defined(__GLIBC__)
- #include <unistd.h>
- #include <sys/syscall.h>
-static inline pid_t gettid() { return (pid_t)syscall(SYS_gettid); }
-+#  define gettid() static_cast<pid_t>(syscall(SYS_gettid))
- #elif defined(GP_OS_darwin)
- #include <unistd.h>
- #include <sys/syscall.h>
-static inline pid_t gettid() { return (pid_t)syscall(SYS_thread_selfid); }
-+#  define gettid() static_cast<pid_t>(syscall(SYS_thread_selfid))
- #elif defined(GP_OS_android)
- #include <unistd.h>
- #elif defined(GP_OS_windows)
--- a/mozilla-1540145.patch
+++ b/mozilla-1540145.patch
@ -1,168 +0,0 @@
-diff -up firefox-66.0.1/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.mozilla-1540145 firefox-66.0.1/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
--- firefox-66.0.1/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.mozilla-1540145	2019-03-22 06:06:07.000000000 +0100
-+++ firefox-66.0.1/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2019-04-01 09:33:18.621166482 +0200
-@@ -6,7 +6,6 @@
- #include "nsISystemProxySettings.h"
- #include "mozilla/ModuleUtils.h"
- #include "nsIServiceManager.h"
-#include "nsIGConfService.h"
- #include "nsIURI.h"
- #include "nsReadableUtils.h"
- #include "nsArrayUtils.h"
-@@ -32,16 +31,10 @@ class nsUnixSystemProxySettings final :
-  private:
-   ~nsUnixSystemProxySettings() = default;
- 
-  nsCOMPtr<nsIGConfService> mGConf;
-  nsCOMPtr<nsIGSettingsService> mGSettings;
-+    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);
-  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);
-@@ -66,20 +59,10 @@ nsresult nsUnixSystemProxySettings::Init
-         NS_LITERAL_CSTRING("org.gnome.system.proxy"),
-         getter_AddRefs(mProxySettings));
-   }
-  if (!mProxySettings) {
-    mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-  }
- 
-   return NS_OK;
- }
- 
-bool nsUnixSystemProxySettings::IsProxyMode(const char* aMode) {
-  nsAutoCString mode;
-  return NS_SUCCEEDED(mGConf->GetString(
-             NS_LITERAL_CSTRING("/system/proxy/mode"), mode)) &&
-         mode.EqualsASCII(aMode);
-}
-
- nsresult nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) {
-   if (mProxySettings) {
-     nsCString proxyMode;
-@@ -92,14 +75,8 @@ nsresult nsUnixSystemProxySettings::GetP
-     }
-     /* The org.gnome.system.proxy schema has been found, but auto mode is not
-      * set. Don't try the GConf and return empty string. */
-    aResult.Truncate();
-    return NS_OK;
-   }
- 
-  if (mGConf && IsProxyMode("auto")) {
-    return mGConf->GetString(NS_LITERAL_CSTRING("/system/proxy/autoconfig_url"),
-                             aResult);
-  }
-   // Return an empty string when auto mode is not set.
-   aResult.Truncate();
-   return NS_OK;
-@@ -217,30 +194,6 @@ static nsresult GetProxyFromEnvironment(
-   return NS_OK;
- }
- 
-nsresult nsUnixSystemProxySettings::SetProxyResultFromGConf(
-    const char* aKeyBase, const char* aType, nsACString& aResult) {
-  nsAutoCString hostKey;
-  hostKey.AppendASCII(aKeyBase);
-  hostKey.AppendLiteral("host");
-  nsAutoCString host;
-  nsresult rv = mGConf->GetString(hostKey, host);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (host.IsEmpty()) return NS_ERROR_FAILURE;
-
-  nsAutoCString portKey;
-  portKey.AppendASCII(aKeyBase);
-  portKey.AppendLiteral("port");
-  int32_t port;
-  rv = mGConf->GetInt(portKey, &port);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  /* When port is 0, proxy is not considered as enabled even if host is set. */
-  if (port == 0) return NS_ERROR_FAILURE;
-
-  SetProxyResult(aType, host, port, aResult);
-  return NS_OK;
-}
-
- nsresult nsUnixSystemProxySettings::SetProxyResultFromGSettings(
-     const char* aKeyBase, const char* aType, nsACString& aResult) {
-   nsDependentCString key(aKeyBase);
-@@ -366,63 +319,6 @@ static bool HostIgnoredByProxy(const nsA
-   return memcmp(&ignoreAddr, &hostAddr, sizeof(PRIPv6Addr)) == 0;
- }
- 
-nsresult nsUnixSystemProxySettings::GetProxyFromGConf(const nsACString& aScheme,
-                                                      const nsACString& aHost,
-                                                      int32_t aPort,
-                                                      nsACString& aResult) {
-  bool masterProxySwitch = false;
-  mGConf->GetBool(NS_LITERAL_CSTRING("/system/http_proxy/use_http_proxy"),
-                  &masterProxySwitch);
-  // if no proxy is set in GConf return NS_ERROR_FAILURE
-  if (!(IsProxyMode("manual") || masterProxySwitch)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsCOMPtr<nsIArray> ignoreList;
-  if (NS_SUCCEEDED(mGConf->GetStringList(
-          NS_LITERAL_CSTRING("/system/http_proxy/ignore_hosts"),
-          getter_AddRefs(ignoreList))) &&
-      ignoreList) {
-    uint32_t len = 0;
-    ignoreList->GetLength(&len);
-    for (uint32_t i = 0; i < len; ++i) {
-      nsCOMPtr<nsISupportsString> str = do_QueryElementAt(ignoreList, i);
-      if (str) {
-        nsAutoString s;
-        if (NS_SUCCEEDED(str->GetData(s)) && !s.IsEmpty()) {
-          if (HostIgnoredByProxy(NS_ConvertUTF16toUTF8(s), aHost)) {
-            aResult.AppendLiteral("DIRECT");
-            return NS_OK;
-          }
-        }
-      }
-    }
-  }
-
-  bool useHttpProxyForAll = false;
-  // This setting sometimes doesn't exist, don't bail on failure
-  mGConf->GetBool(NS_LITERAL_CSTRING("/system/http_proxy/use_same_proxy"),
-                  &useHttpProxyForAll);
-
-  nsresult rv;
-  if (!useHttpProxyForAll) {
-    rv = SetProxyResultFromGConf("/system/proxy/socks_", "SOCKS", aResult);
-    if (NS_SUCCEEDED(rv)) return rv;
-  }
-
-  if (aScheme.LowerCaseEqualsLiteral("http") || useHttpProxyForAll) {
-    rv = SetProxyResultFromGConf("/system/http_proxy/", "PROXY", aResult);
-  } else if (aScheme.LowerCaseEqualsLiteral("https")) {
-    rv = SetProxyResultFromGConf("/system/proxy/secure_", "PROXY", aResult);
-  } else if (aScheme.LowerCaseEqualsLiteral("ftp")) {
-    rv = SetProxyResultFromGConf("/system/proxy/ftp_", "PROXY", aResult);
-  } else {
-    rv = NS_ERROR_FAILURE;
-  }
-
-  return rv;
-}
-
- nsresult nsUnixSystemProxySettings::GetProxyFromGSettings(
-     const nsACString& aScheme, const nsACString& aHost, int32_t aPort,
-     nsACString& aResult) {
-@@ -494,7 +390,6 @@ nsresult nsUnixSystemProxySettings::GetP
-     nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult);
-     if (NS_SUCCEEDED(rv)) return rv;
-   }
-  if (mGConf) return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
- 
-   return GetProxyFromEnvironment(aScheme, aHost, aPort, aResult);
- }
--- a/rust-1.33-build.patch
+++ b/rust-1.33-build.patch
@ -1,47 +0,0 @@
-diff -up thunderbird-60.8.0/servo/components/style_traits/values.rs.rust-1.33-build thunderbird-60.8.0/servo/components/style_traits/values.rs
--- thunderbird-60.8.0/servo/components/style_traits/values.rs.rust-1.33-build	2019-07-03 17:25:28.000000000 +0200
-+++ thunderbird-60.8.0/servo/components/style_traits/values.rs	2019-07-11 13:38:53.687318154 +0200
-@@ -135,6 +135,7 @@ where
-     }
- }
- 
-+/// Some comment
- #[macro_export]
- macro_rules! serialize_function {
-     ($dest: expr, $name: ident($( $arg: expr, )+)) => {
-@@ -404,6 +405,7 @@ impl_to_css_for_predefined_type!(::csspa
- impl_to_css_for_predefined_type!(::cssparser::Color);
- impl_to_css_for_predefined_type!(::cssparser::UnicodeRange);
- 
-+/// Some comment
- #[macro_export]
- macro_rules! define_css_keyword_enum {
-     (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => {
-diff -up thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs.old thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs
--- thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs.old	2019-07-11 14:22:51.393784701 +0200
-+++ thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs	2019-07-11 14:24:03.182578100 +0200
-@@ -55,6 +55,7 @@ use style_adjuster::StyleAdjuster;
- 
- pub use self::declaration_block::*;
- 
-+/// Neco
- #[cfg(feature = "gecko")]
- #[macro_export]
- macro_rules! property_name {
-@@ -3852,7 +3853,7 @@ impl fmt::Debug for AliasId {
-     }
- }
- 
-// NOTE(emilio): Callers are responsible to deal with prefs.
-+/// NOTE(emilio): Callers are responsible to deal with prefs.
- #[macro_export]
- macro_rules! css_properties_accessors {
-     ($macro_name: ident) => {
-@@ -3875,6 +3876,7 @@ macro_rules! css_properties_accessors {
-     }
- }
- 
-+/// Neco
- #[macro_export]
- macro_rules! longhand_properties_idents {
-     ($macro_name: ident) => {
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (thunderbird-60.8.0.source.tar.xz) = b465544a8cbedf0aff0f737cf98e2d030331f1ea016b2e541dfe30a5cf3172f9075e5a9c8d6b7e0f97ffc2e0d3eebbaf9a39e76a499b9fc976bbc0c944dfd058
-SHA512 (thunderbird-langpacks-60.8.0-20190704.tar.xz) = 9613f678dde57ef2c99bf389a180a7c222472df74d935b80b49ab68e61cd36ad4950d7bad79fe11fdbbb728954b50297d80c4c4e422e4edfc0268fff012bf259
-SHA512 (lightning-langpacks-60.8.0.tar.xz) = 9ee5321810cc316e5d9725e6e43c95f24ab907a75962c1e78c9f24fe0eda421a4608f242018f1d52aa8fbc1d9be4a4e1e01cc707e0b8a9ae466505d0e3468fe2
+SHA512 (thunderbird-68.0.source.tar.xz) = 91f82016b71d65b58c1383248ac6f7a8cd8217409323eb14e8aabf2e509391bba4d18e0aa6d0cdac191d10e9794977f22f509078b7c5e3ac7c22afe379a0f299
+SHA512 (thunderbird-langpacks-68.0-20190829.tar.xz) = c11ca1f39c146cfbad8b2e4d5e1e8698caa6d97c9bb650b788a7df487dc3e2ee551aec9b814baae064b06543f0ae832583005e02c9d5cab1f3e66dbe1b28b08f
+SHA512 (lightning-langpacks-68.0.tar.xz) = d51c99a5d3dd95b66552fab6fdf9d55d00f56dcc73389790354846078a0f973bbd6273ada0d342f09a4045f3453c7e2bdd166821b4100efc0bc511f77a099148
--- a/2
+++ b/2
@ -9,14 +9,12 @@ ac_add_options --libdir="$LIBDIR"
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-libvpx
-ac_add_options --with-pthreads
 ac_add_options --disable-tests
 ac_add_options --disable-strip
 # temporary disable system cairo, because compilation fails
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-updater
 ac_add_options --enable-startup-notification
-ac_add_options --enable-pie
 ac_add_options --with-system-icu

 # lightning related
--- a/thunderbird.spec
+++ b/thunderbird.spec
@ -14,6 +14,7 @@ ExcludeArch: s390x
 %define system_ffi    1

 %define build_langpacks 1
+%global build_with_clang  0

 %global disable_elfhack       0
 %if 0%{?fedora} > 28
@ -88,13 +89,13 @@ ExcludeArch: s390x

 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        60.8.0
-Release:        2%{?dist}
+Version:        68.0
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}-20190704.tar.xz
+Source1:        thunderbird-langpacks-%{version}-20190829.tar.xz
 # Locales for lightning
 Source2:        lightning-langpacks-%{version}.tar.xz
 %endif
@ -109,15 +110,12 @@ Source28:       thunderbird-wayland.sh.in
 Source29:       thunderbird-wayland.desktop

 # Build patches
-Patch1:         rust-1.33-build.patch
 Patch9:         mozilla-build-arm.patch
 Patch26:        build-icu-big-endian.patch
-Patch37:        build-jit-atomic-always-lucky.patch
-Patch40:        build-aarch64-skia.patch
 Patch226:       rhbz-1354671.patch
 Patch415:       Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+Patch416:       firefox-SIOCGSTAMP.patch
 Patch103:       rhbz-1219542-s390-build.patch
-Patch104:       mozilla-1533969.patch
 Patch105:       thunderbird-debug.patch

 # PPC fix
@ -125,17 +123,11 @@ Patch304:       mozilla-1245783.patch
 Patch305:       build-big-endian.patch
 Patch306:       mozilla-1353817.patch
 Patch307:       build-disable-elfhack.patch
-Patch309:       mozilla-1460871-ldap-query.patch

 # Fedora specific patches
-Patch311:       firefox-wayland.patch
-Patch312:       mozilla-1522780.patch

 # Upstream patches
-Patch400:       mozilla-1526243.patch
-Patch401:       mozilla-1540145.patch
 Patch402:       mozilla-526293.patch
-Patch403:       mozilla-1508378.patch

 %if %{official_branding}
 # Required by Mozilla Corporation
@ -170,8 +162,9 @@ BuildRequires:  libXrender-devel
 BuildRequires:  hunspell-devel
 BuildRequires:  llvm
 BuildRequires:  llvm-devel
-BuildRequires:  clang
-BuildRequires:  clang-libs
+%if 0%{?build_with_clang}
+BuildRequires:  lld
+%endif
 %if %{?system_sqlite}
 BuildRequires:  sqlite-devel >= %{sqlite_version}
 Requires:       sqlite >= %{sqlite_build_version}
@ -238,24 +231,19 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 %setup -q

 # Build patches
-%patch1   -p1 -b .rust-1.33-build
 %patch9   -p2 -b .arm
 %ifarch s390
 %patch103 -p1 -b .rhbz-1219542-s390-build
 %endif
-%patch104 -p1 -b .1533969
 %patch105 -p1 -b .debug

 %patch304 -p1 -b .1245783
-%patch309 -p1 -b .1460871-ldap-query
 # Patch for big endian platforms only
 %if 0%{?big_endian}
 %patch26 -p1 -b .icu
 %patch305 -p1 -b .big-endian
 %endif

-%patch37 -p1 -b .jit-atomic-lucky
-%patch40 -p1 -b .aarch64-skia
 #ARM run-time patch
 %ifarch aarch64
 %patch226 -p1 -b .1354671
@ -263,6 +251,7 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 %ifarch %{arm}
 %patch415 -p1 -b .mozilla-1238661
 %endif
+%patch416 -p1 -b .SIOCGSTAMP

 %patch306 -p1 -b .1353817
 %if 0%{?disable_elfhack}
@ -270,13 +259,8 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 %endif
 #cd ..

-%patch311 -p1 -b .wayland
-%patch312 -p1 -b .1522780

-%patch400 -p1 -b .1526243
-%patch401 -p1 -b .1540145
 %patch402 -p1 -b .526293
-%patch403 -p1 -b .1508378

 %if %{official_branding}
 # Required by Mozilla Corporation
@ -445,9 +429,11 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/')
 # (OOM when linking, rhbz#1238225)
 export MOZ_DEBUG_FLAGS=" "
 %endif
+%if !0%{?build_with_clang}
 %ifarch s390 %{arm} ppc aarch64 i686
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
+%endif

 export CFLAGS=`echo $MOZ_OPT_FLAGS |sed -e 's/-fpermissive//g'`
 export CXXFLAGS=$MOZ_OPT_FLAGS
@ -456,6 +442,25 @@ export LDFLAGS=$MOZ_LINK_FLAGS
 export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'

+%if 0%{?build_with_clang}
+export LLVM_PROFDATA="llvm-profdata"
+export AR="llvm-ar"
+export NM="llvm-nm"
+export RANLIB="llvm-ranlib"
+echo "ac_add_options --enable-linker=lld" >> .mozconfig
+%else
+export CC=gcc
+export CXX=g++
+export AR="gcc-ar"
+export NM="gcc-nm"
+export RANLIB="gcc-ranlib"
+%endif
+
+%if 0%{?build_with_pgo}
+echo "ac_add_options MOZ_PGO=1" >> .mozconfig
+echo "ac_add_options --enable-lto" >> .mozconfig
+%endif
+
 MOZ_SMP_FLAGS=-j1
 # On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
 # however builds tend to fail on other arches when building in parallel.
@ -657,8 +662,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{mozappdir}/plugin-container
 %{mozappdir}/defaults
 %{mozappdir}/dictionaries
-%dir %{mozappdir}/extensions
-%{mozappdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
 %if %{build_langpacks}
 %dir %{langpackdir}
 %endif
@ -698,6 +701,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================

 %changelog
+* Thu Aug 29 2019 Jan Horak <jhorak@redhat.com> - 68.0-1
+- Update to 68.0
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 60.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild