[pkgsrc/trunk]: pkgsrc/mail/thunderbird thunderbird: Sync with firefox68

To: source-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail/thunderbird thunderbird: Sync with firefox68
From: nia <nia%pkgsrc.org@localhost>
Date: Mon, 15 Jun 2020 16:56:03 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/84c9d79216e7
branches:  trunk
changeset: 434387:84c9d79216e7
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Jun 15 15:44:22 2020 +0000

description:
thunderbird: Sync with firefox68

- Re-enable multiprocess mode
- Drop hacks for crossprocess semaphores on NetBSD
- Drop OSS support
- Drop unused gnome option

Bump PKGREVISION

diffstat:

 mail/thunderbird/Makefile                                                |    3 +-
 mail/thunderbird/distinfo                                                |   18 +-
 mail/thunderbird/options.mk                                              |   17 +-
 mail/thunderbird/patches/patch-browser_app_profile_firefox.js            |    9 +-
 mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp                  |    6 +-
 mail/thunderbird/patches/patch-gfx_thebes_gfxPlatform.cpp                |   27 +
 mail/thunderbird/patches/patch-ipc_glue_CrossProcessSemaphore.h          |   18 -
 mail/thunderbird/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp |  187 ----
 mail/thunderbird/patches/patch-media_libcubeb_src_cubeb.c                |   37 +-
 mail/thunderbird/patches/patch-media_libcubeb_src_cubeb__oss.c           |  458 ----------
 mail/thunderbird/patches/patch-media_libcubeb_src_moz.build              |   20 +-
 mail/thunderbird/patches/patch-old-configure.in                          |   62 +-
 mail/thunderbird/patches/patch-toolkit_library_moz.build                 |   11 +-
 13 files changed, 65 insertions(+), 808 deletions(-)

diffs (truncated from 1062 to 300 lines):

diff -r 19de7e874a8d -r 84c9d79216e7 mail/thunderbird/Makefile
--- a/mail/thunderbird/Makefile Mon Jun 15 15:43:32 2020 +0000
+++ b/mail/thunderbird/Makefile Mon Jun 15 15:44:22 2020 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.249 2020/06/15 08:31:19 nia Exp $
+# $NetBSD: Makefile,v 1.250 2020/06/15 15:44:22 nia Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird-${TB_VER}
+PKGREVISION=   1
 TB_VER=                68.9.0
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
diff -r 19de7e874a8d -r 84c9d79216e7 mail/thunderbird/distinfo
--- a/mail/thunderbird/distinfo Mon Jun 15 15:43:32 2020 +0000
+++ b/mail/thunderbird/distinfo Mon Jun 15 15:44:22 2020 +0000
@@ -1,41 +1,39 @@
-$NetBSD: distinfo,v 1.228 2020/06/05 03:57:58 ryoon Exp $
+$NetBSD: distinfo,v 1.229 2020/06/15 15:44:22 nia Exp $
 
 SHA1 (thunderbird-68.9.0.source.tar.xz) = aeee38c1a36b07f8e85af1c7371ebb539083ab4a
 RMD160 (thunderbird-68.9.0.source.tar.xz) = f3467224d1225ec98085d38a4d38b798e3cebd0b
 SHA512 (thunderbird-68.9.0.source.tar.xz) = 891472c95ba6ff46061131504e89010da512a84b0e1dea0482e603fd4c87f11e099280a245c7dd9fc9320c48229c26602565c089d86f1a1f4271b29b6fc606f0
 Size (thunderbird-68.9.0.source.tar.xz) = 332239044 bytes
