diff --git a/thunderbird-dbus-remote.patch b/thunderbird-dbus-remote.patch index 856e64e..83a5da5 100644 --- a/thunderbird-dbus-remote.patch +++ b/thunderbird-dbus-remote.patch @@ -75,7 +75,6 @@ diff -up thunderbird-60.3.0/widget/xremoteclient/DBusRemoteClient.cpp.old thunde return NS_OK; } -diff -up thunderbird-60.3.0/widget/xremoteclient/DBusRemoteClient.h.old thunderbird-60.3.0/widget/xremoteclient/DBusRemoteClient.h diff -up thunderbird-60.3.0/widget/xremoteclient/moz.build.old thunderbird-60.3.0/widget/xremoteclient/moz.build --- thunderbird-60.3.0/widget/xremoteclient/moz.build.old 2018-10-31 01:08:14.000000000 +0100 +++ thunderbird-60.3.0/widget/xremoteclient/moz.build 2018-11-14 13:37:32.244714628 +0100 @@ -186,3 +185,28 @@ diff -up thunderbird-60.3.0/widget/xremoteclient/XRemoteClient.cpp.old thunderbi // If there's a profile compare it with what we have if (data_return) { +diff -up thunderbird-60.3.0/toolkit/xre/nsAppRunner.cpp.old thunderbird-60.3.0/toolkit/xre/nsAppRunner.cpp +--- thunderbird-60.3.0/toolkit/xre/nsAppRunner.cpp.old 2018-11-22 10:24:36.980367239 +0100 ++++ thunderbird-60.3.0/toolkit/xre/nsAppRunner.cpp 2018-11-22 10:23:22.702553710 +0100 +@@ -1830,18 +1830,13 @@ StartRemoteClient(const char* aDesktopSt + { + nsAutoPtr client; + +- if (aIsX11Display) { +- client = new XRemoteClient(); +- } else { + #if defined(MOZ_ENABLE_DBUS) && defined(MOZ_WAYLAND) +- client = new DBusRemoteClient(); ++ client = new DBusRemoteClient(); + #else +- MOZ_ASSERT(false, "Missing remote implementation!"); +- return REMOTE_NOT_FOUND; ++ client = new XRemoteClient(); + #endif +- } + +- nsresult rv = client->Init(); ++ nsresult rv = client ? client->Init() : NS_ERROR_FAILURE; + if (NS_FAILED(rv)) + return REMOTE_NOT_FOUND; + diff --git a/thunderbird-wayland.desktop b/thunderbird-wayland.desktop index 23a7c24..e65deaf 100644 --- a/thunderbird-wayland.desktop +++ b/thunderbird-wayland.desktop @@ -3,7 +3,7 @@ Version=1.0 Name=Thunderbird on Wayland GenericName=Email Comment=Send and Receive Email -Exec=thunderbird %u +Exec=thunderbird-wayland %u TryExec=thunderbird-wayland Icon=thunderbird Terminal=false diff --git a/thunderbird.spec b/thunderbird.spec index 4fb592a..b479f96 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -84,7 +84,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 60.3.0 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -271,7 +271,7 @@ debug %{name}, you want to install %{name}-debuginfo instead. # TODO - needs fixes %patch311 -p1 -b .wayland -#%patch312 -p1 -b .thunderbird-dbus-remote +%patch312 -p1 -b .thunderbird-dbus-remote %patch313 -p1 -b .mozbz1507475 %if %{official_branding} @@ -692,6 +692,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Thu Nov 22 2018 Martin Stransky - 60.3.0-6 +- Enabled DBus remote. + * Wed Nov 21 2018 Martin Stransky - 60.3.0-5 - Backported Wayland related code from Firefox 63 - Added fix for mozbz#1507475 - crash when display changes