pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/firefox52 firefox52: fix compatibility with newer NSS
details: https://anonhg.NetBSD.org/pkgsrc/rev/6b876963c43f
branches: trunk
changeset: 454742:6b876963c43f
user: nia <nia%pkgsrc.org@localhost>
date: Wed Jun 16 22:21:12 2021 +0000
description:
firefox52: fix compatibility with newer NSS
diffstat:
www/firefox52/distinfo | 9 +-
www/firefox52/patches/patch-dom_indexedDB_ActorsParent.cpp | 106 +++++++++++
www/firefox52/patches/patch-dom_indexedDB_IDBCursor.cpp | 16 +
www/firefox52/patches/patch-dom_indexedDB_IDBDatabase.cpp | 43 ++++
www/firefox52/patches/patch-dom_indexedDB_IDBObjectStore.cpp | 16 +
www/firefox52/patches/patch-dom_indexedDB_IDBTransaction.cpp | 25 ++
www/firefox52/patches/patch-dom_indexedDB_IDBTransaction.h | 25 ++
www/firefox52/patches/patch-dom_indexedDB_ProfilerHelpers.h | 16 +
8 files changed, 255 insertions(+), 1 deletions(-)
diffs (298 lines):
diff -r 301bac939015 -r 6b876963c43f www/firefox52/distinfo
--- a/www/firefox52/distinfo Wed Jun 16 21:16:03 2021 +0000
+++ b/www/firefox52/distinfo Wed Jun 16 22:21:12 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2021/04/01 15:28:10 martin Exp $
+$NetBSD: distinfo,v 1.27 2021/06/16 22:21:12 nia Exp $
SHA1 (firefox-52.9.0esr.source.tar.xz) = df3d47518b380fe934e32a288515c25435fd82a7
RMD160 (firefox-52.9.0esr.source.tar.xz) = 8940269f0a515c0066b6ab2eea1da8963d27617b
@@ -22,6 +22,13 @@
SHA1 (patch-config_system-headers) = fd0cb4d2061af1eaa34313370a57720ed693607f
SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
SHA1 (patch-dom_base_moz.build) = 5200cbfcf7b781324dca4c55d01bc8559a56aa4c
+SHA1 (patch-dom_indexedDB_ActorsParent.cpp) = 5eeafe1639727cfb956b335f75c6b9d5dd4843e8
+SHA1 (patch-dom_indexedDB_IDBCursor.cpp) = 41bc07e0861c89a674cc8b9fad23f031da7629c4
+SHA1 (patch-dom_indexedDB_IDBDatabase.cpp) = 8e60c01d30b5a206a62c68a87ee4976999201e6f
+SHA1 (patch-dom_indexedDB_IDBObjectStore.cpp) = 0ce3c975feed6a7eb7e981130263c36bce40b652
+SHA1 (patch-dom_indexedDB_IDBTransaction.cpp) = f823117c34c83796c322bd0a8910e3acd3af693a
+SHA1 (patch-dom_indexedDB_IDBTransaction.h) = 3dc33da5ccaec983154bc1fae681954976e45f2c
+SHA1 (patch-dom_indexedDB_ProfilerHelpers.h) = 951d8752a3c6dd1c8d1104c0e813ce5914273dcd
SHA1 (patch-dom_media_AudioStream.cpp) = 3d2e3d92849a355c05d7ec0ded61d551ffe0c581
SHA1 (patch-dom_media_AudioStream.h) = 26f70000cc4810834204d15b45e1469dd5f23617
SHA1 (patch-dom_media_moz.build) = 844dbb94463b8aab11649a5aa11142de0179d86c
diff -r 301bac939015 -r 6b876963c43f www/firefox52/patches/patch-dom_indexedDB_ActorsParent.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox52/patches/patch-dom_indexedDB_ActorsParent.cpp Wed Jun 16 22:21:12 2021 +0000
@@ -0,0 +1,106 @@
+$NetBSD: patch-dom_indexedDB_ActorsParent.cpp,v 1.1 2021/06/16 22:21:12 nia Exp $
+
+Avoid macro conflict with NSS 3.66
+https://bugzilla.mozilla.org/show_bug.cgi?id=1714311
+
+--- dom/indexedDB/ActorsParent.cpp.orig 2018-06-21 18:53:54.000000000 +0000
++++ 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 301bac939015 -r 6b876963c43f www/firefox52/patches/patch-dom_indexedDB_IDBCursor.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox52/patches/patch-dom_indexedDB_IDBCursor.cpp Wed Jun 16 22:21:12 2021 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-dom_indexedDB_IDBCursor.cpp,v 1.1 2021/06/16 22:21:12 nia Exp $
+
+Avoid macro conflict with NSS 3.66
+https://bugzilla.mozilla.org/show_bug.cgi?id=1714311
+
+--- dom/indexedDB/IDBCursor.cpp.orig 2017-04-11 02:13:20.000000000 +0000
++++ 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 301bac939015 -r 6b876963c43f www/firefox52/patches/patch-dom_indexedDB_IDBDatabase.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox52/patches/patch-dom_indexedDB_IDBDatabase.cpp Wed Jun 16 22:21:12 2021 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-dom_indexedDB_IDBDatabase.cpp,v 1.1 2021/06/16 22:21:12 nia Exp $
+
+Avoid macro conflict with NSS 3.66
+https://bugzilla.mozilla.org/show_bug.cgi?id=1714311
+
+--- dom/indexedDB/IDBDatabase.cpp.orig 2017-04-11 02:13:20.000000000 +0000
++++ 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 301bac939015 -r 6b876963c43f www/firefox52/patches/patch-dom_indexedDB_IDBObjectStore.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox52/patches/patch-dom_indexedDB_IDBObjectStore.cpp Wed Jun 16 22:21:12 2021 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-dom_indexedDB_IDBObjectStore.cpp,v 1.1 2021/06/16 22:21:12 nia Exp $
+
+Avoid macro conflict with NSS 3.66
+https://bugzilla.mozilla.org/show_bug.cgi?id=1714311
+
+--- dom/indexedDB/IDBObjectStore.cpp.orig 2018-06-21 18:53:54.000000000 +0000
++++ 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 301bac939015 -r 6b876963c43f www/firefox52/patches/patch-dom_indexedDB_IDBTransaction.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox52/patches/patch-dom_indexedDB_IDBTransaction.cpp Wed Jun 16 22:21:12 2021 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-dom_indexedDB_IDBTransaction.cpp,v 1.1 2021/06/16 22:21:12 nia Exp $
+
+Avoid macro conflict with NSS 3.66
+https://bugzilla.mozilla.org/show_bug.cgi?id=1714311
+
+--- dom/indexedDB/IDBTransaction.cpp.orig 2017-04-11 02:13:20.000000000 +0000
++++ 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 301bac939015 -r 6b876963c43f www/firefox52/patches/patch-dom_indexedDB_IDBTransaction.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox52/patches/patch-dom_indexedDB_IDBTransaction.h Wed Jun 16 22:21:12 2021 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-dom_indexedDB_IDBTransaction.h,v 1.1 2021/06/16 22:21:12 nia Exp $
+
+Avoid macro conflict with NSS 3.66
+https://bugzilla.mozilla.org/show_bug.cgi?id=1714311
+
+--- dom/indexedDB/IDBTransaction.h.orig 2017-04-11 02:13:20.000000000 +0000
++++ 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 301bac939015 -r 6b876963c43f www/firefox52/patches/patch-dom_indexedDB_ProfilerHelpers.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox52/patches/patch-dom_indexedDB_ProfilerHelpers.h Wed Jun 16 22:21:12 2021 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-dom_indexedDB_ProfilerHelpers.h,v 1.1 2021/06/16 22:21:12 nia Exp $
+
+Avoid macro conflict with NSS 3.66
+https://bugzilla.mozilla.org/show_bug.cgi?id=1714311
+
+--- dom/indexedDB/ProfilerHelpers.h.orig 2017-04-11 02:13:20.000000000 +0000
++++ dom/indexedDB/ProfilerHelpers.h
+@@ -129,7 +129,7 @@ public:
+ case IDBTransaction::READ_WRITE_FLUSH:
+ AppendLiteral("\"readwriteflush\"");
+ break;
+- case IDBTransaction::CLEANUP:
++ case IDBTransaction::TRANSACTION_CLEANUP:
+ AppendLiteral("\"cleanup\"");
+ break;
+ case IDBTransaction::VERSION_CHANGE:
Home |
Main Index |
Thread Index |
Old Index