-SHA1 (patch-browser_app_profile_firefox.js) = d3ade5620370965e397ba494ff0495aeef5af0d0
+SHA1 (patch-browser_app_profile_firefox.js) = 775599fae82bf2701b8d45b728537abf3bab86fd
 SHA1 (patch-build_moz.configure_old.configure) = edd810f8d607697898ae315453719fe6c8c09bcc
 SHA1 (patch-build_moz.configure_rust.configure) = b57a9b1451dc426d75774f73d7c05fc98fe6e317
 SHA1 (patch-comm_mail_installer_package-manifest.in) = 14e8977f690e579a8caf73326248323615e04803
 SHA1 (patch-comm_mail_installer_removed-files.in) = f360ccac70a7afaee65e4617c015535084eee035
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = aa9664c1ba850e7c45b654dcf5d7d591d4994a86
 SHA1 (patch-dom_base_nsAttrName.h) = 57a1a15cde53a1c8e22b1b38efdd40b9c0f1f91b
-SHA1 (patch-dom_media_CubebUtils.cpp) = 2b6e750a2336434edd9642e1a78f4b6b7df1354a
+SHA1 (patch-dom_media_CubebUtils.cpp) = 5022ead470ba2b3b75bc423e320be0cc18279b6b
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = 795b510b525019f49169d1a594cd3e455e706500
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 879bb8ae14bc28e9c8b5f2874bf76298daea68c1
 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 936ae039b758c5eaf48dd4661c896d186b340207
 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = c30cb2ed98d4486fcc23b3a9b464df088a30134a
+SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = fcbe2f980557ff4eff8fcb6b4039a5c0eb956fa6
 SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = 80df98ebde2365cdea7b98e72e474f594934718e
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 0475843fa07f38a3f6255cfb998e64863fd8b9c1
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = aa71eee667e920b1c2364b90956a7332906c5d74
 SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = 2c03850559c733c37a749fdb86a3e4517878d56c
-SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = bc05df1cee60b3ae45f111ac451dc098027d8add
-SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = d554afd62ee91241747c42d74df31d8d25bb448f
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 007ec171c69059d503977bcef036a89b0f38dc5d
 SHA1 (patch-js_src_threading_posix_Thread.cpp) = 5c0e0238208b0928ea2472f15bdbe55aa7bcbb44
 SHA1 (patch-js_src_util_NativeStack.cpp) = 9bbfcc09e0166d6611ca813a555f60ea205d418d
 SHA1 (patch-media_libcubeb_gtest_moz.build) = da3183625cd058fac97dbf675d6a44fb1ee288f9
-SHA1 (patch-media_libcubeb_src_cubeb.c) = e7f5cdf21e18776a252dd9d602761acc958070d7
+SHA1 (patch-media_libcubeb_src_cubeb.c) = 426aeb9cbcd668bb98edff57550cc5ce7f0c690a
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = fdf4e43d90c112f70b00c6a1ab0a0f64aebe7ea7
-SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 202a10b264f7582c9e9b16a4b97447fadea8ff12
-SHA1 (patch-media_libcubeb_src_moz.build) = fd3b036b3ba4105949c6b0f46bf72c89184e777d
+SHA1 (patch-media_libcubeb_src_moz.build) = 79aa16955f6358b1b7d75b4e30bed4554a0afe7f
 SHA1 (patch-media_libcubeb_update.sh) = f8d0f674987519a1a1738be158e8cd4296f6def0
 SHA1 (patch-media_libpng_pngpriv.h) = dfd4d345e10f6f74d3a3546732a868481c1d5818
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = cd0639f97f2135980bc3036cc858ac061107bc75
-SHA1 (patch-old-configure.in) = 24c2f64250160c9e4c4cdc3b5ff2e6d33a5d6aad
+SHA1 (patch-old-configure.in) = 85efc1242429e1c4974882a965cc09790e098b73
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = cd4d65d6e6358b5b77b6b63441a8550f2d1e97c7
-SHA1 (patch-toolkit_library_moz.build) = 429745ec028ce71d8ba2457679b715ac14b6e2d3
+SHA1 (patch-toolkit_library_moz.build) = eee7849a119569ec74822c5f7d4878c7fd6b4096
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = bc5293f7bf4885443a131958e4099bbf0f2c4a2c
 SHA1 (patch-toolkit_moz.configure) = 994c8ff526984482b0e5fa26176ed6c20380a97d
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 00241c3e79d833a70753063186093d48956546b2
diff -r 19de7e874a8d -r 84c9d79216e7 mail/thunderbird/options.mk
--- a/mail/thunderbird/options.mk       Mon Jun 15 15:43:32 2020 +0000
+++ b/mail/thunderbird/options.mk       Mon Jun 15 15:44:22 2020 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.21 2020/01/07 15:41:22 wiz Exp $
+# $NetBSD: options.mk,v 1.22 2020/06/15 15:44:22 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.thunderbird
 
