pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/thunderbird52 tunderbird52: fixes for newer NSS, ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/253577bec198
branches: trunk
changeset: 454751:253577bec198
user: nia <nia%pkgsrc.org@localhost>
date: Thu Jun 17 11:01:19 2021 +0000
description:
tunderbird52: fixes for newer NSS, avoid GNU regex
Needs more work to build on netbsd HEAD.
diffstat:
mail/thunderbird52/distinfo | 12 +-
mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_ActorsParent.cpp | 106 ++++++++++
mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBCursor.cpp | 16 +
mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBDatabase.cpp | 43 ++++
mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBObjectStore.cpp | 16 +
mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBTransaction.cpp | 25 ++
mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBTransaction.h | 25 ++
mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_ProfilerHelpers.h | 16 +
mail/thunderbird52/patches/patch-mozilla_old-configure.in | 13 +-
9 files changed, 268 insertions(+), 4 deletions(-)
diffs (truncated from 340 to 300 lines):
diff -r 15a42725e431 -r 253577bec198 mail/thunderbird52/distinfo
--- a/mail/thunderbird52/distinfo Thu Jun 17 10:01:57 2021 +0000
+++ b/mail/thunderbird52/distinfo Thu Jun 17 11:01:19 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2020/03/30 19:46:01 joerg Exp $
+$NetBSD: distinfo,v 1.4 2021/06/17 11:01:19 nia Exp $
SHA1 (thunderbird-52.9.1.source.tar.xz) = 9970d78084fe979f568ea00bf06b8e81a738e630
RMD160 (thunderbird-52.9.1.source.tar.xz) = b3169a0154fa85648a98ba0d74f264abd224b323
@@ -30,6 +30,13 @@
SHA1 (patch-mozilla_config_system-headers) = 4665d754c8e498b3a34f877836287c7723ce930f
SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = 81752c113fcbef0a4ead18be1fbab1660c7d2fa9
SHA1 (patch-mozilla_dom_base_moz.build) = ea955077112082d25be57c7ad58102670e117821
+SHA1 (patch-mozilla_dom_indexedDB_ActorsParent.cpp) = f0d2b9715805d81c2d8d13fa22cc4a1c5a3e332a
+SHA1 (patch-mozilla_dom_indexedDB_IDBCursor.cpp) = 8dfcd7f3fff72ecc11b02c62b53e45b8e2eba2db
+SHA1 (patch-mozilla_dom_indexedDB_IDBDatabase.cpp) = e935263937701fe8e0d4cc3a008d0193ca7910da
+SHA1 (patch-mozilla_dom_indexedDB_IDBObjectStore.cpp) = 03d094a632efb939a7ee1c47bc35c70f8d2df176
+SHA1 (patch-mozilla_dom_indexedDB_IDBTransaction.cpp) = 004fd423d61d937ec00918484650e8140f2bf529
+SHA1 (patch-mozilla_dom_indexedDB_IDBTransaction.h) = bf2e8eb705794d1d6db2524124f0ec017cbe7c8a
+SHA1 (patch-mozilla_dom_indexedDB_ProfilerHelpers.h) = b8657b1cb06be091518c4c65e961bbc1f4383e87
SHA1 (patch-mozilla_dom_media_AudioStream.cpp) = c44bd89b7246ef9a5770b826967f342ce6fe18ae
SHA1 (patch-mozilla_dom_media_AudioStream.h) = a8f4160cc59c0cc92144dffb8fd468ad4d8ca70d
SHA1 (patch-mozilla_dom_media_moz.build) = 3d9719c07eed295f5054a59c1bffefa71df774f1
@@ -68,6 +75,7 @@
SHA1 (patch-mozilla_js_src_moz.build) = 9220c6c618b1db6f88fd58b27b9ae9f742d2602a
SHA1 (patch-mozilla_js_src_old-configure.in) = 8349fe3c700404c2c2d9512068edab9b097508c9
SHA1 (patch-mozilla_js_xpconnect_src_XPCConvert.cpp) = fb20844c866045677ce7b14099cf7a748d430f64
+SHA1 (patch-mozilla_js_xpconnect_src_XPCWrappedNative.cpp) = c188ceff949cfc83a1da047f3cdbc6fac506d57f
SHA1 (patch-mozilla_js_xpconnect_src_xpcprivate.h) = 4dc5838b1fe482aca023ce992ebf414ee39d0aef
SHA1 (patch-mozilla_media_libcubeb_src_cubeb.c) = 993d921016d126a3fbd139b212c35a09606d184c
SHA1 (patch-mozilla_media_libcubeb_src_cubeb__alsa.c) = 8139652f4d101135efe6ec379cbf89e83061c488
@@ -95,7 +103,7 @@
SHA1 (patch-mozilla_mozglue_build_arm.h) = 40d8d2039c68fc825857a3c970eec2f296275cc5
SHA1 (patch-mozilla_netwerk_dns_moz.build) = 4ee9fa2a3b33a0fb9ad4c0f883b084f6417b993f
SHA1 (patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c) = 389f94db5adf882d43c5cb601ec00659b460584b
-SHA1 (patch-mozilla_old-configure.in) = 651bc7aed6cea83ae21a1ac8febf13374ae8c854
+SHA1 (patch-mozilla_old-configure.in) = dcc972f0745cc93ba86712b09384f8040ecf3d73
SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm) = ba8e6e427374dbf9f5de695ead6014f560fb305e
SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__front.jsm) = 005ad5608501fdcdeb042715a69ea3073d62fc75
SHA1 (patch-mozilla_toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = bf5dc4c221f5822e38a62c6a848c01c65e65dd4d
diff -r 15a42725e431 -r 253577bec198 mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_ActorsParent.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_ActorsParent.cpp Thu Jun 17 11:01:19 2021 +0000
@@ -0,0 +1,106 @@
+$NetBSD: patch-mozilla_dom_indexedDB_ActorsParent.cpp,v 1.1 2021/06/17 11:01:19 nia Exp $
+
+Avoid macro conflict with NSS 3.66
+https://bugzilla.mozilla.org/show_bug.cgi?id=1714311
+
+--- mozilla/dom/indexedDB/ActorsParent.cpp.orig 2018-07-09 19:54:35.000000000 +0000
++++ mozilla/dom/indexedDB/ActorsParent.cpp
+@@ -11529,7 +11529,7 @@ AutoSavepoint::~AutoSavepoint()
+ MOZ_ASSERT(mDEBUGTransaction->GetMode() == IDBTransaction::READ_WRITE ||
+ mDEBUGTransaction->GetMode() ==
+ IDBTransaction::READ_WRITE_FLUSH ||
+- mDEBUGTransaction->GetMode() == IDBTransaction::CLEANUP ||
++ mDEBUGTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP ||
+ mDEBUGTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+
+ if (NS_FAILED(mConnection->RollbackSavepoint())) {
+@@ -11545,7 +11545,7 @@ AutoSavepoint::Start(const TransactionBa
+ MOZ_ASSERT(aTransaction);
+ MOZ_ASSERT(aTransaction->GetMode() == IDBTransaction::READ_WRITE ||
+ aTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
+- aTransaction->GetMode() == IDBTransaction::CLEANUP ||
++ aTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP ||
+ aTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+
+ DatabaseConnection* connection = aTransaction->GetDatabase()->GetConnection();
+@@ -14692,7 +14692,7 @@ Database::AllocPBackgroundIDBTransaction
+ if (NS_WARN_IF(aMode != IDBTransaction::READ_ONLY &&
+ aMode != IDBTransaction::READ_WRITE &&
+ aMode != IDBTransaction::READ_WRITE_FLUSH &&
+- aMode != IDBTransaction::CLEANUP)) {
++ aMode != IDBTransaction::TRANSACTION_CLEANUP)) {
+ ASSERT_UNLESS_FUZZING();
+ return nullptr;
+ }
+@@ -14701,7 +14701,7 @@ Database::AllocPBackgroundIDBTransaction
+ // has write access.
+ if (NS_WARN_IF((aMode == IDBTransaction::READ_WRITE ||
+ aMode == IDBTransaction::READ_WRITE_FLUSH ||
+- aMode == IDBTransaction::CLEANUP) &&
++ aMode == IDBTransaction::TRANSACTION_CLEANUP) &&
+ mPrincipalInfo.type() == PrincipalInfo::TSystemPrincipalInfo &&
+ !mChromeWriteAccessAllowed)) {
+ return nullptr;
+@@ -14767,7 +14767,7 @@ Database::RecvPBackgroundIDBTransactionC
+ MOZ_ASSERT(aMode == IDBTransaction::READ_ONLY ||
+ aMode == IDBTransaction::READ_WRITE ||
+ aMode == IDBTransaction::READ_WRITE_FLUSH ||
+- aMode == IDBTransaction::CLEANUP);
++ aMode == IDBTransaction::TRANSACTION_CLEANUP);
+ MOZ_ASSERT(!mClosed);
+
+ if (IsInvalidated()) {
+@@ -14926,7 +14926,7 @@ StartTransactionOp::DoDatabaseWork(Datab
+
+ Transaction()->SetActiveOnConnectionThread();
+
+- if (Transaction()->GetMode() == IDBTransaction::CLEANUP) {
++ if (Transaction()->GetMode() == IDBTransaction::TRANSACTION_CLEANUP) {
+ nsresult rv = aConnection->DisableQuotaChecks();
+ if (NS_WARN_IF(NS_FAILED(rv))) {
+ return rv;
+@@ -15245,7 +15245,7 @@ TransactionBase::VerifyRequestParams(con
+ case RequestParams::TObjectStoreDeleteParams: {
+ if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE &&
+ mMode != IDBTransaction::READ_WRITE_FLUSH &&
+- mMode != IDBTransaction::CLEANUP &&
++ mMode != IDBTransaction::TRANSACTION_CLEANUP &&
+ mMode != IDBTransaction::VERSION_CHANGE)) {
+ ASSERT_UNLESS_FUZZING();
+ return false;
+@@ -15269,7 +15269,7 @@ TransactionBase::VerifyRequestParams(con
+ case RequestParams::TObjectStoreClearParams: {
+ if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE &&
+ mMode != IDBTransaction::READ_WRITE_FLUSH &&
+- mMode != IDBTransaction::CLEANUP &&
++ mMode != IDBTransaction::TRANSACTION_CLEANUP &&
+ mMode != IDBTransaction::VERSION_CHANGE)) {
+ ASSERT_UNLESS_FUZZING();
+ return false;
+@@ -23959,7 +23959,7 @@ CommitOp::WriteAutoIncrementCounts()
+ mTransaction->AssertIsOnConnectionThread();
+ MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE ||
+ mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
+- mTransaction->GetMode() == IDBTransaction::CLEANUP ||
++ mTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP ||
+ mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+
+ const nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray =
+@@ -24027,7 +24027,7 @@ CommitOp::CommitOrRollbackAutoIncrementC
+ mTransaction->AssertIsOnConnectionThread();
+ MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE ||
+ mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
+- mTransaction->GetMode() == IDBTransaction::CLEANUP ||
++ mTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP ||
+ mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+
+ nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray =
+@@ -24161,7 +24161,7 @@ CommitOp::Run()
+
+ connection->FinishWriteTransaction();
+
+- if (mTransaction->GetMode() == IDBTransaction::CLEANUP) {
++ if (mTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP) {
+ connection->DoIdleProcessing(/* aNeedsCheckpoint */ true);
+
+ connection->EnableQuotaChecks();
diff -r 15a42725e431 -r 253577bec198 mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBCursor.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBCursor.cpp Thu Jun 17 11:01:19 2021 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-mozilla_dom_indexedDB_IDBCursor.cpp,v 1.1 2021/06/17 11:01:19 nia Exp $
+
+Avoid macro conflict with NSS 3.66
+https://bugzilla.mozilla.org/show_bug.cgi?id=1714311
+
+--- mozilla/dom/indexedDB/IDBCursor.cpp.orig 2018-07-09 19:54:35.000000000 +0000
++++ mozilla/dom/indexedDB/IDBCursor.cpp
+@@ -696,7 +696,7 @@ IDBCursor::Update(JSContext* aCx, JS::Ha
+ return nullptr;
+ }
+
+- if (mTransaction->GetMode() == IDBTransaction::CLEANUP ||
++ if (mTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP ||
+ IsSourceDeleted() ||
+ !mHaveValue ||
+ mType == Type_ObjectStoreKey ||
diff -r 15a42725e431 -r 253577bec198 mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBDatabase.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBDatabase.cpp Thu Jun 17 11:01:19 2021 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-mozilla_dom_indexedDB_IDBDatabase.cpp,v 1.1 2021/06/17 11:01:19 nia Exp $
+
+Avoid macro conflict with NSS 3.66
+https://bugzilla.mozilla.org/show_bug.cgi?id=1714311
+
+--- mozilla/dom/indexedDB/IDBDatabase.cpp.orig 2018-07-09 19:54:35.000000000 +0000
++++ mozilla/dom/indexedDB/IDBDatabase.cpp
+@@ -668,7 +668,7 @@ IDBDatabase::Transaction(JSContext* aCx,
+ break;
+ case IDBTransactionMode::Readwrite:
+ if (mQuotaExceeded) {
+- mode = IDBTransaction::CLEANUP;
++ mode = IDBTransaction::TRANSACTION_CLEANUP;
+ mQuotaExceeded = false;
+ } else {
+ mode = IDBTransaction::READ_WRITE;
+@@ -678,7 +678,7 @@ IDBDatabase::Transaction(JSContext* aCx,
+ mode = IDBTransaction::READ_WRITE_FLUSH;
+ break;
+ case IDBTransactionMode::Cleanup:
+- mode = IDBTransaction::CLEANUP;
++ mode = IDBTransaction::TRANSACTION_CLEANUP;
+ mQuotaExceeded = false;
+ break;
+ case IDBTransactionMode::Versionchange:
+@@ -713,7 +713,7 @@ IDBDatabase::Transaction(JSContext* aCx,
+
+ transaction->SetBackgroundActor(actor);
+
+- if (mode == IDBTransaction::CLEANUP) {
++ if (mode == IDBTransaction::TRANSACTION_CLEANUP) {
+ ExpireFileActors(/* aExpireAll */ true);
+ }
+
+@@ -863,7 +863,7 @@ IDBDatabase::AbortTransactions(bool aSho
+ // We warn for any transactions that could have written data.
+ case IDBTransaction::READ_WRITE:
+ case IDBTransaction::READ_WRITE_FLUSH:
+- case IDBTransaction::CLEANUP:
++ case IDBTransaction::TRANSACTION_CLEANUP:
+ case IDBTransaction::VERSION_CHANGE:
+ transactionsThatNeedWarning.AppendElement(transaction);
+ break;
diff -r 15a42725e431 -r 253577bec198 mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBObjectStore.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBObjectStore.cpp Thu Jun 17 11:01:19 2021 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-mozilla_dom_indexedDB_IDBObjectStore.cpp,v 1.1 2021/06/17 11:01:19 nia Exp $
+
+Avoid macro conflict with NSS 3.66
+https://bugzilla.mozilla.org/show_bug.cgi?id=1714311
+
+--- mozilla/dom/indexedDB/IDBObjectStore.cpp.orig 2018-07-09 19:54:35.000000000 +0000
++++ mozilla/dom/indexedDB/IDBObjectStore.cpp
+@@ -1406,7 +1406,7 @@ IDBObjectStore::AddOrPut(JSContext* aCx,
+ MOZ_ASSERT(aCx);
+ MOZ_ASSERT_IF(aFromCursor, aOverwrite);
+
+- if (mTransaction->GetMode() == IDBTransaction::CLEANUP ||
++ if (mTransaction->GetMode() == IDBTransaction::TRANSACTION_CLEANUP ||
+ mDeletedSpec) {
+ aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR);
+ return nullptr;
diff -r 15a42725e431 -r 253577bec198 mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBTransaction.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBTransaction.cpp Thu Jun 17 11:01:19 2021 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-mozilla_dom_indexedDB_IDBTransaction.cpp,v 1.1 2021/06/17 11:01:19 nia Exp $
+
+Avoid macro conflict with NSS 3.66
+https://bugzilla.mozilla.org/show_bug.cgi?id=1714311
+
+--- mozilla/dom/indexedDB/IDBTransaction.cpp.orig 2018-07-09 19:54:35.000000000 +0000
++++ mozilla/dom/indexedDB/IDBTransaction.cpp
+@@ -216,7 +216,7 @@ IDBTransaction::Create(JSContext* aCx, I
+ MOZ_ASSERT(aMode == READ_ONLY ||
+ aMode == READ_WRITE ||
+ aMode == READ_WRITE_FLUSH ||
+- aMode == CLEANUP);
++ aMode == TRANSACTION_CLEANUP);
+
+ RefPtr<IDBTransaction> transaction =
+ new IDBTransaction(aDatabase, aObjectStoreNames, aMode);
+@@ -871,7 +871,7 @@ IDBTransaction::GetMode(ErrorResult& aRv
+ case READ_WRITE_FLUSH:
+ return IDBTransactionMode::Readwriteflush;
+
+- case CLEANUP:
++ case TRANSACTION_CLEANUP:
+ return IDBTransactionMode::Cleanup;
+
+ case VERSION_CHANGE:
diff -r 15a42725e431 -r 253577bec198 mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBTransaction.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_IDBTransaction.h Thu Jun 17 11:01:19 2021 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-mozilla_dom_indexedDB_IDBTransaction.h,v 1.1 2021/06/17 11:01:19 nia Exp $
+
+Avoid macro conflict with NSS 3.66
+https://bugzilla.mozilla.org/show_bug.cgi?id=1714311
+
+--- mozilla/dom/indexedDB/IDBTransaction.h.orig 2018-07-09 19:54:35.000000000 +0000
++++ mozilla/dom/indexedDB/IDBTransaction.h
+@@ -59,7 +59,7 @@ public:
+ READ_ONLY = 0,
+ READ_WRITE,
+ READ_WRITE_FLUSH,
+- CLEANUP,
++ TRANSACTION_CLEANUP,
+ VERSION_CHANGE,
+
+ // Only needed for IPC serialization helper, should never be used in code.
+@@ -189,7 +189,7 @@ public:
+ AssertIsOnOwningThread();
+ return mMode == READ_WRITE ||
+ mMode == READ_WRITE_FLUSH ||
+- mMode == CLEANUP ||
++ mMode == TRANSACTION_CLEANUP ||
+ mMode == VERSION_CHANGE;
+ }
+
diff -r 15a42725e431 -r 253577bec198 mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_ProfilerHelpers.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/thunderbird52/patches/patch-mozilla_dom_indexedDB_ProfilerHelpers.h Thu Jun 17 11:01:19 2021 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-mozilla_dom_indexedDB_ProfilerHelpers.h,v 1.1 2021/06/17 11:01:19 nia Exp $
Home |
Main Index |
Thread Index |
Old Index