Date: Friday, October 15, 2021 @ 19:04:11 Author: arojas Revision: 1030321
libffi 3.4 rebuild Added: bluegriffon/trunk/bluegriffon-gcc11.patch Modified: bluegriffon/trunk/PKGBUILD -------------------------+ PKGBUILD | 11 +- bluegriffon-gcc11.patch | 238 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 246 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-10-15 19:03:22 UTC (rev 1030320) +++ PKGBUILD 2021-10-15 19:04:11 UTC (rev 1030321) @@ -5,7 +5,7 @@ pkgname=(bluegriffon) pkgver=3.1 _gecko_dev_revision=042b84a # see config/gecko_dev_revision.txt -pkgrel=13 +pkgrel=14 pkgdesc="The next-generation Web Editor based on the rendering engine of Firefox" arch=('x86_64') url="http://bluegriffon.org/" @@ -26,7 +26,8 @@ "libstagefright-format-overflow.patch" "no-crmf.diff" "fix-rust-lifetime-issue.patch" - "rust-explitcit-dyn.patch") + "rust-explitcit-dyn.patch" + "bluegriffon-gcc11.patch") sha256sums=('4fb9b29f00ff4e94e78994308ffa52bce818978009e0d8229203d6ac4210b0f4' '01096e58c898e1b37cba581e1cc0f325d1c402091ccc4a2491543b39add40c6c' 'd589572a0e36b8500ed12937727e540a13b635c7ac12621a10ff675250b61175' @@ -40,7 +41,8 @@ '28949cfeb646e48eb41669b64971ee69fce28ece580be145a1cd9540b3fd2ab5' '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873' '6726dce0ceabbb0893f8776168f20c15777a27e108e8ca46b1e39d5945d2c008' - '76d54fe6f5a5a50065b1d23f6a6bc4b057d4944bfab5d8ee3bb7faef4e30c334') + '76d54fe6f5a5a50065b1d23f6a6bc4b057d4944bfab5d8ee3bb7faef4e30c334' + '4352eda9c09e6b087243961ae1a6ae8b26bd573aa5282c51ff7d1aeb5a5d8cff') prepare() { mkdir path @@ -76,6 +78,9 @@ patch -Np1 -i ../glibc-2.32.patch patch -Np1 -i ../libstagefright-format-overflow.patch + # gcc11 fixes + patch -Np1 -i ../bluegriffon-gcc11.patch + # Move files to their correct location cp -r "${srcdir}/${pkgbase}-${pkgver}" bluegriffon cp "${srcdir}/mozconfig" .mozconfig Added: bluegriffon-gcc11.patch =================================================================== --- bluegriffon-gcc11.patch (rev 0) +++ bluegriffon-gcc11.patch 2021-10-15 19:04:11 UTC (rev 1030321) @@ -0,0 +1,238 @@ +diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp +index 0a4e036ae1da..bcec5e2b5abc 100644 +--- a/dom/indexedDB/ActorsParent.cpp ++++ b/dom/indexedDB/ActorsParent.cpp +@@ -11592,7 +11592,7 @@ AutoSavepoint::~AutoSavepoint() + MOZ_ASSERT(mDEBUGTransaction->GetMode() == IDBTransaction::READ_WRITE || + mDEBUGTransaction->GetMode() == + IDBTransaction::READ_WRITE_FLUSH || +- mDEBUGTransaction->GetMode() == IDBTransaction::CLEANUP || ++ mDEBUGTransaction->GetMode() == IDBTransaction::Cleanup || + mDEBUGTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + if (NS_FAILED(mConnection->RollbackSavepoint())) { +@@ -11608,7 +11608,7 @@ AutoSavepoint::Start(const TransactionBase* aTransaction) + MOZ_ASSERT(aTransaction); + MOZ_ASSERT(aTransaction->GetMode() == IDBTransaction::READ_WRITE || + aTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH || +- aTransaction->GetMode() == IDBTransaction::CLEANUP || ++ aTransaction->GetMode() == IDBTransaction::Cleanup || + aTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + DatabaseConnection* connection = aTransaction->GetDatabase()->GetConnection(); +@@ -14742,7 +14742,7 @@ Database::AllocPBackgroundIDBTransactionParent( + if (NS_WARN_IF(aMode != IDBTransaction::READ_ONLY && + aMode != IDBTransaction::READ_WRITE && + aMode != IDBTransaction::READ_WRITE_FLUSH && +- aMode != IDBTransaction::CLEANUP)) { ++ aMode != IDBTransaction::Cleanup)) { + ASSERT_UNLESS_FUZZING(); + return nullptr; + } +@@ -14751,7 +14751,7 @@ Database::AllocPBackgroundIDBTransactionParent( + // has write access. + if (NS_WARN_IF((aMode == IDBTransaction::READ_WRITE || + aMode == IDBTransaction::READ_WRITE_FLUSH || +- aMode == IDBTransaction::CLEANUP) && ++ aMode == IDBTransaction::Cleanup) && + mPrincipalInfo.type() == PrincipalInfo::TSystemPrincipalInfo && + !mChromeWriteAccessAllowed)) { + return nullptr; +@@ -14817,7 +14817,7 @@ Database::RecvPBackgroundIDBTransactionConstructor( + MOZ_ASSERT(aMode == IDBTransaction::READ_ONLY || + aMode == IDBTransaction::READ_WRITE || + aMode == IDBTransaction::READ_WRITE_FLUSH || +- aMode == IDBTransaction::CLEANUP); ++ aMode == IDBTransaction::Cleanup); + MOZ_ASSERT(!mClosed); + + if (IsInvalidated()) { +@@ -14980,7 +14980,7 @@ StartTransactionOp::DoDatabaseWork(DatabaseConnection* aConnection) + + Transaction()->SetActiveOnConnectionThread(); + +- if (Transaction()->GetMode() == IDBTransaction::CLEANUP) { ++ if (Transaction()->GetMode() == IDBTransaction::Cleanup) { + nsresult rv = aConnection->DisableQuotaChecks(); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; +@@ -15299,7 +15299,7 @@ TransactionBase::VerifyRequestParams(const RequestParams& aParams) const + case RequestParams::TObjectStoreDeleteParams: { + if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE && + mMode != IDBTransaction::READ_WRITE_FLUSH && +- mMode != IDBTransaction::CLEANUP && ++ mMode != IDBTransaction::Cleanup && + mMode != IDBTransaction::VERSION_CHANGE)) { + ASSERT_UNLESS_FUZZING(); + return false; +@@ -15323,7 +15323,7 @@ TransactionBase::VerifyRequestParams(const RequestParams& aParams) const + case RequestParams::TObjectStoreClearParams: { + if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE && + mMode != IDBTransaction::READ_WRITE_FLUSH && +- mMode != IDBTransaction::CLEANUP && ++ mMode != IDBTransaction::Cleanup && + mMode != IDBTransaction::VERSION_CHANGE)) { + ASSERT_UNLESS_FUZZING(); + return false; +@@ -23944,7 +23944,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::Cleanup || + mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + const nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray = +@@ -24012,7 +24012,7 @@ CommitOp::CommitOrRollbackAutoIncrementCounts() + mTransaction->AssertIsOnConnectionThread(); + MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE || + mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH || +- mTransaction->GetMode() == IDBTransaction::CLEANUP || ++ mTransaction->GetMode() == IDBTransaction::Cleanup || + mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray = +@@ -24146,7 +24146,7 @@ CommitOp::Run() + + connection->FinishWriteTransaction(); + +- if (mTransaction->GetMode() == IDBTransaction::CLEANUP) { ++ if (mTransaction->GetMode() == IDBTransaction::Cleanup) { + connection->DoIdleProcessing(/* aNeedsCheckpoint */ true); + + connection->EnableQuotaChecks(); +diff --git a/dom/indexedDB/IDBCursor.cpp b/dom/indexedDB/IDBCursor.cpp +index 32fba11097fb..91691050d5ef 100644 +--- a/dom/indexedDB/IDBCursor.cpp ++++ b/dom/indexedDB/IDBCursor.cpp +@@ -696,7 +696,7 @@ IDBCursor::Update(JSContext* aCx, JS::Handle<JS::Value> aValue, + return nullptr; + } + +- if (mTransaction->GetMode() == IDBTransaction::CLEANUP || ++ if (mTransaction->GetMode() == IDBTransaction::Cleanup || + IsSourceDeleted() || + !mHaveValue || + mType == Type_ObjectStoreKey || +diff --git a/dom/indexedDB/IDBDatabase.cpp b/dom/indexedDB/IDBDatabase.cpp +index e05c6d05f177..0aecdb637047 100644 +--- a/dom/indexedDB/IDBDatabase.cpp ++++ b/dom/indexedDB/IDBDatabase.cpp +@@ -675,7 +675,7 @@ IDBDatabase::Transaction(JSContext* aCx, + break; + case IDBTransactionMode::Readwrite: + if (mQuotaExceeded) { +- mode = IDBTransaction::CLEANUP; ++ mode = IDBTransaction::Cleanup; + mQuotaExceeded = false; + } else { + mode = IDBTransaction::READ_WRITE; +@@ -685,7 +685,7 @@ IDBDatabase::Transaction(JSContext* aCx, + mode = IDBTransaction::READ_WRITE_FLUSH; + break; + case IDBTransactionMode::Cleanup: +- mode = IDBTransaction::CLEANUP; ++ mode = IDBTransaction::Cleanup; + mQuotaExceeded = false; + break; + case IDBTransactionMode::Versionchange: +@@ -722,7 +722,7 @@ IDBDatabase::Transaction(JSContext* aCx, + + transaction->SetBackgroundActor(actor); + +- if (mode == IDBTransaction::CLEANUP) { ++ if (mode == IDBTransaction::Cleanup) { + ExpireFileActors(/* aExpireAll */ true); + } + +@@ -875,7 +875,7 @@ IDBDatabase::AbortTransactions(bool aShouldWarn) + // We warn for any transactions that could have written data. + case IDBTransaction::READ_WRITE: + case IDBTransaction::READ_WRITE_FLUSH: +- case IDBTransaction::CLEANUP: ++ case IDBTransaction::Cleanup: + case IDBTransaction::VERSION_CHANGE: + transactionsThatNeedWarning.AppendElement(transaction); + break; +diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp +index 2e2c7942d7e7..171d4435c770 100644 +--- a/dom/indexedDB/IDBObjectStore.cpp ++++ b/dom/indexedDB/IDBObjectStore.cpp +@@ -1404,7 +1404,7 @@ IDBObjectStore::AddOrPut(JSContext* aCx, + MOZ_ASSERT(aCx); + MOZ_ASSERT_IF(aFromCursor, aOverwrite); + +- if (mTransaction->GetMode() == IDBTransaction::CLEANUP || ++ if (mTransaction->GetMode() == IDBTransaction::Cleanup || + mDeletedSpec) { + aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR); + return nullptr; +diff --git a/dom/indexedDB/IDBTransaction.cpp b/dom/indexedDB/IDBTransaction.cpp +index 0eaedcb33bf5..d9bab20096ae 100644 +--- a/dom/indexedDB/IDBTransaction.cpp ++++ b/dom/indexedDB/IDBTransaction.cpp +@@ -216,7 +216,7 @@ IDBTransaction::Create(JSContext* aCx, IDBDatabase* aDatabase, + MOZ_ASSERT(aMode == READ_ONLY || + aMode == READ_WRITE || + aMode == READ_WRITE_FLUSH || +- aMode == CLEANUP); ++ aMode == Cleanup); + + RefPtr<IDBTransaction> transaction = + new IDBTransaction(aDatabase, aObjectStoreNames, aMode); +@@ -877,7 +877,7 @@ IDBTransaction::GetMode(ErrorResult& aRv) const + case READ_WRITE_FLUSH: + return IDBTransactionMode::Readwriteflush; + +- case CLEANUP: ++ case Cleanup: + return IDBTransactionMode::Cleanup; + + case VERSION_CHANGE: +diff --git a/dom/indexedDB/IDBTransaction.h b/dom/indexedDB/IDBTransaction.h +index 5a893ca20d57..509288b9995f 100644 +--- a/dom/indexedDB/IDBTransaction.h ++++ b/dom/indexedDB/IDBTransaction.h +@@ -59,7 +59,7 @@ public: + READ_ONLY = 0, + READ_WRITE, + READ_WRITE_FLUSH, +- CLEANUP, ++ 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 == Cleanup || + mMode == VERSION_CHANGE; + } + +diff --git a/dom/indexedDB/ProfilerHelpers.h b/dom/indexedDB/ProfilerHelpers.h +index aec65c4e75b1..57ff8f685d44 100644 +--- a/dom/indexedDB/ProfilerHelpers.h ++++ b/dom/indexedDB/ProfilerHelpers.h +@@ -129,7 +129,7 @@ public: + case IDBTransaction::READ_WRITE_FLUSH: + AppendLiteral("\"readwriteflush\""); + break; +- case IDBTransaction::CLEANUP: ++ case IDBTransaction::Cleanup: + AppendLiteral("\"cleanup\""); + break; + case IDBTransaction::VERSION_CHANGE: +diff --git a/gfx/2d/BaseRect.h b/gfx/2d/BaseRect.h +index 3be42f4ba4a5..dd9eb1bb5b45 100644 +--- a/gfx/2d/BaseRect.h ++++ b/gfx/2d/BaseRect.h +@@ -8,6 +8,7 @@ + + #include <algorithm> + #include <cmath> ++#include <limits> + #include <ostream> + + #include "mozilla/Assertions.h"