From c76009713ba3146bcb804f6ef8a44e6558882aed Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 7 Jan 2020 21:59:30 +0100 Subject: [PATCH] firefox: update to 72.0. --- srcpkgs/firefox/patches/8e71fa07fe00.patch | 83 +++++++++++++ .../patches/fix-sandbox-membarrier.patch | 52 -------- srcpkgs/firefox/patches/sndio.patch | 8 +- ...m_indexdb_actorsparent_allignment-v2.patch | 114 ------------------ srcpkgs/firefox/template | 9 +- 5 files changed, 95 insertions(+), 171 deletions(-) create mode 100644 srcpkgs/firefox/patches/8e71fa07fe00.patch delete mode 100644 srcpkgs/firefox/patches/fix-sandbox-membarrier.patch delete mode 100644 srcpkgs/firefox/patches/workaround_dom_indexdb_actorsparent_allignment-v2.patch diff --git a/srcpkgs/firefox/patches/8e71fa07fe00.patch b/srcpkgs/firefox/patches/8e71fa07fe00.patch new file mode 100644 index 00000000000..b36b919e86f --- /dev/null +++ b/srcpkgs/firefox/patches/8e71fa07fe00.patch @@ -0,0 +1,83 @@ + +# HG changeset patch +# User Simon Giesecke +# Date 1576592608 0 +# Node ID 8e71fa07fe004c2e4d04db6b9e77cdfbc7810d6a +# Parent 23dbcfafb3b73d6c1c26c5021199b6fa608150c4 +Bug 1601707 - Workaround for compilers that do not extend the lifetime of temporaries resulting from ?: expressions. r=janv, a=RyanVM + +Differential Revision: https://phabricator.services.mozilla.com/D56873 + +diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp +--- dom/indexedDB/ActorsParent.cpp ++++ dom/indexedDB/ActorsParent.cpp +@@ -24578,19 +24578,19 @@ nsresult ObjectStoreAddOrPutRequestOp::D + } + } + + // The "|| keyUnset" here is mostly a debugging tool. If a key isn't + // specified we should never have a collision and so it shouldn't matter + // if we allow overwrite or not. By not allowing overwrite we raise + // detectable errors rather than corrupting data. + DatabaseConnection::CachedStatement stmt; +- const auto& optReplaceDirective = (!mOverwrite || keyUnset) +- ? NS_LITERAL_CSTRING("") +- : NS_LITERAL_CSTRING("OR REPLACE "); ++ const auto optReplaceDirective = (!mOverwrite || keyUnset) ++ ? NS_LITERAL_CSTRING("") ++ : NS_LITERAL_CSTRING("OR REPLACE "); + rv = aConnection->GetCachedStatement( + NS_LITERAL_CSTRING("INSERT ") + optReplaceDirective + + NS_LITERAL_CSTRING("INTO object_data " + "(object_store_id, key, file_ids, data) " + "VALUES (:") + + kStmtParamNameObjectStoreId + NS_LITERAL_CSTRING(", :") + + kStmtParamNameKey + NS_LITERAL_CSTRING(", :") + + kStmtParamNameFileIds + NS_LITERAL_CSTRING(", :") + +@@ -26422,19 +26422,19 @@ nsresult Cursor::OpenOp::DoIndexDatabase + MOZ_ASSERT(mCursor->mType == OpenCursorParams::TIndexOpenCursorParams); + MOZ_ASSERT(mCursor->mObjectStoreId); + MOZ_ASSERT(mCursor->mIndexId); + + AUTO_PROFILER_LABEL("Cursor::OpenOp::DoIndexDatabaseWork", DOM); + + const bool usingKeyRange = mOptionalKeyRange.isSome(); + +- const auto& indexTable = mCursor->mUniqueIndex +- ? NS_LITERAL_CSTRING("unique_index_data") +- : NS_LITERAL_CSTRING("index_data"); ++ const auto indexTable = mCursor->mUniqueIndex ++ ? NS_LITERAL_CSTRING("unique_index_data") ++ : NS_LITERAL_CSTRING("index_data"); + + // The result of MakeColumnPairSelectionList is stored in a local variable, + // since inlining it into the next statement causes a crash on some Mac OS X + // builds (see https://bugzilla.mozilla.org/show_bug.cgi?id=1168606#c110). + const auto columnPairSelectionList = MakeColumnPairSelectionList( + NS_LITERAL_CSTRING("index_table.value"), + NS_LITERAL_CSTRING("index_table.value_locale"), kColumnNameAliasSortKey, + mCursor->IsLocaleAware()); +@@ -26528,19 +26528,19 @@ nsresult Cursor::OpenOp::DoIndexKeyDatab + MOZ_ASSERT(mCursor->mType == OpenCursorParams::TIndexOpenKeyCursorParams); + MOZ_ASSERT(mCursor->mObjectStoreId); + MOZ_ASSERT(mCursor->mIndexId); + + AUTO_PROFILER_LABEL("Cursor::OpenOp::DoIndexKeyDatabaseWork", DOM); + + const bool usingKeyRange = mOptionalKeyRange.isSome(); + +- const auto& table = mCursor->mUniqueIndex +- ? NS_LITERAL_CSTRING("unique_index_data") +- : NS_LITERAL_CSTRING("index_data"); ++ const auto table = mCursor->mUniqueIndex ++ ? NS_LITERAL_CSTRING("unique_index_data") ++ : NS_LITERAL_CSTRING("index_data"); + + // The result of MakeColumnPairSelectionList is stored in a local variable, + // since inlining it into the next statement causes a crash on some Mac OS X + // builds (see https://bugzilla.mozilla.org/show_bug.cgi?id=1168606#c110). + const auto columnPairSelectionList = MakeColumnPairSelectionList( + NS_LITERAL_CSTRING("value"), NS_LITERAL_CSTRING("value_locale"), + kColumnNameAliasSortKey, mCursor->IsLocaleAware()); + const nsCString sortColumnAlias = NS_LITERAL_CSTRING("SELECT ") + + diff --git a/srcpkgs/firefox/patches/fix-sandbox-membarrier.patch b/srcpkgs/firefox/patches/fix-sandbox-membarrier.patch deleted file mode 100644 index caffd83cf67..00000000000 --- a/srcpkgs/firefox/patches/fix-sandbox-membarrier.patch +++ /dev/null @@ -1,52 +0,0 @@ -allow usage of SYS_membarrier, needed since musl-1.1.22 - ---- security/sandbox/linux/SandboxFilter.cpp -+++ security/sandbox/linux/SandboxFilter.cpp -@@ -283,6 +283,8 @@ - case __NR_set_tid_address: - return Allow(); - #endif -+ case __NR_membarrier: -+ return Allow(); - - // prctl - case __NR_prctl: { - ---- security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h -+++ security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h -@@ -1385,6 +1385,10 @@ - #define __NR_memfd_create (__NR_SYSCALL_BASE+385) - #endif - -+#if !defined(__NR_membarrier) -+#define __NR_membarrier (__NR_SYSCALL_BASE+389) -+#endif -+ - // ARM private syscalls. - #if !defined(__ARM_NR_BASE) - #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000) - ---- security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h -+++ security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h -@@ -1290,5 +1290,9 @@ - #define __NR_memfd_create 319 - #endif - -+#if !defined(__NR_membarrier) -+#define __NR_membarrier 324 -+#endif -+ - #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_ - ---- security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h -+++ security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h -@@ -1490,5 +1490,9 @@ - #define __NR_shutdown 373 - #endif - -+#if !defined(__NR_membarrier) -+#define __NR_membarrier 375 -+#endif -+ - #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_ - diff --git a/srcpkgs/firefox/patches/sndio.patch b/srcpkgs/firefox/patches/sndio.patch index 738b745015a..aab9a0a3057 100644 --- a/srcpkgs/firefox/patches/sndio.patch +++ b/srcpkgs/firefox/patches/sndio.patch @@ -25,7 +25,7 @@ dnl = Maintainer debug option (no --enable equivalent) --- media/libcubeb/src/moz.build.orig +++ media/libcubeb/src/moz.build -@@ -44,7 +44,7 @@ +@@ -44,11 +44,13 @@ ] DEFINES['USE_JACK'] = True @@ -34,6 +34,12 @@ SOURCES += [ 'cubeb_sndio.c', ] + DEFINES['USE_SNDIO'] = True ++ ++if CONFIG['OS_ARCH'] == 'OpenBSD': + DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True + + if CONFIG['OS_TARGET'] == 'Darwin': --- build/moz.configure/old.configure.orig +++ build/moz.configure/old.configure @@ -184,6 +184,7 @@ diff --git a/srcpkgs/firefox/patches/workaround_dom_indexdb_actorsparent_allignment-v2.patch b/srcpkgs/firefox/patches/workaround_dom_indexdb_actorsparent_allignment-v2.patch deleted file mode 100644 index b589d55f664..00000000000 --- a/srcpkgs/firefox/patches/workaround_dom_indexdb_actorsparent_allignment-v2.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -up firefox-71.0/dom/indexedDB/ActorsParent.cpp.gcc-workaround firefox-71.0/dom/indexedDB/ActorsParent.cpp ---- dom/indexedDB/ActorsParent.cpp.gcc-workaround 2019-12-02 13:22:58.000000000 +0100 -+++ dom/indexedDB/ActorsParent.cpp 2019-12-08 21:52:54.449199120 +0100 -@@ -24311,11 +24311,11 @@ nsresult ObjectStoreAddOrPutRequestOp::D - // if we allow overwrite or not. By not allowing overwrite we raise - // detectable errors rather than corrupting data. - DatabaseConnection::CachedStatement stmt; -- const auto& optReplaceDirective = (!mOverwrite || keyUnset) -- ? NS_LITERAL_CSTRING("") -- : NS_LITERAL_CSTRING("OR REPLACE "); - rv = aConnection->GetCachedStatement( -- NS_LITERAL_CSTRING("INSERT ") + optReplaceDirective + -+ NS_LITERAL_CSTRING("INSERT ") + -+ ((!mOverwrite || keyUnset) -+ ? NS_LITERAL_CSTRING("") -+ : NS_LITERAL_CSTRING("OR REPLACE ")) + - NS_LITERAL_CSTRING("INTO object_data " - "(object_store_id, key, file_ids, data) " - "VALUES (:") + -@@ -25869,11 +25869,8 @@ void Cursor::OpenOp::PrepareIndexKeyCond - } - } - -- const auto& comparisonChar = -- isIncreasingOrder ? NS_LITERAL_CSTRING(">") : NS_LITERAL_CSTRING("<"); -- - mCursor->mContinueToQuery = -- aQueryStart + NS_LITERAL_CSTRING(" AND sort_column ") + comparisonChar + -+ aQueryStart + NS_LITERAL_CSTRING(" AND sort_column ") + (isIncreasingOrder ? NS_LITERAL_CSTRING(">") : NS_LITERAL_CSTRING("<")) + - NS_LITERAL_CSTRING("= :") + kStmtParamNameCurrentKey; - - switch (mCursor->mDirection) { -@@ -25881,11 +25878,11 @@ void Cursor::OpenOp::PrepareIndexKeyCond - case IDBCursor::PREV: - mCursor->mContinueQuery = - aQueryStart + NS_LITERAL_CSTRING(" AND sort_column ") + -- comparisonChar + NS_LITERAL_CSTRING("= :") + -+ (isIncreasingOrder ? NS_LITERAL_CSTRING(">") : NS_LITERAL_CSTRING("<")) + NS_LITERAL_CSTRING("= :") + - kStmtParamNameCurrentKey + NS_LITERAL_CSTRING(" AND ( sort_column ") + -- comparisonChar + NS_LITERAL_CSTRING(" :") + kStmtParamNameCurrentKey + -+ (isIncreasingOrder ? NS_LITERAL_CSTRING(">") : NS_LITERAL_CSTRING("<")) + NS_LITERAL_CSTRING(" :") + kStmtParamNameCurrentKey + - NS_LITERAL_CSTRING(" OR ") + aObjectDataKeyPrefix + -- NS_LITERAL_CSTRING("object_data_key ") + comparisonChar + -+ NS_LITERAL_CSTRING("object_data_key ") + (isIncreasingOrder ? NS_LITERAL_CSTRING(">") : NS_LITERAL_CSTRING("<")) + - NS_LITERAL_CSTRING(" :") + kStmtParamNameObjectStorePosition + - NS_LITERAL_CSTRING(" ) "); - -@@ -25896,12 +25893,12 @@ void Cursor::OpenOp::PrepareIndexKeyCond - "(sort_column == :") + - kStmtParamNameCurrentKey + NS_LITERAL_CSTRING(" AND ") + - aObjectDataKeyPrefix + NS_LITERAL_CSTRING("object_data_key ") + -- comparisonChar + NS_LITERAL_CSTRING("= :") + -+ (isIncreasingOrder ? NS_LITERAL_CSTRING(">") : NS_LITERAL_CSTRING("<")) + NS_LITERAL_CSTRING("= :") + - kStmtParamNameObjectStorePosition + - NS_LITERAL_CSTRING( - ") OR " - "sort_column ") + -- comparisonChar + NS_LITERAL_CSTRING(" :") + kStmtParamNameCurrentKey + -+ (isIncreasingOrder ? NS_LITERAL_CSTRING(">") : NS_LITERAL_CSTRING("<")) + NS_LITERAL_CSTRING(" :") + kStmtParamNameCurrentKey + - NS_LITERAL_CSTRING(")"); - break; - -@@ -25909,7 +25906,7 @@ void Cursor::OpenOp::PrepareIndexKeyCond - case IDBCursor::PREV_UNIQUE: - mCursor->mContinueQuery = - aQueryStart + NS_LITERAL_CSTRING(" AND sort_column ") + -- comparisonChar + NS_LITERAL_CSTRING(" :") + kStmtParamNameCurrentKey; -+ (isIncreasingOrder ? NS_LITERAL_CSTRING(">") : NS_LITERAL_CSTRING("<")) + NS_LITERAL_CSTRING(" :") + kStmtParamNameCurrentKey; - break; - - default: -@@ -26076,9 +26073,6 @@ nsresult Cursor::OpenOp::DoIndexDatabase - - const bool usingKeyRange = mOptionalKeyRange.isSome(); - -- const auto& indexTable = mCursor->mUniqueIndex -- ? NS_LITERAL_CSTRING("unique_index_data") -- : NS_LITERAL_CSTRING("index_data"); - - NS_NAMED_LITERAL_CSTRING(sortColumn, "sort_column"); - -@@ -26099,7 +26093,9 @@ nsresult Cursor::OpenOp::DoIndexDatabase - "object_data.file_ids, " - "object_data.data " - "FROM ") + -- indexTable + -+ (mCursor->mUniqueIndex -+ ? NS_LITERAL_CSTRING("unique_index_data") -+ : NS_LITERAL_CSTRING("index_data")) + - NS_LITERAL_CSTRING( - " AS index_table " - "JOIN object_data " -@@ -26198,9 +26194,6 @@ nsresult Cursor::OpenOp::DoIndexKeyDatab - - const bool usingKeyRange = mOptionalKeyRange.isSome(); - -- const auto& table = mCursor->mUniqueIndex -- ? NS_LITERAL_CSTRING("unique_index_data") -- : NS_LITERAL_CSTRING("index_data"); - - NS_NAMED_LITERAL_CSTRING(sortColumn, "sort_column"); - -@@ -26218,7 +26211,10 @@ nsresult Cursor::OpenOp::DoIndexKeyDatab - NS_LITERAL_CSTRING( - "object_data_key " - " FROM ") + -- table + NS_LITERAL_CSTRING(" WHERE index_id = :") + -+ (mCursor->mUniqueIndex -+ ? NS_LITERAL_CSTRING("unique_index_data") -+ : NS_LITERAL_CSTRING("index_data")) + -+ NS_LITERAL_CSTRING(" WHERE index_id = :") + - kStmtParamNameId; - - const auto keyRangeClause = diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index b81cee01e7f..1027b0ba79c 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,20 +3,20 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=71.0 -revision=3 +version=72.0 +revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" maintainer="Johannes " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=78304cd58229e7103b56b34718aad051c9a4db30c266512a64f501ba58da7fbe +checksum=6473b2d854828b5d3dbe4b01093e8993141de7707d5d01eb32bd16a469b46708 lib32disabled=yes hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo - llvm clang nodejs-lts-10 cbindgen python nasm" + llvm clang nodejs-lts-10 cbindgen python nasm which tar" makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx5-devel libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std @@ -67,6 +67,7 @@ post_extract() { post_patch() { _clear_vendor_checksums audio_thread_priority + _clear_vendor_checksums backtrace-sys } do_build() {