diff -Nru firefox-89.0+build1/build/build-clang/clang-trunk-linux64.json firefox-89.0+build2/build/build-clang/clang-trunk-linux64.json --- firefox-89.0+build1/build/build-clang/clang-trunk-linux64.json 2021-05-25 05:13:27.000000000 +0000 +++ firefox-89.0+build2/build/build-clang/clang-trunk-linux64.json 2021-05-28 05:52:42.000000000 +0000 @@ -17,7 +17,6 @@ "unpoison-thread-stacks_clang_10.patch", "downgrade-mangling-error_clang_12.patch", "revert-llvmorg-12-init-7827-g2a078c307204.patch", - "loosen-msvc-detection.patch", - "clang-trunk-missing-define.patch" + "loosen-msvc-detection.patch" ] } diff -Nru firefox-89.0+build1/build/build-clang/clang-trunk-missing-define.patch firefox-89.0+build2/build/build-clang/clang-trunk-missing-define.patch --- firefox-89.0+build1/build/build-clang/clang-trunk-missing-define.patch 2021-05-25 05:13:27.000000000 +0000 +++ firefox-89.0+build2/build/build-clang/clang-trunk-missing-define.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -diff --git a/clang-tools-extra/clangd/quality/CompletionModel.cmake b/clang-tools-extra/clangd/quality/CompletionModel.cmake -index 41bc2ed1890b..e8f5345da84e 100644 ---- a/clang-tools-extra/clangd/quality/CompletionModel.cmake -+++ b/clang-tools-extra/clangd/quality/CompletionModel.cmake -@@ -1,11 +1,11 @@ --# Run the Completion Model Codegenerator on the model present in the -+# Run the Completion Model Codegenerator on the model present in the - # ${model} directory. --# Produces a pair of files called ${filename}.h and ${filename}.cpp in the -+# Produces a pair of files called ${filename}.h and ${filename}.cpp in the - # ${CMAKE_CURRENT_BINARY_DIR}. The generated header - # will define a C++ class called ${cpp_class} - which may be a - # namespace-qualified class name. - function(gen_decision_forest model filename cpp_class) -- set(model_compiler ${LLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR}/clangd/quality/CompletionModelCodegen.py) -+ set(model_compiler ${CMAKE_SOURCE_DIR}/../clang-tools-extra/clangd/quality/CompletionModelCodegen.py) - - set(output_dir ${CMAKE_CURRENT_BINARY_DIR}) - set(header_file ${output_dir}/${filename}.h) diff -Nru firefox-89.0+build1/BUILDID firefox-89.0+build2/BUILDID --- firefox-89.0+build1/BUILDID 2021-05-25 05:22:36.000000000 +0000 +++ firefox-89.0+build2/BUILDID 2021-05-28 06:04:05.000000000 +0000 @@ -1 +1 @@ -20210524222230 \ No newline at end of file +20210527174632 \ No newline at end of file diff -Nru firefox-89.0+build1/debian/changelog firefox-89.0+build2/debian/changelog --- firefox-89.0+build1/debian/changelog 2021-05-25 14:17:32.000000000 +0000 +++ firefox-89.0+build2/debian/changelog 2021-05-28 10:34:25.000000000 +0000 @@ -1,3 +1,9 @@ +firefox (89.0+build2-0ubuntu0.20.04.1) focal; urgency=medium + + * New upstream release (89.0+build2) + + -- Olivier Tilloy Fri, 28 May 2021 12:34:25 +0200 + firefox (89.0+build1-0ubuntu0.20.04.1) focal; urgency=medium * New upstream release (89.0+build1) diff -Nru firefox-89.0+build1/js/public/RootingAPI.h firefox-89.0+build2/js/public/RootingAPI.h --- firefox-89.0+build1/js/public/RootingAPI.h 2021-05-25 05:13:09.000000000 +0000 +++ firefox-89.0+build2/js/public/RootingAPI.h 2021-05-28 05:52:46.000000000 +0000 @@ -583,6 +583,8 @@ public: using ElementType = T; + Handle(const Handle&) = default; + /* Creates a handle from a handle of a type convertible to T. */ template MOZ_IMPLICIT Handle( @@ -687,6 +689,7 @@ MutableHandle(decltype(nullptr)) = delete; public: + MutableHandle(const MutableHandle&) = default; void set(const T& v) { *ptr = v; MOZ_ASSERT(GCPolicy::isValid(*ptr)); diff -Nru firefox-89.0+build1/js/public/Value.h firefox-89.0+build2/js/public/Value.h --- firefox-89.0+build1/js/public/Value.h 2021-05-25 05:13:09.000000000 +0000 +++ firefox-89.0+build2/js/public/Value.h 2021-05-28 05:52:46.000000000 +0000 @@ -390,7 +390,6 @@ public: constexpr Value() : asBits_(bitsFromTagAndPayload(JSVAL_TAG_UNDEFINED, 0)) {} - Value(const Value& v) = default; private: explicit constexpr Value(uint64_t asBits) : asBits_(asBits) {} diff -Nru firefox-89.0+build1/services/settings/dumps/security-state/intermediates.json firefox-89.0+build2/services/settings/dumps/security-state/intermediates.json --- firefox-89.0+build1/services/settings/dumps/security-state/intermediates.json 2021-05-25 05:13:16.000000000 +0000 +++ firefox-89.0+build2/services/settings/dumps/security-state/intermediates.json 2021-05-28 05:52:53.000000000 +0000 @@ -1,6 +1,42 @@ { "data": [ { + "schema": 1621933058505, + "derHash": "/M986IpkKHTRwQf00QxqfdM0eXY5upgTBFRWLDA68XA=", + "subject": "CN=Quantum Basic TLS DV RSA R1,O=Quantum CA Limited,C=GB", + "subjectDN": "MFAxCzAJBgNVBAYTAkdCMRswGQYDVQQKDBJRdWFudHVtIENBIExpbWl0ZWQxJDAiBgNVBAMMG1F1YW50dW0gQmFzaWMgVExTIERWIFJTQSBSMQ==", + "whitelist": false, + "attachment": { + "hash": "9a5b9cf6da2c98fb4d3adb057a8cb4c74161b112407d57a29dd0fc9cb2d24904", + "size": 2381, + "filename": "OB3HSFDxykZYkZCziJA-6l6iHYbsqNrhFIrMg_L45mU=.pem", + "location": "security-state-staging/intermediates/0f12f590-b4c0-47a3-a66e-78070f6bfe7f.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "OB3HSFDxykZYkZCziJA+6l6iHYbsqNrhFIrMg/L45mU=", + "crlite_enrolled": false, + "id": "10b10ba7-6c85-4583-9814-eda266ae2416", + "last_modified": 1621954723530 + }, + { + "schema": 1621951501306, + "derHash": "Jv1MQ2fkY9OccXlq5AEOUzgNyTvBMvsBnWcYpoc+gfQ=", + "subject": "CN=SHECA RSA Organization Validation Server CA G3,O=UniTrust,C=CN", + "subjectDN": "MFkxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDE3MDUGA1UEAwwuU0hFQ0EgUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlcnZlciBDQSBHMw==", + "whitelist": false, + "attachment": { + "hash": "a02a5c8205e62c2ef5dc42345a1585558c86f166ed9875d861601a465bcc4651", + "size": 2016, + "filename": "0JA1q1ctk_4J8qS0t-GhJaG5egVDq9SB33oMY7SMpfs=.pem", + "location": "security-state-staging/intermediates/caec957d-379a-4c23-bf42-3bd122e7cf33.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "0JA1q1ctk/4J8qS0t+GhJaG5egVDq9SB33oMY7SMpfs=", + "crlite_enrolled": true, + "id": "10ec0271-99d5-4c06-a20d-1c03ccf7d780", + "last_modified": 1621954723509 + }, + { "schema": 1621648781987, "derHash": "ClUqZfIv+CDn7D1Du/iLAqvDS9JH4MNQWJG2NC8WpfI=", "subject": "CN=SHECA RSA Domain Validation Server CA G3,O=UniTrust,C=CN", @@ -37,24 +73,6 @@ "last_modified": 1621630656933 }, { - "schema": 1621605660244, - "derHash": "Jv1MQ2fkY9OccXlq5AEOUzgNyTvBMvsBnWcYpoc+gfQ=", - "subject": "CN=SHECA RSA Organization Validation Server CA G3,O=UniTrust,C=CN", - "subjectDN": "MFkxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDE3MDUGA1UEAwwuU0hFQ0EgUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlcnZlciBDQSBHMw==", - "whitelist": false, - "attachment": { - "hash": "a02a5c8205e62c2ef5dc42345a1585558c86f166ed9875d861601a465bcc4651", - "size": 2016, - "filename": "0JA1q1ctk_4J8qS0t-GhJaG5egVDq9SB33oMY7SMpfs=.pem", - "location": "security-state-staging/intermediates/caec957d-379a-4c23-bf42-3bd122e7cf33.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "0JA1q1ctk/4J8qS0t+GhJaG5egVDq9SB33oMY7SMpfs=", - "crlite_enrolled": true, - "id": "10ec0271-99d5-4c06-a20d-1c03ccf7d780", - "last_modified": 1621609054782 - }, - { "schema": 1621522643106, "derHash": "4b5ru7cPWiQec2/ETGohYL9s4ZuV7dZ7976JboN3h0U=", "subject": "CN=TERENA eScience SSL CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", @@ -5167,24 +5185,6 @@ "last_modified": 1614347896121 }, { - "schema": 1614217798106, - "derHash": "/M986IpkKHTRwQf00QxqfdM0eXY5upgTBFRWLDA68XA=", - "subject": "CN=Quantum Basic TLS DV RSA R1,O=Quantum CA Limited,C=GB", - "subjectDN": "MFAxCzAJBgNVBAYTAkdCMRswGQYDVQQKDBJRdWFudHVtIENBIExpbWl0ZWQxJDAiBgNVBAMMG1F1YW50dW0gQmFzaWMgVExTIERWIFJTQSBSMQ==", - "whitelist": false, - "attachment": { - "hash": "9a5b9cf6da2c98fb4d3adb057a8cb4c74161b112407d57a29dd0fc9cb2d24904", - "size": 2381, - "filename": "OB3HSFDxykZYkZCziJA-6l6iHYbsqNrhFIrMg_L45mU=.pem", - "location": "security-state-staging/intermediates/0f12f590-b4c0-47a3-a66e-78070f6bfe7f.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "OB3HSFDxykZYkZCziJA+6l6iHYbsqNrhFIrMg/L45mU=", - "crlite_enrolled": true, - "id": "10b10ba7-6c85-4583-9814-eda266ae2416", - "last_modified": 1614218295201 - }, - { "schema": 1613660251492, "derHash": "4KSpHFCvxPss7N60HtjK5yvwFE+w1ii0k/6sUREg/XM=", "subject": "CN=Atos TrustedRoot Client-CA 2013,O=Atos,C=DE", diff -Nru firefox-89.0+build1/services/sync/modules/service.js firefox-89.0+build2/services/sync/modules/service.js --- firefox-89.0+build1/services/sync/modules/service.js 2021-05-25 05:13:16.000000000 +0000 +++ firefox-89.0+build2/services/sync/modules/service.js 2021-05-28 05:52:53.000000000 +0000 @@ -92,13 +92,13 @@ }; if (Svc.Prefs.get("engine.addresses.available", false)) { result.Addresses = { - module: "resource://formautofill/FormAutofillSync.jsm", + module: "resource://autofill/FormAutofillSync.jsm", symbol: "AddressesEngine", }; } if (Svc.Prefs.get("engine.creditcards.available", false)) { result.CreditCards = { - module: "resource://formautofill/FormAutofillSync.jsm", + module: "resource://autofill/FormAutofillSync.jsm", symbol: "CreditCardsEngine", }; } diff -Nru firefox-89.0+build1/SOURCE_CHANGESET firefox-89.0+build2/SOURCE_CHANGESET --- firefox-89.0+build1/SOURCE_CHANGESET 2021-05-25 05:13:28.000000000 +0000 +++ firefox-89.0+build2/SOURCE_CHANGESET 2021-05-28 05:53:06.000000000 +0000 @@ -1 +1 @@ -f62a712208b3368f415c5b96260a366c16e9b637 \ No newline at end of file +1ce0b546a957ed918a0b1f5476786864fbce87e1 \ No newline at end of file diff -Nru firefox-89.0+build1/testing/raptor/raptor/browsertime/android.py firefox-89.0+build2/testing/raptor/raptor/browsertime/android.py --- firefox-89.0+build1/testing/raptor/raptor/browsertime/android.py 2021-05-25 05:13:16.000000000 +0000 +++ firefox-89.0+build2/testing/raptor/raptor/browsertime/android.py 2021-05-28 05:52:54.000000000 +0000 @@ -90,14 +90,6 @@ activity, ] ) - if self.browsertime_geckodriver: - args_list.extend( - [ - # Set geckoprofile location to internal so we are able to get crashes - '--firefox.geckodriverArgs="--android-storage"', - "--firefox.geckodriverArgs=internal", - ] - ) # Setup power testing if self.config["power_test"]: @@ -180,7 +172,15 @@ self.clear_app_data() self.set_debug_app_flag() self.device.run_as_package = self.config["binary"] - self.remote_test_root = self.device.test_root + external_storage = self.device.shell_output("echo $EXTERNAL_STORAGE") + self.remote_test_root = os.path.join( + external_storage, + "Android", + "data", + self.config["binary"], + "files", + "test_root", + ) self.geckodriver_profile = os.path.join( self.remote_test_root, "%s-geckodriver-profile" % self.config["binary"] ) diff -Nru firefox-89.0+build1/xpcom/string/nsTDependentSubstring.h firefox-89.0+build2/xpcom/string/nsTDependentSubstring.h --- firefox-89.0+build1/xpcom/string/nsTDependentSubstring.h 2021-05-25 05:13:24.000000000 +0000 +++ firefox-89.0+build2/xpcom/string/nsTDependentSubstring.h 2021-05-28 05:53:03.000000000 +0000 @@ -91,6 +91,7 @@ // auto-generated copy-constructor OK (XXX really?? what about base class // copy-ctor?) + nsTDependentSubstring(const nsTDependentSubstring&) = default; private: // NOT USED