-PKG_SUPPORTED_OPTIONS= alsa dbus debug mozilla-jemalloc gnome \
-                       official-mozilla-branding oss pulseaudio \
+PKG_SUPPORTED_OPTIONS= alsa dbus debug mozilla-jemalloc \
+                       official-mozilla-branding pulseaudio \
                        mozilla-lightning wayland
 PKG_SUGGESTED_OPTIONS+=        mozilla-lightning
 
-PLIST_VARS+=           branding nobranding debug gnome jemalloc
+PLIST_VARS+=           branding nobranding debug jemalloc
 
 .include "../../devel/wayland/platform.mk"
 .if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
@@ -15,9 +15,9 @@
 .endif
 
 .if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=        pulseaudio mozilla-jemalloc dbus
+PKG_SUGGESTED_OPTIONS+=        alsa pulseaudio mozilla-jemalloc dbus
 .else
-PKG_SUGGESTED_OPTIONS+=        oss dbus
+PKG_SUGGESTED_OPTIONS+=        dbus
 .endif
 
 .include "../../mk/bsd.options.mk"
@@ -29,11 +29,6 @@
 CONFIGURE_ARGS+=       --disable-alsa
 .endif
 
-.if !empty(PKG_OPTIONS:Moss)
-CONFIGURE_ARGS+=       --with-oss
-.include "../../mk/oss.buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
 PLIST.jemalloc=                yes
 CONFIGURE_ARGS+=       --enable-jemalloc
diff -r 19de7e874a8d -r 84c9d79216e7 mail/thunderbird/patches/patch-browser_app_profile_firefox.js
--- a/mail/thunderbird/patches/patch-browser_app_profile_firefox.js     Mon Jun 15 15:43:32 2020 +0000
+++ b/mail/thunderbird/patches/patch-browser_app_profile_firefox.js     Mon Jun 15 15:44:22 2020 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-browser_app_profile_firefox.js,v 1.2 2019/09/21 10:55:17 ryoon Exp $
+$NetBSD: patch-browser_app_profile_firefox.js,v 1.3 2020/06/15 15:44:22 nia Exp $
 
---- browser/app/profile/firefox.js.orig        2019-09-09 23:43:23.000000000 +0000
+--- browser/app/profile/firefox.js.orig        2020-06-02 14:07:51.000000000 +0000
 +++ browser/app/profile/firefox.js
