diff options
| -rw-r--r-- | waterfox/debian/changelog | 6 | ||||
| -rw-r--r-- | waterfox/debian/waterfox+devuan.dsc | 4 | ||||
| -rw-r--r-- | waterfox/seamonkey-2.53.7.1-CLEANUP-workaround.patch | 212 | ||||
| -rw-r--r-- | waterfox/waterfox.spec | 33 |
4 files changed, 243 insertions, 12 deletions
diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog index 21ed4d7..7e6cd26 100644 --- a/waterfox/debian/changelog +++ b/waterfox/debian/changelog @@ -1,3 +1,9 @@ +waterfox (2021.06-1+devuan) obs; urgency=medium + + - latest version + + -- B. Stack <bgstack15@gmail.com> Tue, 15 Jun 2021 11:02:50 -0400 + waterfox (2021.04.2-1+devuan) obs; urgency=medium - latest version diff --git a/waterfox/debian/waterfox+devuan.dsc b/waterfox/debian/waterfox+devuan.dsc index 355356f..e043211 100644 --- a/waterfox/debian/waterfox+devuan.dsc +++ b/waterfox/debian/waterfox+devuan.dsc @@ -2,8 +2,8 @@ Format: 3.0 (quilt) Source: waterfox Binary: waterfox Architecture: any -Version: 2021.04-2+devuan -Maintainer: B Stack <bgstack15@gmail.com> +Version: 2021.06-1+devuan +Maintainer: B. Stack <bgstack15@gmail.com> Homepage: https://www.waterfox.net/ Standards-Version: 4.1.4 Build-Depends: debhelper (>= 12), autoconf2.13, autotools-dev, binutils-avr, cargo (>= 0.35), ccache, clang (>= 4.0) | clang-4.0 | clang-6.0 | clang-7, dpkg-dev (>= 1.16.1.1~), libasound2-dev, libbz2-dev, libclang-dev (>= 4.0) | libclang-4.0-dev | libclang-6.0-dev | libclang-7-dev, libdbus-glib-1-dev, libevent-dev (>= 1.4.1), libgconf2-dev, libglib2.0-dev (>= 2.16.0), libgtk2.0-dev (>= 2.10), libgtk-3-dev, libiw-dev, libjpeg-dev, libjsoncpp-dev, libnotify-dev, libreadline-dev, libstartup-notification0-dev, libtinfo-dev, libx11-dev, libx11-xcb-dev, libxt-dev, llvm-dev (>= 4.0) | llvm-4.0-dev | llvm-6.0-dev | llvm-7-dev, locales, lsb-release, nasm (>= 2.13), python2 (>= 2.7.18-2~) | python (>= 2.7), python-ply, rustc (>= 1.34), unzip, xauth, xfonts-base, xvfb, yasm (>= 1.1), zip, zlib1g-dev, libfontconfig-dev diff --git a/waterfox/seamonkey-2.53.7.1-CLEANUP-workaround.patch b/waterfox/seamonkey-2.53.7.1-CLEANUP-workaround.patch new file mode 100644 index 0000000..d61341b --- /dev/null +++ b/waterfox/seamonkey-2.53.7.1-CLEANUP-workaround.patch @@ -0,0 +1,212 @@ +--- seamonkey-2.53.7.1/dom/indexedDB/ActorsParent.cpp ++++ seamonkey-2.53.7.1/dom/indexedDB/ActorsParent.cpp +@@ -11381,7 +11381,7 @@ AutoSavepoint::~AutoSavepoint() + MOZ_ASSERT(mDEBUGTransaction->GetMode() == IDBTransaction::READ_WRITE || + mDEBUGTransaction->GetMode() == + IDBTransaction::READ_WRITE_FLUSH || +- mDEBUGTransaction->GetMode() == IDBTransaction::CLEANUP || ++ mDEBUGTransaction->GetMode() == IDBTransaction::CLEAN_UP || + mDEBUGTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + if (NS_FAILED(mConnection->RollbackSavepoint())) { +@@ -11397,7 +11397,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::CLEAN_UP || + aTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + DatabaseConnection* connection = aTransaction->GetDatabase()->GetConnection(); +@@ -14540,7 +14540,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::CLEAN_UP)) { + ASSERT_UNLESS_FUZZING(); + return nullptr; + } +@@ -14549,7 +14549,7 @@ Database::AllocPBackgroundIDBTransaction + // has write access. + if (NS_WARN_IF((aMode == IDBTransaction::READ_WRITE || + aMode == IDBTransaction::READ_WRITE_FLUSH || +- aMode == IDBTransaction::CLEANUP) && ++ aMode == IDBTransaction::CLEAN_UP) && + mPrincipalInfo.type() == PrincipalInfo::TSystemPrincipalInfo && + !mChromeWriteAccessAllowed)) { + return nullptr; +@@ -14615,7 +14615,7 @@ Database::RecvPBackgroundIDBTransactionC + MOZ_ASSERT(aMode == IDBTransaction::READ_ONLY || + aMode == IDBTransaction::READ_WRITE || + aMode == IDBTransaction::READ_WRITE_FLUSH || +- aMode == IDBTransaction::CLEANUP); ++ aMode == IDBTransaction::CLEAN_UP); + MOZ_ASSERT(!mClosed); + + if (IsInvalidated()) { +@@ -14778,7 +14778,7 @@ StartTransactionOp::DoDatabaseWork(Datab + + Transaction()->SetActiveOnConnectionThread(); + +- if (Transaction()->GetMode() == IDBTransaction::CLEANUP) { ++ if (Transaction()->GetMode() == IDBTransaction::CLEAN_UP) { + nsresult rv = aConnection->DisableQuotaChecks(); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; +@@ -15097,7 +15097,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::CLEAN_UP && + mMode != IDBTransaction::VERSION_CHANGE)) { + ASSERT_UNLESS_FUZZING(); + return false; +@@ -15121,7 +15121,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::CLEAN_UP && + mMode != IDBTransaction::VERSION_CHANGE)) { + ASSERT_UNLESS_FUZZING(); + return false; +@@ -23880,7 +23880,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::CLEAN_UP || + mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + const nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray = +@@ -23948,7 +23948,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::CLEAN_UP || + mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray = +@@ -24080,7 +24080,7 @@ CommitOp::Run() + + connection->FinishWriteTransaction(); + +- if (mTransaction->GetMode() == IDBTransaction::CLEANUP) { ++ if (mTransaction->GetMode() == IDBTransaction::CLEAN_UP) { + connection->DoIdleProcessing(/* aNeedsCheckpoint */ true); + + connection->EnableQuotaChecks(); +--- seamonkey-2.53.7.1/dom/indexedDB/IDBCursor.cpp ++++ seamonkey-2.53.7.1/dom/indexedDB/IDBCursor.cpp +@@ -686,7 +686,7 @@ IDBCursor::Update(JSContext* aCx, JS::Ha + return nullptr; + } + +- if (mTransaction->GetMode() == IDBTransaction::CLEANUP || ++ if (mTransaction->GetMode() == IDBTransaction::CLEAN_UP || + IsSourceDeleted() || + !mHaveValue || + mType == Type_ObjectStoreKey || +--- seamonkey-2.53.7.1/dom/indexedDB/IDBDatabase.cpp ++++ seamonkey-2.53.7.1/dom/indexedDB/IDBDatabase.cpp +@@ -673,7 +673,7 @@ IDBDatabase::Transaction(JSContext* aCx, + break; + case IDBTransactionMode::Readwrite: + if (mQuotaExceeded) { +- mode = IDBTransaction::CLEANUP; ++ mode = IDBTransaction::CLEAN_UP; + mQuotaExceeded = false; + } else { + mode = IDBTransaction::READ_WRITE; +@@ -683,7 +683,7 @@ IDBDatabase::Transaction(JSContext* aCx, + mode = IDBTransaction::READ_WRITE_FLUSH; + break; + case IDBTransactionMode::Cleanup: +- mode = IDBTransaction::CLEANUP; ++ mode = IDBTransaction::CLEAN_UP; + mQuotaExceeded = false; + break; + case IDBTransactionMode::Versionchange: +@@ -717,7 +717,7 @@ IDBDatabase::Transaction(JSContext* aCx, + + transaction->SetBackgroundActor(actor); + +- if (mode == IDBTransaction::CLEANUP) { ++ if (mode == IDBTransaction::CLEAN_UP) { + ExpireFileActors(/* aExpireAll */ true); + } + +@@ -870,7 +870,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::CLEAN_UP: + case IDBTransaction::VERSION_CHANGE: + transactionsThatNeedWarning.AppendElement(transaction); + break; +--- seamonkey-2.53.7.1/dom/indexedDB/IDBObjectStore.cpp ++++ seamonkey-2.53.7.1/dom/indexedDB/IDBObjectStore.cpp +@@ -1546,7 +1546,7 @@ IDBObjectStore::AddOrPut(JSContext* aCx, + MOZ_ASSERT(aCx); + MOZ_ASSERT_IF(aFromCursor, aOverwrite); + +- if (mTransaction->GetMode() == IDBTransaction::CLEANUP || ++ if (mTransaction->GetMode() == IDBTransaction::CLEAN_UP || + mDeletedSpec) { + aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR); + return nullptr; +--- seamonkey-2.53.7.1/dom/indexedDB/IDBTransaction.cpp ++++ seamonkey-2.53.7.1/dom/indexedDB/IDBTransaction.cpp +@@ -221,7 +221,7 @@ IDBTransaction::Create(JSContext* aCx, I + MOZ_ASSERT(aMode == READ_ONLY || + aMode == READ_WRITE || + aMode == READ_WRITE_FLUSH || +- aMode == CLEANUP); ++ aMode == CLEAN_UP); + + RefPtr<IDBTransaction> transaction = + new IDBTransaction(aDatabase, aObjectStoreNames, aMode); +@@ -913,7 +913,7 @@ IDBTransaction::GetMode(ErrorResult& aRv + case READ_WRITE_FLUSH: + return IDBTransactionMode::Readwriteflush; + +- case CLEANUP: ++ case CLEAN_UP: + return IDBTransactionMode::Cleanup; + + case VERSION_CHANGE: +--- seamonkey-2.53.7.1/dom/indexedDB/IDBTransaction.h ++++ seamonkey-2.53.7.1/dom/indexedDB/IDBTransaction.h +@@ -59,7 +59,7 @@ public: + READ_ONLY = 0, + READ_WRITE, + READ_WRITE_FLUSH, +- CLEANUP, ++ CLEAN_UP, + VERSION_CHANGE, + + // Only needed for IPC serialization helper, should never be used in code. +@@ -194,7 +194,7 @@ public: + AssertIsOnOwningThread(); + return mMode == READ_WRITE || + mMode == READ_WRITE_FLUSH || +- mMode == CLEANUP || ++ mMode == CLEAN_UP || + mMode == VERSION_CHANGE; + } + +--- seamonkey-2.53.7.1/dom/indexedDB/ProfilerHelpers.h ++++ seamonkey-2.53.7.1/dom/indexedDB/ProfilerHelpers.h +@@ -130,7 +130,7 @@ public: + case IDBTransaction::READ_WRITE_FLUSH: + AppendLiteral("\"readwriteflush\""); + break; +- case IDBTransaction::CLEANUP: ++ case IDBTransaction::CLEAN_UP: + AppendLiteral("\"cleanup\""); + break; + case IDBTransaction::VERSION_CHANGE: diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 555837b..b7d6799 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -166,7 +166,7 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 2021.04.2 +Version: 2021.06 Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -175,14 +175,17 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?with_snapshot} Source0: %{vc_url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz %else -Source0: %{vc_url}/archive/%{version}/%{name}-%{version}-%{branch}.tar.gz +Source0: %{vc_url}/archive/%{version}-%{branch}/%{name}-%{version}-%{branch}.tar.gz %endif # FreeBSD patches # https://www.freshports.org/www/waterfox # rev=revision ./waterfox-FreeBSD-patches-snapshot.sh # https://github.com/MrAlex94/Waterfox/issues/1220 -Source600: https://dl.bintray.com/phantomx/tarballs/%{freebsd_root}.tar.xz +# stackrpms, 4 +# for revision freebsd_rev 20191102 we need to use somewhere else because the dl.bintray.com file is not available to me +# found in builder-live.log.gz from chinfo copr waterfox build +Source600: https://copr-dist-git.fedorainfracloud.org/repo/pkgs/phantomx/chinforpms/waterfox/%{freebsd_root}.tar.xz/md5/e28455f630158a06d82cad5662d3f9b9/%{freebsd_root}.tar.xz Source601: patch-bug1321069 Source602: patch-bug1381815 @@ -253,6 +256,7 @@ Patch705: 0001-Update-patch-bug1403998.patch # Gentoo Patch800: seamonkey-2.53.3-system_libvpx-1.8.patch +Patch801: seamonkey-2.53.7.1-CLEANUP-workaround.patch %if 0%{?system_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} @@ -315,6 +319,7 @@ BuildRequires: nasm >= 2.13 BuildRequires: yasm BuildRequires: llvm BuildRequires: llvm-devel +# clang is needed even with gcc %if !0%{?el7} BuildRequires: clang BuildRequires: clang-libs @@ -396,7 +401,7 @@ This package contains results of tests executed during build. %if 0%{?with_snapshot} %setup -q -n Waterfox-%{commit} -a 600 %else -%setup -q -n Waterfox-%{version} -a 600 +%setup -q -n Waterfox-%{version}-%{branch} -a 600 %endif %if %{build_langpacks} @@ -475,23 +480,26 @@ for i in 1404057 1404324 1404180 1405878 ;do %{freebsd_root}/patch-bug${i} > _patches/patch-bug${i} done +# Remove patches that don't apply before batch # 1: unneeded # 2: unneeded -# 3: no apply -# 4: uncertain +# 3: unneeded +# 4: no apply +# 5: uncertain for i in \ - 702179 730495 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 1395486 1396722 \ - 1401909 1419762 1427126 1430508 1433747 1452576 1453127 1454285 1455235 1466606 1469257 \ + 702179 730495 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 \ + 1395486 1396722 1398021 1399412 1401909 1419762 1427126 1430508 1433747 \ + 1452576 1452619 1453127 1454285 1455235 1466606 1469257 \ 1384121 1384701 1388744 1401063 1406396 1413143 1415883 1402442 1437450 \ 1447519 do rm -f _patches/patch-bug${i} done - rm -f _patches/patch-z-bug1355143 patchcommand='patch -p0 -s -i' +# Patch batch for i in _patches/patch-{bug{??????,???????},revert-bug*,z-*} ;do ${patchcommand} ${i} done @@ -508,6 +516,7 @@ done %patch800 -p2 -b .system-vpx # stackrpms,2 %endif +%patch801 -p1 -b .CLEANUP-workaround # Patch for big endian platforms only %if 0%{?big_endian} @@ -748,6 +757,7 @@ export MOZ_DEBUG_FLAGS=" " %if 0%{?build_with_lto} MOZ_OPT_FLAGS="$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-O2/-O3/' -e 's/ -g\b/ -g1/')" %if 0%{?build_with_clang} +# stackrpms,2 fix typo of second double-quote mark at end RPM_FLTO_FLAGS="-flto=thin -Wl,--thinlto-jobs=$RPM_NCPUS -Wl,-plugin-opt=-import-instr-limit=10" %else RPM_FLTO_FLAGS="-flto=$RPM_NCPUS -flifetime-dse=1" @@ -1110,11 +1120,14 @@ fi #--------------------------------------------------------------------- %changelog -* Tue Apr 27 2021 B. Stack <bgstack15@gmail.com> - 2021.04.2-11.classic +* Tue Jun 15 2021 B. Stack <bgstack15@gmail.com> - 2021.06-11.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Mon Jun 07 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.06-1.classic +- 2021.06 + * Mon Apr 26 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.04.2-1.classic - 2021.04.2 |