Update to 78.3.1

This commit is contained in:
Jan Horak 2020-09-30 11:59:44 +02:00
parent 7c26b36cb9
commit e6c8a08e60
6 changed files with 4 additions and 88 deletions

2
.gitignore vendored
View File

@ -306,3 +306,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
/thunderbird-68.12.0.source.tar.xz
/thunderbird-langpacks-68.12.0-20200908.tar.xz
/lightning-langpacks-68.12.0.tar.xz
/thunderbird-78.3.1.source.tar.xz
/thunderbird-langpacks-78.3.1-20200930.tar.xz

View File

@ -1,12 +0,0 @@
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 "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 "SkNx_neon.h"
#else

View File

@ -1,17 +0,0 @@
diff --git a/widget/gtk/nsClipboardWayland.cpp b/widget/gtk/nsClipboardWayland.cpp
--- a/widget/gtk/nsClipboardWayland.cpp
+++ b/widget/gtk/nsClipboardWayland.cpp
@@ -195,6 +195,12 @@
uint32_t all_actions = WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY |
WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE;
+ /* Default to move D&D action (Bug 1576268).
+ */
+ if (dnd_actions == 0) {
+ all_actions = WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE;
+ }
+
wl_data_offer_set_actions(mWaylandDataOffer, all_actions, dnd_actions);
/* Workaround Wayland D&D architecture here. To get the data_device_drop()

View File

@ -1,4 +1,2 @@
SHA512 (thunderbird-68.12.0.source.tar.xz) = e7559536a9e024747e3ac7c20e4ffde5adf57657d02109ea32c39bf736ad03707fc7a14a0d3f1c91fa6fd69ead3c38d6c32ce78bd468834d9ba7f77f728332c6
SHA512 (thunderbird-langpacks-68.12.0-20200908.tar.xz) = 13545b356c39de218d38b1be5bd1d012628a39358e33b0e244f8a7375853539c2434898a9f90cf61b1977900eae729674bf7a1403357a3a088f19c231ef9c8fb
SHA512 (cbindgen-vendor.tar.xz) = 88afa0bc6af525cbb46bc75578b90419b28b95b396d5002fbf299a78a173681b840096ff83ef6e48553d1a5e0aa04e79383ab4d09bf431f3b864fcbacc7de46d
SHA512 (lightning-langpacks-68.12.0.tar.xz) = 3a57d73166e63108172f8c4a218860e3618ca40c54d6c75a6e7e561f552d79bc4291aa6057be1630d8a2eedf1f7c0f39fa64e38ccce9c7dd470efd01a3afb075
SHA512 (thunderbird-78.3.1.source.tar.xz) = 16b05e51776ba16503bc5fba02a6d0b5050a206e264a4707544354ad76af61902fd2dcf5d97b82b432dc69362ccd18543a0acccd80e06648e6c6f470886da450
SHA512 (thunderbird-langpacks-78.3.1-20200930.tar.xz) = 649ed59bdf7b988ca482b3bdb1dd2ea31741daeacc17c783f54e3fc65ac4ac17569d2cc54f357752bd0835914db5f59d638a781634d89a10acd3eee2acb9eb94

View File

@ -1,43 +0,0 @@
diff --git a/toolkit/components/remote/nsRemoteService.cpp b/toolkit/components/remote/nsRemoteService.cpp
--- a/toolkit/components/remote/nsRemoteService.cpp
+++ b/toolkit/components/remote/nsRemoteService.cpp
@@ -38,6 +38,10 @@
#define START_TIMEOUT_SEC 5
#define START_SLEEP_MSEC 100
+// When MOZ_DBUS_REMOTE is set both X11 and Wayland backends
+// use only DBus remote.
+#define DBUS_REMOTE_ENV "MOZ_DBUS_REMOTE"
+
using namespace mozilla;
extern int gArgc;
@@ -101,11 +105,11 @@
bool useX11Remote = GDK_IS_X11_DISPLAY(gdk_display_get_default());
# if defined(MOZ_ENABLE_DBUS)
- if (!useX11Remote) {
+ if (!useX11Remote || getenv(DBUS_REMOTE_ENV)) {
client = new nsDBusRemoteClient();
}
# endif
- if (useX11Remote) {
+ if (!client && useX11Remote) {
client = new nsXRemoteClient();
}
#elif defined(XP_WIN)
@@ -150,11 +154,11 @@
bool useX11Remote = GDK_IS_X11_DISPLAY(gdk_display_get_default());
# if defined(MOZ_ENABLE_DBUS)
- if (!useX11Remote) {
+ if (!useX11Remote || getenv(DBUS_REMOTE_ENV)) {
mRemoteServer = MakeUnique<nsDBusRemoteServer>();
}
# endif
- if (useX11Remote) {
+ if (!mRemoteServer && useX11Remote) {
mRemoteServer = MakeUnique<nsGTKRemoteServer>();
}
#elif defined(XP_WIN)

View File

@ -1,12 +0,0 @@
diff -up thunderbird-60.6.1/intl/locale/LocaleService.cpp.debug thunderbird-60.6.1/intl/locale/LocaleService.cpp
--- thunderbird-60.6.1/intl/locale/LocaleService.cpp.debug 2019-05-15 08:15:14.602872505 +0200
+++ thunderbird-60.6.1/intl/locale/LocaleService.cpp 2019-05-15 08:15:53.717635322 +0200
@@ -643,8 +643,6 @@ LocaleService::GetDefaultLocale(nsACStri
// just use our hard-coded default below.
GetGREFileContents("update.locale", &locale);
locale.Trim(" \t\n\r");
- // This should never be empty.
- MOZ_ASSERT(!locale.IsEmpty());
if (SanitizeForBCP47(locale, true)) {
mDefaultLocale.Assign(locale);
}