-@@ -1862,6 +1862,15 @@ pref("prio.publicKeyB", "26E6674E65425B8
+@@ -1862,6 +1862,12 @@ pref("prio.publicKeyB", "26E6674E65425B8
  pref("toolkit.coverage.enabled", false);
  pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org";);
  
@@ -12,9 +12,6 @@
 +// Enable system addons, for example langpacks from www/firefox-l10n
 +pref("extensions.autoDisableScopes", 11);
 +
-+// Disable multiprocess window support. Workaround for PR 53273.
-+pref("browser.tabs.remote.autostart", false);
-+
  // Discovery prefs
  pref("browser.discovery.enabled", true);
  pref("browser.discovery.containers.enabled", true);
diff -r 19de7e874a8d -r 84c9d79216e7 mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp
--- a/mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp   Mon Jun 15 15:43:32 2020 +0000
+++ b/mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp   Mon Jun 15 15:44:22 2020 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.3 2019/09/21 10:55:17 ryoon Exp $
+$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.4 2020/06/15 15:44:22 nia Exp $
 
---- dom/media/CubebUtils.cpp.orig      2019-09-09 23:43:26.000000000 +0000
+--- dom/media/CubebUtils.cpp.orig      2020-06-02 14:07:52.000000000 +0000
 +++ dom/media/CubebUtils.cpp
 @@ -163,7 +163,7 @@ const char kBrandBundleURL[] = "chrome:/
  
  const char* AUDIOSTREAM_BACKEND_ID_STR[] = {
      "jack",  "pulse",       "alsa",  "audiounit", "audioqueue", "wasapi",
 -    "winmm", "directsound", "sndio", "opensl",    "audiotrack", "kai"};
-+    "winmm", "directsound", "sndio", "opensl",    "audiotrack", "kai", "oss", "sun"};
++    "winmm", "directsound", "sndio", "opensl",    "audiotrack", "kai", "sun"};
  /* Index for failures to create an audio stream the first time. */
  const int CUBEB_BACKEND_INIT_FAILURE_FIRST =
      ArrayLength(AUDIOSTREAM_BACKEND_ID_STR);
