From 95a956f30d6c3a909cd5ba5552b0ed661909598c Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Wed, 15 May 2019 11:13:04 +0200
Subject: [PATCH] Fixed startup crashes (rhbz#1709373, rhbz#1685276,
 rhbz#1708611)

---
 firefox-wayland.patch | 17 +++++++++++++++--
 thunderbird.spec      |  7 ++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/firefox-wayland.patch b/firefox-wayland.patch
index d08ae4c..ec42d9f 100644
--- a/firefox-wayland.patch
+++ b/firefox-wayland.patch
@@ -2956,7 +2956,7 @@ diff -up thunderbird-60.5.0/widget/gtk/nsWindow.cpp.wayland thunderbird-60.5.0/w
 +      // If the window were to get unredirected, there could be visible
 +      // tearing because Gecko does not align its framebuffer updates with
 +      // vblank.
-+      SetCompositorHint(GTK_WIDGET_COMPOSIDED_ENABLED);
++      // SetCompositorHint(GTK_WIDGET_COMPOSIDED_ENABLED);
 +    }
    }
  #ifdef MOZ_WAYLAND
@@ -3179,7 +3179,7 @@ diff -up thunderbird-60.5.0/widget/gtk/nsWindow.cpp.wayland thunderbird-60.5.0/w
 +    g_object_set_data(G_OBJECT(gtk_widget_get_window(mShell)), "nsWindow",
 +                      this);
 +#ifdef MOZ_X11
-+    SetCompositorHint(GTK_WIDGET_COMPOSIDED_ENABLED);
++    // SetCompositorHint(GTK_WIDGET_COMPOSIDED_ENABLED);
 +#endif
 +    RefreshWindowClass();
 +
@@ -4426,3 +4426,16 @@ diff -up thunderbird-60.5.0/widget/gtk/WindowSurfaceWayland.h.wayland thunderbir
  };
  
  }  // namespace widget
+diff -up thunderbird-60.6.1/widget/gtk/WindowSurfaceProvider.cpp.old thunderbird-60.6.1/widget/gtk/WindowSurfaceProvider.cpp
+--- thunderbird-60.6.1/widget/gtk/WindowSurfaceProvider.cpp.old	2019-05-14 21:11:50.219841534 +0200
++++ thunderbird-60.6.1/widget/gtk/WindowSurfaceProvider.cpp	2019-05-14 21:11:58.228755117 +0200
+@@ -52,9 +52,6 @@ void WindowSurfaceProvider::Initialize(D
+ 
+ #ifdef MOZ_WAYLAND
+ void WindowSurfaceProvider::Initialize(nsWindow* aWidget) {
+-  MOZ_ASSERT(aWidget->GetWaylandDisplay(),
+-             "We are supposed to have a Wayland display!");
+-
+   mWidget = aWidget;
+   mIsX11Display = false;
+ }
diff --git a/thunderbird.spec b/thunderbird.spec
index ff9b4a6..9f4b2d0 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -89,7 +89,7 @@ ExcludeArch: s390x
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        60.6.1
-Release:        4%{?dist}
+Release:        5%{?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
@@ -118,6 +118,7 @@ Patch226:       rhbz-1354671.patch
 Patch415:       Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 Patch103:       rhbz-1219542-s390-build.patch
 Patch104:       mozilla-1533969.patch
+Patch105:       thunderbird-debug.patch
 
 # PPC fix
 Patch304:       mozilla-1245783.patch
@@ -243,6 +244,7 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 %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
@@ -696,6 +698,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* May Wed 15 2019 Martin Stransky <stransky@redhat.com> - 60.6.1-5
+- Fixed startup crashes (rhbz#1709373, rhbz#1685276, rhbz#1708611)
+
 * Fri Apr 12 2019 Martin Stransky <stransky@redhat.com> - 60.6.1-4
 - Addef fix for mozbz#1508378