diff -r 19de7e874a8d -r 84c9d79216e7 mail/thunderbird/patches/patch-gfx_thebes_gfxPlatform.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/thunderbird/patches/patch-gfx_thebes_gfxPlatform.cpp Mon Jun 15 15:44:22 2020 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-gfx_thebes_gfxPlatform.cpp,v 1.1 2020/06/15 15:44:22 nia Exp $
+
+Don't rely on CrossProcessSemaphore on NetBSD. It has some implementation
+issues that cause issues (kern/55386, not available on NetBSD<9)
+
+This idea is borrowed from macOS which has the same limitation.
+
+--- gfx/thebes/gfxPlatform.cpp.orig    2020-06-02 14:07:53.000000000 +0000
++++ gfx/thebes/gfxPlatform.cpp
+@@ -2991,6 +2991,9 @@ bool gfxPlatform::UsesOffMainThreadCompo
+ }
+ 
+ bool gfxPlatform::UsesTiling() const {
++#ifdef __NetBSD__
++  return true;
++#else
+   bool usesSkia = GetDefaultContentBackend() == BackendType::SKIA;
+ 
+   // We can't just test whether the PaintThread is initialized here because
+@@ -3002,6 +3005,7 @@ bool gfxPlatform::UsesTiling() const {
+ 
+   return gfxPrefs::LayersTilesEnabled() ||
+          (gfxPrefs::LayersTilesEnabledIfSkiaPOMTP() && usesSkia && usesPOMTP);
++#endif
+ }
+ 
+ bool gfxPlatform::ContentUsesTiling() const {
diff -r 19de7e874a8d -r 84c9d79216e7 mail/thunderbird/patches/patch-ipc_glue_CrossProcessSemaphore.h
--- a/mail/thunderbird/patches/patch-ipc_glue_CrossProcessSemaphore.h   Mon Jun 15 15:43:32 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-ipc_glue_CrossProcessSemaphore.h,v 1.1 2018/12/16 08:12:15 ryoon Exp $
-
---- ipc/glue/CrossProcessSemaphore.h.orig      2018-12-04 23:11:48.000000000 +0000
-+++ ipc/glue/CrossProcessSemaphore.h
-@@ -93,7 +93,13 @@ private:
-   HANDLE mSemaphore;
- #elif !defined(OS_MACOSX)
-   RefPtr<mozilla::ipc::SharedMemoryBasic> mSharedBuffer;
-+#if defined(__NetBSD__)
-+  pthread_mutex_t* mMutex;
-+  pthread_cond_t* mNotZero;
-+  uint32_t* mValue;
-+#else
-   sem_t* mSemaphore;
-+#endif
-   mozilla::Atomic<int32_t>* mRefCount;
- #endif
- };
diff -r 19de7e874a8d -r 84c9d79216e7 mail/thunderbird/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp
--- a/mail/thunderbird/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp  Mon Jun 15 15:43:32 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.3 2019/09/21 10:55:17 ryoon Exp $
-
---- ipc/glue/CrossProcessSemaphore_posix.cpp.orig      2019-09-09 23:43:28.000000000 +0000
-+++ ipc/glue/CrossProcessSemaphore_posix.cpp
-@@ -9,6 +9,11 @@
- #include "nsDebug.h"
- #include "nsISupportsImpl.h"
- #include <errno.h>
-+#if defined(__NetBSD__)
-+#include <iostream>
-+#include <unistd.h>
-+#include <limits>
-+#endif
- 
- static const uint64_t kNsPerMs = 1000000;
- static const uint64_t kNsPerSec = 1000000000;
-@@ -16,7 +21,13 @@ static const uint64_t kNsPerSec = 100000
- namespace {
- 
- struct SemaphoreData {
-+#if defined(__NetBSD__)
-+  pthread_mutex_t mMutex;
-+  pthread_cond_t mNotZero;
-+  uint32_t mValue;
-+#else
-   sem_t mSemaphore;
-+#endif
-   mozilla::Atomic<int32_t> mRefCount;
-   uint32_t mInitialValue;
- };
-@@ -43,13 +54,27 @@ CrossProcessSemaphore* CrossProcessSemap
-     return nullptr;
-   }
- 
-+#if defined(__NetBSD__)
-+  data->mValue = aInitialValue;
-+  if (pthread_mutex_init(&data->mMutex, NULL) ||
-+      pthread_cond_init(&data->mNotZero, NULL) ) {
-+    return nullptr;
-+  }
-+#else
-   if (sem_init(&data->mSemaphore, 1, aInitialValue)) {
-     return nullptr;
-   }
-+#endif
- 
-   CrossProcessSemaphore* sem = new CrossProcessSemaphore;
-   sem->mSharedBuffer = sharedBuffer;
-+#if defined(__NetBSD__)
-+  sem->mMutex = &data->mMutex;
-+  sem->mNotZero = &data->mNotZero;
-+  sem->mValue = &data->mValue;
-+#else
-   sem->mSemaphore = &data->mSemaphore;
-+#endif
-   sem->mRefCount = &data->mRefCount;
-   *sem->mRefCount = 1;
- 
-@@ -85,23 +110,44 @@ CrossProcessSemaphore* CrossProcessSemap
- 
-   int32_t oldCount = data->mRefCount++;
-   if (oldCount == 0) {
-+#if defined(__NetBSD__)
-+    if (pthread_mutex_init(&data->mMutex, NULL) ||
-+        pthread_cond_init(&data->mNotZero, NULL) ) {
-+      data->mRefCount--;
-+      return nullptr;
-+    }
-+#else
-     // The other side has already let go of their CrossProcessSemaphore, so now
-     // mSemaphore is garbage. We need to re-initialize it.
-     if (sem_init(&data->mSemaphore, 1, data->mInitialValue)) {
-       data->mRefCount--;
-       return nullptr;
-     }
-+#endif
-   }
- 
-   CrossProcessSemaphore* sem = new CrossProcessSemaphore;
-   sem->mSharedBuffer = sharedBuffer;
-+#if defined(__NetBSD__)
-+  sem->mMutex = &data->mMutex;
-+  sem->mNotZero = &data->mNotZero;
-+  sem->mValue = &data->mValue;
-+#else
-   sem->mSemaphore = &data->mSemaphore;
-+#endif
Prev by Date: [pkgsrc/trunk]: pkgsrc/mail mail/postfix: update to 3.5.3
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: note update of mail/postfix* packages to 3.5.3
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail mail/postfix: update to 3.5.3
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: note update of mail/postfix* packages to 3.5.3
Indexes:
Home | Main Index | Thread Index | Old Index