Updated to 86.0
This commit is contained in:
Martin Stransky
parent
f41f7d868d
commit
5f5997630b
2
.gitignore
vendored
2
.gitignore
vendored
@ -447,3 +447,5 @@ firefox-3.6.4.source.tar.bz2
|
||||
/firefox-langpacks-85.0-20210120.tar.xz
|
||||
/firefox-85.0.1.source.tar.xz
|
||||
/firefox-langpacks-85.0.1-20210208.tar.xz
|
||||
/firefox-86.0.source.tar.xz
|
||||
/firefox-langpacks-86.0-20210222.tar.xz
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,156 +1,65 @@
|
||||
diff -up firefox-85.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini
|
||||
--- firefox-85.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-01-18 19:29:32.000000000 +0100
|
||||
+++ firefox-85.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini 2021-01-21 09:49:44.587178226 +0100
|
||||
@@ -6,7 +6,6 @@ support-files =
|
||||
|
||||
[test_3rdparty.js]
|
||||
[test_addon_update.js]
|
||||
diff -U0 firefox-85.0.1/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-85.0.1/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini
|
||||
--- firefox-85.0.1/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-02-04 16:52:46.000000000 +0100
|
||||
+++ firefox-85.0.1/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini 2021-02-23 17:26:03.907321729 +0100
|
||||
@@ -9 +8,0 @@
|
||||
-[test_appupdateurl.js]
|
||||
[test_bug1658259.js]
|
||||
[test_cleanup.js]
|
||||
[test_clear_blocked_cookies.js]
|
||||
diff -up firefox-85.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini
|
||||
--- firefox-85.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-01-18 19:29:32.000000000 +0100
|
||||
+++ firefox-85.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini 2021-01-21 09:49:44.587178226 +0100
|
||||
@@ -6,6 +6,5 @@ skip-if = toolkit == 'android' || socket
|
||||
support-files =
|
||||
adb.py
|
||||
|
||||
diff -U0 firefox-85.0.1/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-85.0.1/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini
|
||||
--- firefox-85.0.1/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-02-04 16:52:47.000000000 +0100
|
||||
+++ firefox-85.0.1/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini 2021-02-23 17:26:03.908321759 +0100
|
||||
@@ -9 +8,0 @@
|
||||
-[test_adb.js]
|
||||
run-sequentially = An extension having the same id is installed/uninstalled in different tests
|
||||
[test_prepare-tcp-connection.js]
|
||||
diff -up firefox-85.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/netwerk/test/unit_ipc/xpcshell.ini
|
||||
--- firefox-85.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell 2021-01-18 19:29:59.000000000 +0100
|
||||
+++ firefox-85.0/netwerk/test/unit_ipc/xpcshell.ini 2021-01-21 09:49:44.587178226 +0100
|
||||
@@ -70,7 +70,6 @@ support-files =
|
||||
[test_channel_close_wrap.js]
|
||||
[test_cookiejars_wrap.js]
|
||||
[test_dns_cancel_wrap.js]
|
||||
diff -U0 firefox-85.0.1/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell firefox-85.0.1/netwerk/test/unit_ipc/xpcshell.ini
|
||||
--- firefox-85.0.1/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell 2021-02-04 16:52:52.000000000 +0100
|
||||
+++ firefox-85.0.1/netwerk/test/unit_ipc/xpcshell.ini 2021-02-23 17:26:03.908321759 +0100
|
||||
@@ -73 +72,0 @@
|
||||
-[test_dns_service_wrap.js]
|
||||
[test_duplicate_headers_wrap.js]
|
||||
[test_event_sink_wrap.js]
|
||||
[test_head_wrap.js]
|
||||
diff -up firefox-85.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/netwerk/test/unit/xpcshell.ini
|
||||
--- firefox-85.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell 2021-01-18 19:30:19.000000000 +0100
|
||||
+++ firefox-85.0/netwerk/test/unit/xpcshell.ini 2021-01-21 09:50:27.536450133 +0100
|
||||
@@ -199,7 +199,6 @@ skip-if = true # Bug 863738
|
||||
[test_cookies_upgrade_10.js]
|
||||
[test_dns_cancel.js]
|
||||
[test_data_protocol.js]
|
||||
diff -U0 firefox-85.0.1/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-85.0.1/netwerk/test/unit/xpcshell.ini
|
||||
--- firefox-85.0.1/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell 2021-02-04 22:06:36.000000000 +0100
|
||||
+++ firefox-85.0.1/netwerk/test/unit/xpcshell.ini 2021-02-23 17:26:03.908321759 +0100
|
||||
@@ -202 +201,0 @@
|
||||
-[test_dns_service.js]
|
||||
[test_dns_offline.js]
|
||||
skip-if = socketprocess_networking # Bug 1640105
|
||||
[test_dns_onion.js]
|
||||
@@ -223,7 +222,6 @@ skip-if = socketprocess_networking # Bug
|
||||
[test_fallback_request-error_passing.js]
|
||||
[test_fallback_response-error_canceled.js]
|
||||
[test_fallback_response-error_passing.js]
|
||||
@@ -226 +224,0 @@
|
||||
-[test_file_protocol.js]
|
||||
[test_filestreams.js]
|
||||
[test_freshconnection.js]
|
||||
[test_gre_resources.js]
|
||||
@@ -331,7 +329,6 @@ run-sequentially = Hardcoded hash value
|
||||
[test_tldservice_nextsubdomain.js]
|
||||
[test_about_protocol.js]
|
||||
[test_bug856978.js]
|
||||
@@ -334 +331,0 @@
|
||||
-[test_unix_domain.js]
|
||||
[test_addr_in_use_error.js]
|
||||
[test_about_networking.js]
|
||||
[test_ping_aboutnetworking.js]
|
||||
@@ -343,7 +340,6 @@ skip-if = (verify && (os == 'mac'))
|
||||
[test_signature_extraction.js]
|
||||
skip-if = os != "win"
|
||||
[test_synthesized_response.js]
|
||||
@@ -346 +342,0 @@
|
||||
-[test_udp_multicast.js]
|
||||
[test_redirect_history.js]
|
||||
[test_reply_without_content_type.js]
|
||||
[test_websocket_offline.js]
|
||||
@@ -392,8 +388,6 @@ skip-if = (verify && !debug && (os == 'w
|
||||
[test_bug1355539_http1.js]
|
||||
[test_bug1378385_http1.js]
|
||||
[test_tls_flags_separate_connections.js]
|
||||
@@ -395,2 +390,0 @@
|
||||
-[test_tls_flags.js]
|
||||
-skip-if = (verify && (os == 'linux')) || (os == "android" && processor == "x86_64")
|
||||
[test_uri_mutator.js]
|
||||
[test_bug1411316_http1.js]
|
||||
[test_header_Server_Timing.js]
|
||||
@@ -409,7 +403,6 @@ skip-if = tsan || socketprocess_networki
|
||||
run-sequentially = node server exceptions dont replay well
|
||||
skip-if = socketprocess_networking
|
||||
[test_dns_by_type_resolve.js]
|
||||
@@ -412 +405,0 @@
|
||||
-[test_network_connectivity_service.js]
|
||||
[test_suspend_channel_on_authRetry.js]
|
||||
[test_suspend_channel_on_examine_merged_response.js]
|
||||
[test_bug1527293.js]
|
||||
diff -up firefox-85.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/security/manager/ssl/tests/unit/xpcshell.ini
|
||||
--- firefox-85.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell 2021-01-18 19:29:59.000000000 +0100
|
||||
+++ firefox-85.0/security/manager/ssl/tests/unit/xpcshell.ini 2021-01-21 09:49:44.588178255 +0100
|
||||
@@ -180,7 +180,6 @@ run-sequentially = hardcoded ports
|
||||
run-sequentially = hardcoded ports
|
||||
[test_ocsp_url.js]
|
||||
run-sequentially = hardcoded ports
|
||||
diff -U0 firefox-85.0.1/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-85.0.1/security/manager/ssl/tests/unit/xpcshell.ini
|
||||
--- firefox-85.0.1/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell 2021-02-04 22:06:36.000000000 +0100
|
||||
+++ firefox-85.0.1/security/manager/ssl/tests/unit/xpcshell.ini 2021-02-23 17:26:03.908321759 +0100
|
||||
@@ -183 +182,0 @@
|
||||
-[test_oskeystore.js]
|
||||
[test_osreauthenticator.js]
|
||||
# Reauthentication has been implemented on Windows and MacOS, so running this
|
||||
# test results in the OS popping up a dialog, which means we can't run it in
|
||||
diff -up firefox-85.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell firefox-85.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
|
||||
--- firefox-85.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell 2021-01-18 19:29:59.000000000 +0100
|
||||
+++ firefox-85.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini 2021-01-21 09:49:44.588178255 +0100
|
||||
@@ -7,7 +7,6 @@ support-files =
|
||||
|
||||
[test_osclientcerts_module.js]
|
||||
skip-if = (os != 'win' && os != 'mac') || processor == 'aarch64'
|
||||
diff -U0 firefox-85.0.1/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell firefox-85.0.1/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
|
||||
--- firefox-85.0.1/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell 2021-02-04 16:52:52.000000000 +0100
|
||||
+++ firefox-85.0.1/security/manager/ssl/tests/unit/xpcshell-smartcards.ini 2021-02-23 17:26:03.908321759 +0100
|
||||
@@ -10 +9,0 @@
|
||||
-[test_pkcs11_module.js]
|
||||
[test_pkcs11_moduleDB.js]
|
||||
[test_pkcs11_safe_mode.js]
|
||||
[test_pkcs11_slot.js]
|
||||
diff -up firefox-85.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/toolkit/components/commandlines/test/unit/xpcshell.ini
|
||||
--- firefox-85.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell 2021-01-18 19:31:16.000000000 +0100
|
||||
+++ firefox-85.0/toolkit/components/commandlines/test/unit/xpcshell.ini 2021-01-21 09:49:44.588178255 +0100
|
||||
@@ -7,4 +7,3 @@ support-files =
|
||||
|
||||
[test_classinfo.js]
|
||||
[test_bug666224.js]
|
||||
diff -U0 firefox-85.0.1/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-85.0.1/toolkit/components/commandlines/test/unit/xpcshell.ini
|
||||
--- firefox-85.0.1/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell 2021-02-04 16:52:57.000000000 +0100
|
||||
+++ firefox-85.0.1/toolkit/components/commandlines/test/unit/xpcshell.ini 2021-02-23 17:26:03.908321759 +0100
|
||||
@@ -10 +9,0 @@
|
||||
-[test_resolvefile.js]
|
||||
diff -up firefox-85.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell firefox-85.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
|
||||
--- firefox-85.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell 2021-01-18 19:31:16.000000000 +0100
|
||||
+++ firefox-85.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini 2021-01-21 09:49:44.588178255 +0100
|
||||
@@ -73,8 +73,6 @@ skip-if = socketprocess_networking || os
|
||||
skip-if = os == "android" # downloads API needs to be implemented in GeckoView - bug 1538348
|
||||
[test_ext_downloads_download.js]
|
||||
skip-if = appname == "thunderbird" || os == "android" || tsan # tsan: bug 1612707
|
||||
diff -U0 firefox-85.0.1/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell firefox-85.0.1/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
|
||||
--- firefox-85.0.1/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell 2021-02-04 22:06:37.000000000 +0100
|
||||
+++ firefox-85.0.1/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini 2021-02-23 17:26:03.908321759 +0100
|
||||
@@ -76,2 +75,0 @@
|
||||
-[test_ext_downloads_misc.js]
|
||||
-skip-if = os == "android" || (os=='linux' && bits==32) || tsan # linux32: bug 1324870, tsan: bug 1612707
|
||||
[test_ext_downloads_private.js]
|
||||
skip-if = os == "android"
|
||||
[test_ext_downloads_search.js]
|
||||
@@ -241,8 +239,6 @@ skip-if = appname == "thunderbird" || os
|
||||
skip-if = appname == "thunderbird" || os == "android" # Bug 1350559
|
||||
[test_ext_permissions_uninstall.js]
|
||||
skip-if = appname == "thunderbird" || os == "android" # Bug 1350559
|
||||
@@ -244,2 +241,0 @@
|
||||
-[test_proxy_listener.js]
|
||||
-skip-if = appname == "thunderbird"
|
||||
[test_proxy_incognito.js]
|
||||
skip-if = os == "android" # incognito not supported on android
|
||||
[test_proxy_info_results.js]
|
||||
diff -up firefox-85.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
|
||||
--- firefox-85.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-01-18 19:30:38.000000000 +0100
|
||||
+++ firefox-85.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini 2021-01-21 09:49:44.588178255 +0100
|
||||
@@ -7,6 +7,5 @@ support-files =
|
||||
data_text_file.txt
|
||||
data_test_script.py
|
||||
|
||||
diff -U0 firefox-85.0.1/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-85.0.1/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
|
||||
--- firefox-85.0.1/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-02-04 16:52:57.000000000 +0100
|
||||
+++ firefox-85.0.1/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini 2021-02-23 17:26:03.909321789 +0100
|
||||
@@ -10 +9,0 @@
|
||||
-[test_subprocess.js]
|
||||
[test_subprocess_getEnvironment.js]
|
||||
[test_subprocess_pathSearch.js]
|
||||
diff -up firefox-85.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
|
||||
--- firefox-85.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-01-18 19:30:38.000000000 +0100
|
||||
+++ firefox-85.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini 2021-01-21 09:49:44.588178255 +0100
|
||||
@@ -94,7 +94,6 @@ tags = webextensions
|
||||
head = head_addons.js head_sideload.js
|
||||
skip-if = os == "linux" # Bug 1613268
|
||||
[test_sideloads.js]
|
||||
diff -U0 firefox-85.0.1/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-85.0.1/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
|
||||
--- firefox-85.0.1/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-02-04 16:52:57.000000000 +0100
|
||||
+++ firefox-85.0.1/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini 2021-02-23 17:26:03.909321789 +0100
|
||||
@@ -97 +96,0 @@
|
||||
-[test_sideloads_after_rebuild.js]
|
||||
head = head_addons.js head_sideload.js
|
||||
[test_signed_inject.js]
|
||||
# Bug 1394122
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up firefox-84.0.2/widget/gtk/WindowSurfaceWayland.cpp.old firefox-84.0.2/widget/gtk/WindowSurfaceWayland.cpp
|
||||
--- firefox-84.0.2/widget/gtk/WindowSurfaceWayland.cpp.old 2021-01-18 21:39:44.724484655 +0100
|
||||
+++ firefox-84.0.2/widget/gtk/WindowSurfaceWayland.cpp 2021-01-18 21:40:59.905703810 +0100
|
||||
@@ -906,6 +906,8 @@ void WindowSurfaceWayland::CacheImageSur
|
||||
size.width, size.height));
|
||||
}
|
||||
#endif
|
||||
+ } else {
|
||||
+ mDelayedImageCommits.AppendElement(lastSurf);
|
||||
}
|
||||
}
|
||||
|
||||
@ -74,9 +74,11 @@ if ! [ $MOZ_DISABLE_WAYLAND ]; then
|
||||
if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ]; then
|
||||
export MOZ_ENABLE_WAYLAND=1
|
||||
fi
|
||||
if __DEFAULT_WAYLAND__ && [ "$XDG_SESSION_TYPE" = "wayland" ]; then
|
||||
export MOZ_ENABLE_WAYLAND=1
|
||||
fi
|
||||
## Remove comments to enable Wayland on KDE/Sway
|
||||
##
|
||||
## if __DEFAULT_WAYLAND__ && [ "$XDG_SESSION_TYPE" == "wayland" ]; then
|
||||
## export MOZ_ENABLE_WAYLAND=1
|
||||
## fi
|
||||
fi
|
||||
|
||||
##
|
||||
|
||||
31
firefox.spec
31
firefox.spec
@ -14,7 +14,7 @@
|
||||
# as the build is *very* slow.
|
||||
%global debug_build 0
|
||||
|
||||
%global system_nss 1
|
||||
%global system_nss 0
|
||||
%global build_with_clang 0
|
||||
%global build_with_asan 0
|
||||
%global test_offscreen 1
|
||||
@ -173,13 +173,13 @@ ExcludeArch: armv7hl
|
||||
|
||||
Summary: Mozilla Firefox Web browser
|
||||
Name: firefox
|
||||
Version: 85.0.1
|
||||
Release: 2%{?pre_tag}%{?dist}
|
||||
Version: 86.0
|
||||
Release: 1%{?pre_tag}%{?dist}
|
||||
URL: https://www.mozilla.org/firefox/
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
|
||||
%if %{with langpacks}
|
||||
Source1: firefox-langpacks-%{version}%{?pre_version}-20210208.tar.xz
|
||||
Source1: firefox-langpacks-%{version}%{?pre_version}-20210222.tar.xz
|
||||
%endif
|
||||
Source2: cbindgen-vendor.tar.xz
|
||||
Source10: firefox-mozconfig
|
||||
@ -225,8 +225,12 @@ Patch53: firefox-gcc-build.patch
|
||||
# This should be fixed in Firefox 83
|
||||
Patch54: mozilla-1669639.patch
|
||||
Patch55: firefox-testing.patch
|
||||
Patch56: mozilla-1686888.patch
|
||||
|
||||
# Test patches
|
||||
# Generate without context by
|
||||
# GENDIFF_DIFF_ARGS=-U0 gendiff firefox-xxxx .firefox-tests-xpcshell
|
||||
# GENDIFF_DIFF_ARGS=-U0 gendiff firefox-xxxx .firefox-tests-reftest
|
||||
Patch100: firefox-tests-xpcshell.patch
|
||||
Patch101: firefox-tests-reftest.patch
|
||||
|
||||
@ -248,14 +252,9 @@ Patch407: mozilla-1667096.patch
|
||||
Patch408: mozilla-1663844.patch
|
||||
Patch415: mozilla-1670333.patch
|
||||
Patch418: mozilla-1556931-s390x-hidden-syms.patch
|
||||
Patch423: mozilla-1681107.patch
|
||||
Patch424: firefox-wayland-fix-mzbz-1642949-regression.patch
|
||||
Patch426: mozilla-1687931.patch
|
||||
Patch427: mozilla-1678247.patch
|
||||
Patch428: mozilla-1679933.patch
|
||||
Patch429: mozilla-1631061-1.patch
|
||||
Patch430: mozilla-1631061-2.patch
|
||||
Patch431: mozilla-1690152.patch
|
||||
Patch431: mozilla-1683578.patch
|
||||
|
||||
# PGO/LTO patches
|
||||
Patch600: pgo.patch
|
||||
@ -474,6 +473,7 @@ This package contains results of tests executed during build.
|
||||
%patch53 -p1 -b .firefox-gcc-build
|
||||
%patch54 -p1 -b .1669639
|
||||
%patch55 -p1 -b .testing
|
||||
%patch56 -p1 -b .1686888-dump-syms
|
||||
|
||||
# Test patches
|
||||
%patch100 -p1 -b .firefox-tests-xpcshell
|
||||
@ -499,14 +499,9 @@ This package contains results of tests executed during build.
|
||||
%patch415 -p1 -b .1670333
|
||||
%patch418 -p1 -b .1556931-s390x-hidden-syms
|
||||
|
||||
%patch423 -p1 -b .1681107
|
||||
%patch424 -p1 -b .fix-mzbz-1642949-regression
|
||||
%patch426 -p1 -b .1687931
|
||||
%patch427 -p1 -b .1678247
|
||||
%patch428 -p1 -b .1679933
|
||||
%patch429 -p1 -b .1631061
|
||||
%patch430 -p1 -b .1631061
|
||||
%patch431 -p1 -b .1690152
|
||||
%patch431 -p1 -b .1683578
|
||||
|
||||
# PGO patches
|
||||
%if %{build_with_pgo}
|
||||
@ -1082,6 +1077,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Tue Feb 23 2021 Martin Stransky <stransky@redhat.com> - 86.0-1
|
||||
- Update to 86.0
|
||||
- Disabled Wayland backend on KDE/Plasma
|
||||
|
||||
* Tue Feb 23 2021 Martin Stransky <stransky@redhat.com> - 85.0.1-2
|
||||
- Fixed some reftest run in Mock
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ to be used with 'cargo vendor' commmand.
|
||||
"""
|
||||
|
||||
[dependencies]
|
||||
cbindgen = "0.15.0"
|
||||
cbindgen = "0.16.0"
|
||||
|
||||
[[bin]]
|
||||
name = "dummy"
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
diff -up firefox-80.0/widget/gtk/nsWindow.cpp.1196777 firefox-80.0/widget/gtk/nsWindow.cpp
|
||||
--- firefox-80.0/widget/gtk/nsWindow.cpp.1196777 2020-08-18 09:47:18.662833910 +0200
|
||||
+++ firefox-80.0/widget/gtk/nsWindow.cpp 2020-08-18 09:48:19.437478136 +0200
|
||||
@@ -158,7 +158,8 @@ const gint kEvents =
|
||||
GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK | GDK_VISIBILITY_NOTIFY_MASK |
|
||||
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_BUTTON_PRESS_MASK |
|
||||
GDK_BUTTON_RELEASE_MASK | GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK |
|
||||
- GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
|
||||
+ GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
|
||||
+ GDK_FOCUS_CHANGE_MASK;
|
||||
diff -up firefox-86.0/widget/gtk/nsWindow.cpp.1196777 firefox-86.0/widget/gtk/nsWindow.cpp
|
||||
--- firefox-86.0/widget/gtk/nsWindow.cpp.1196777 2021-02-23 17:52:42.291702566 +0100
|
||||
+++ firefox-86.0/widget/gtk/nsWindow.cpp 2021-02-23 17:57:52.434895984 +0100
|
||||
@@ -195,7 +195,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTUR
|
||||
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
|
||||
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
|
||||
GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SCROLL_MASK |
|
||||
- GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
|
||||
+ GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
|
||||
+ GDK_FOCUS_CHANGE_MASK;
|
||||
|
||||
#if !GTK_CHECK_VERSION(3, 22, 0)
|
||||
typedef enum {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -up firefox-84.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-84.0/dom/media/mp4/MP4Demuxer.cpp
|
||||
--- firefox-84.0/dom/media/mp4/MP4Demuxer.cpp.1670333 2020-12-07 23:32:59.000000000 +0100
|
||||
+++ firefox-84.0/dom/media/mp4/MP4Demuxer.cpp 2020-12-10 14:07:49.095266466 +0100
|
||||
diff -up firefox-86.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-86.0/dom/media/mp4/MP4Demuxer.cpp
|
||||
--- firefox-86.0/dom/media/mp4/MP4Demuxer.cpp.1670333 2021-02-22 14:43:37.000000000 +0100
|
||||
+++ firefox-86.0/dom/media/mp4/MP4Demuxer.cpp 2021-02-23 17:59:14.824346217 +0100
|
||||
@@ -31,6 +31,8 @@ mozilla::LogModule* GetDemuxerLog() { re
|
||||
DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
|
||||
__func__, ##__VA_ARGS__)
|
||||
@ -23,10 +23,10 @@ diff -up firefox-84.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-84.0/dom/medi
|
||||
if (sample->mKeyframe != keyframe) {
|
||||
NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
|
||||
"@ pts:%" PRId64 " dur:%" PRId64
|
||||
diff -up firefox-84.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-84.0/dom/media/platforms/PDMFactory.cpp
|
||||
--- firefox-84.0/dom/media/platforms/PDMFactory.cpp.1670333 2020-12-10 14:07:49.095266466 +0100
|
||||
+++ firefox-84.0/dom/media/platforms/PDMFactory.cpp 2020-12-10 15:29:28.969006031 +0100
|
||||
@@ -52,6 +52,8 @@
|
||||
diff -up firefox-86.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-86.0/dom/media/platforms/PDMFactory.cpp
|
||||
--- firefox-86.0/dom/media/platforms/PDMFactory.cpp.1670333 2021-02-22 15:47:05.000000000 +0100
|
||||
+++ firefox-86.0/dom/media/platforms/PDMFactory.cpp 2021-02-23 18:01:08.124715733 +0100
|
||||
@@ -59,6 +59,8 @@
|
||||
|
||||
#include <functional>
|
||||
|
||||
@ -34,8 +34,8 @@ diff -up firefox-84.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-84.0/do
|
||||
+
|
||||
namespace mozilla {
|
||||
|
||||
// Set on the main thread, in content processes before any PDMFactory will ever
|
||||
@@ -522,9 +524,11 @@ void PDMFactory::CreateContentPDMs() {
|
||||
extern already_AddRefed<PlatformDecoderModule> CreateNullDecoderModule();
|
||||
@@ -537,9 +539,11 @@ void PDMFactory::CreateDefaultPDMs() {
|
||||
}
|
||||
#endif
|
||||
#ifdef MOZ_FFMPEG
|
||||
@ -50,7 +50,7 @@ diff -up firefox-84.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-84.0/do
|
||||
}
|
||||
#endif
|
||||
#ifdef MOZ_WIDGET_ANDROID
|
||||
@@ -536,8 +540,9 @@ void PDMFactory::CreateContentPDMs() {
|
||||
@@ -551,8 +555,9 @@ void PDMFactory::CreateDefaultPDMs() {
|
||||
|
||||
CreateAndStartupPDM<AgnosticDecoderModule>();
|
||||
|
||||
@ -61,10 +61,10 @@ diff -up firefox-84.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-84.0/do
|
||||
mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
|
||||
}
|
||||
}
|
||||
diff -up firefox-84.0/dom/media/platforms/PDMFactory.h.1670333 firefox-84.0/dom/media/platforms/PDMFactory.h
|
||||
--- firefox-84.0/dom/media/platforms/PDMFactory.h.1670333 2020-12-10 14:07:49.096266493 +0100
|
||||
+++ firefox-84.0/dom/media/platforms/PDMFactory.h 2020-12-10 15:27:42.363034881 +0100
|
||||
@@ -116,6 +116,8 @@ class PDMFactory final {
|
||||
diff -up firefox-86.0/dom/media/platforms/PDMFactory.h.1670333 firefox-86.0/dom/media/platforms/PDMFactory.h
|
||||
--- firefox-86.0/dom/media/platforms/PDMFactory.h.1670333 2021-02-22 15:47:05.000000000 +0100
|
||||
+++ firefox-86.0/dom/media/platforms/PDMFactory.h 2021-02-23 17:59:14.824346217 +0100
|
||||
@@ -125,6 +125,8 @@ class PDMFactory final {
|
||||
|
||||
DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
|
||||
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
diff --git a/widget/gtk/MozContainerWayland.cpp b/widget/gtk/MozContainerWayland.cpp
|
||||
--- a/widget/gtk/MozContainerWayland.cpp
|
||||
+++ b/widget/gtk/MozContainerWayland.cpp
|
||||
@@ -22,6 +22,7 @@
|
||||
# include "mozilla/Logging.h"
|
||||
# include "nsTArray.h"
|
||||
# include "Units.h"
|
||||
+# include "nsWindow.h"
|
||||
extern mozilla::LazyLogModule gWidgetWaylandLog;
|
||||
# define LOGWAYLAND(args) \
|
||||
MOZ_LOG(gWidgetWaylandLog, mozilla::LogLevel::Debug, args)
|
||||
@@ -343,21 +344,19 @@
|
||||
moz_container_wayland_set_opaque_region_locked(container);
|
||||
}
|
||||
|
||||
-static int moz_gtk_widget_get_scale_factor(MozContainer* container) {
|
||||
- static auto sGtkWidgetGetScaleFactor =
|
||||
- (gint(*)(GtkWidget*))dlsym(RTLD_DEFAULT, "gtk_widget_get_scale_factor");
|
||||
- return sGtkWidgetGetScaleFactor
|
||||
- ? sGtkWidgetGetScaleFactor(GTK_WIDGET(container))
|
||||
- : 1;
|
||||
-}
|
||||
-
|
||||
static void moz_container_wayland_set_scale_factor_locked(
|
||||
MozContainer* container) {
|
||||
if (!container->wl_container.surface) {
|
||||
return;
|
||||
}
|
||||
- wl_surface_set_buffer_scale(container->wl_container.surface,
|
||||
- moz_gtk_widget_get_scale_factor(container));
|
||||
+ gpointer user_data = g_object_get_data(G_OBJECT(container), "nsWindow");
|
||||
+ nsWindow* wnd = static_cast<nsWindow*>(user_data);
|
||||
+
|
||||
+ int scale = 1;
|
||||
+ if (wnd) {
|
||||
+ scale = wnd->GdkScaleFactor();
|
||||
+ }
|
||||
+ wl_surface_set_buffer_scale(container->wl_container.surface, scale);
|
||||
}
|
||||
|
||||
void moz_container_wayland_set_scale_factor(MozContainer* container) {
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
diff --git a/netwerk/base/nsNetUtil.cpp b/netwerk/base/nsNetUtil.cpp
|
||||
--- a/netwerk/base/nsNetUtil.cpp
|
||||
+++ b/netwerk/base/nsNetUtil.cpp
|
||||
@@ -2714,9 +2714,8 @@
|
||||
MOZ_ASSERT(XRE_IsParentProcess());
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
- nsresult rv;
|
||||
- nsCOMPtr<nsISupports> psm = do_GetService(PSM_COMPONENT_CONTRACTID, &rv);
|
||||
- MOZ_ASSERT(NS_SUCCEEDED(rv));
|
||||
+ DebugOnly<bool> rv = EnsureNSSInitializedChromeOrContent();
|
||||
+ MOZ_ASSERT(rv);
|
||||
|
||||
#ifndef MOZ_NEW_CERT_STORAGE
|
||||
nsCOMPtr<nsISupports> cbl = do_GetService(NS_CERTBLOCKLIST_CONTRACTID);
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
|
||||
# HG changeset patch
|
||||
# User sotaro <sotaro.ikeda.g@gmail.com>
|
||||
# Date 1610634595 0
|
||||
# Node ID c989e16ae8d0801b76efe712658abcbf3704a486
|
||||
# Parent dc0d1d98e111aa781333980c2561f534ea1ebb0b
|
||||
Bug 1681107 - Fix race condition of calling CompositorBridgeChild::SendPause() r=rmader,stransky
|
||||
|
||||
Differential Revision: https://phabricator.services.mozilla.com/D101693
|
||||
|
||||
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
|
||||
--- a/widget/gtk/nsWindow.cpp
|
||||
+++ b/widget/gtk/nsWindow.cpp
|
||||
@@ -5085,23 +5085,29 @@ void nsWindow::NativeMoveResize() {
|
||||
if (mNeedsShow && mIsShown) {
|
||||
NativeShow(true);
|
||||
}
|
||||
}
|
||||
|
||||
void nsWindow::PauseRemoteRenderer() {
|
||||
#ifdef MOZ_WAYLAND
|
||||
if (!mIsDestroyed) {
|
||||
- if (mContainer && moz_container_wayland_has_egl_window(mContainer)) {
|
||||
+ if (mContainer) {
|
||||
// Because wl_egl_window is destroyed on moz_container_unmap(),
|
||||
// the current compositor cannot use it anymore. To avoid crash,
|
||||
// pause the compositor and destroy EGLSurface & resume the compositor
|
||||
// and re-create EGLSurface on next expose event.
|
||||
- MOZ_ASSERT(GetRemoteRenderer());
|
||||
- if (CompositorBridgeChild* remoteRenderer = GetRemoteRenderer()) {
|
||||
+
|
||||
+ // moz_container_wayland_has_egl_window() could not be used here, since
|
||||
+ // there is a case that resume compositor is not completed yet.
|
||||
+
|
||||
+ CompositorBridgeChild* remoteRenderer = GetRemoteRenderer();
|
||||
+ bool needsCompositorPause = !mNeedsCompositorResume && !!remoteRenderer &&
|
||||
+ mCompositorWidgetDelegate;
|
||||
+ if (needsCompositorPause) {
|
||||
// XXX slow sync IPC
|
||||
remoteRenderer->SendPause();
|
||||
// Re-request initial draw callback
|
||||
RefPtr<nsWindow> self(this);
|
||||
moz_container_wayland_add_initial_draw_callback(
|
||||
mContainer, [self]() -> void {
|
||||
self->mNeedsCompositorResume = true;
|
||||
self->MaybeResumeCompositor();
|
||||
|
||||
109
mozilla-1683578.patch
Normal file
109
mozilla-1683578.patch
Normal file
@ -0,0 +1,109 @@
|
||||
diff -up firefox-86.0/widget/gtk/nsWindow.cpp.1683578 firefox-86.0/widget/gtk/nsWindow.cpp
|
||||
--- firefox-86.0/widget/gtk/nsWindow.cpp.1683578 2021-02-24 10:09:53.471680954 +0100
|
||||
+++ firefox-86.0/widget/gtk/nsWindow.cpp 2021-02-24 10:09:53.510681881 +0100
|
||||
@@ -1769,6 +1769,9 @@ void nsWindow::NativeMoveResizeWaylandPo
|
||||
bool isWidgetVisible =
|
||||
(sGtkWidgetIsVisible != nullptr) && sGtkWidgetIsVisible(mShell);
|
||||
if (isWidgetVisible) {
|
||||
+ LOG(
|
||||
+ (" temporary hide popup due to "
|
||||
+ "https://gitlab.gnome.org/GNOME/gtk/issues/1986\n"));
|
||||
PauseRemoteRenderer();
|
||||
gtk_widget_hide(mShell);
|
||||
}
|
||||
@@ -1823,6 +1826,9 @@ void nsWindow::NativeMoveResizeWaylandPo
|
||||
if (isWidgetVisible) {
|
||||
// We show the popup with the same configuration so no need to call
|
||||
// ConfigureWaylandPopupWindows() before gtk_widget_show().
|
||||
+ LOG(
|
||||
+ (" show popup due to "
|
||||
+ "https://gitlab.gnome.org/GNOME/gtk/issues/1986\n"));
|
||||
gtk_widget_show(mShell);
|
||||
}
|
||||
}
|
||||
diff -up firefox-86.0/widget/gtk/WindowSurfaceWayland.cpp.1683578 firefox-86.0/widget/gtk/WindowSurfaceWayland.cpp
|
||||
--- firefox-86.0/widget/gtk/WindowSurfaceWayland.cpp.1683578 2021-02-22 15:47:05.000000000 +0100
|
||||
+++ firefox-86.0/widget/gtk/WindowSurfaceWayland.cpp 2021-02-24 10:12:59.835110678 +0100
|
||||
@@ -467,7 +467,7 @@ WindowSurfaceWayland::WindowSurfaceWayla
|
||||
mWaylandBuffer(nullptr),
|
||||
mWaylandFullscreenDamage(false),
|
||||
mFrameCallback(nullptr),
|
||||
- mLastCommittedSurface(nullptr),
|
||||
+ mLastCommittedSurfaceID(-1),
|
||||
mLastCommitTime(0),
|
||||
mDrawToWaylandBufferDirectly(true),
|
||||
mCanSwitchWaylandBuffer(true),
|
||||
@@ -964,7 +964,7 @@ bool WindowSurfaceWayland::FlushPendingC
|
||||
(" mDrawToWaylandBufferDirectly = %d\n", mDrawToWaylandBufferDirectly));
|
||||
LOGWAYLAND((" mCanSwitchWaylandBuffer = %d\n", mCanSwitchWaylandBuffer));
|
||||
LOGWAYLAND((" mFrameCallback = %p\n", mFrameCallback));
|
||||
- LOGWAYLAND((" mLastCommittedSurface = %p\n", mLastCommittedSurface));
|
||||
+ LOGWAYLAND((" mLastCommittedSurfaceID = %d\n", mLastCommittedSurfaceID));
|
||||
LOGWAYLAND((" mBufferPendingCommit = %d\n", mBufferPendingCommit));
|
||||
LOGWAYLAND((" mBufferCommitAllowed = %d\n", mBufferCommitAllowed));
|
||||
|
||||
@@ -990,12 +990,6 @@ bool WindowSurfaceWayland::FlushPendingC
|
||||
LOGWAYLAND((" [%p] mWindow->GetWaylandSurface() failed, delay commit.\n",
|
||||
(void*)this));
|
||||
|
||||
- // Target window is not created yet - delay the commit. This can happen only
|
||||
- // when the window is newly created and there's no active
|
||||
- // frame callback pending.
|
||||
- MOZ_ASSERT(!mFrameCallback || waylandSurface != mLastCommittedSurface,
|
||||
- "Missing wayland surface at frame callback!");
|
||||
-
|
||||
if (!mSurfaceReadyTimerID) {
|
||||
mSurfaceReadyTimerID = g_timeout_add(
|
||||
EVENT_LOOP_DELAY, &WaylandBufferFlushPendingCommits, this);
|
||||
@@ -1016,8 +1010,10 @@ bool WindowSurfaceWayland::FlushPendingC
|
||||
|
||||
// We have an active frame callback request so handle it.
|
||||
if (mFrameCallback) {
|
||||
- if (waylandSurface == mLastCommittedSurface) {
|
||||
- LOGWAYLAND((" [%p] wait for frame callback.\n", (void*)this));
|
||||
+ int waylandSurfaceID = wl_proxy_get_id((struct wl_proxy*)waylandSurface);
|
||||
+ if (waylandSurfaceID == mLastCommittedSurfaceID) {
|
||||
+ LOGWAYLAND((" [%p] wait for frame callback ID %d.\n", (void*)this,
|
||||
+ waylandSurfaceID));
|
||||
// We have an active frame callback pending from our recent surface.
|
||||
// It means we should defer the commit to FrameCallbackHandler().
|
||||
return true;
|
||||
@@ -1026,7 +1022,7 @@ bool WindowSurfaceWayland::FlushPendingC
|
||||
// callback is no longer active and we should release it.
|
||||
wl_callback_destroy(mFrameCallback);
|
||||
mFrameCallback = nullptr;
|
||||
- mLastCommittedSurface = nullptr;
|
||||
+ mLastCommittedSurfaceID = -1;
|
||||
}
|
||||
|
||||
if (mWaylandFullscreenDamage) {
|
||||
@@ -1055,7 +1051,7 @@ bool WindowSurfaceWayland::FlushPendingC
|
||||
wl_callback_add_listener(mFrameCallback, &frame_listener, this);
|
||||
|
||||
mWaylandBuffer->Attach(waylandSurface);
|
||||
- mLastCommittedSurface = waylandSurface;
|
||||
+ mLastCommittedSurfaceID = wl_proxy_get_id((struct wl_proxy*)waylandSurface);
|
||||
mLastCommitTime = g_get_monotonic_time() / 1000;
|
||||
|
||||
// There's no pending commit, all changes are sent to compositor.
|
||||
@@ -1097,7 +1093,7 @@ void WindowSurfaceWayland::Commit(const
|
||||
void WindowSurfaceWayland::FrameCallbackHandler() {
|
||||
MOZ_ASSERT(mFrameCallback != nullptr,
|
||||
"FrameCallbackHandler() called without valid frame callback!");
|
||||
- MOZ_ASSERT(mLastCommittedSurface != nullptr,
|
||||
+ MOZ_ASSERT(mLastCommittedSurfaceID != -1,
|
||||
"FrameCallbackHandler() called without valid wl_surface!");
|
||||
LOGWAYLAND(
|
||||
("WindowSurfaceWayland::FrameCallbackHandler [%p]\n", (void*)this));
|
||||
diff -up firefox-86.0/widget/gtk/WindowSurfaceWayland.h.1683578 firefox-86.0/widget/gtk/WindowSurfaceWayland.h
|
||||
--- firefox-86.0/widget/gtk/WindowSurfaceWayland.h.1683578 2021-02-22 15:47:05.000000000 +0100
|
||||
+++ firefox-86.0/widget/gtk/WindowSurfaceWayland.h 2021-02-24 10:09:53.509681857 +0100
|
||||
@@ -215,7 +215,7 @@ class WindowSurfaceWayland : public Wind
|
||||
// Any next commit to wayland compositor will happen when frame callback
|
||||
// comes from wayland compositor back as it's the best time to do the commit.
|
||||
wl_callback* mFrameCallback;
|
||||
- wl_surface* mLastCommittedSurface;
|
||||
+ int mLastCommittedSurfaceID;
|
||||
|
||||
// Cached drawings. If we can't get WaylandBuffer (wl_buffer) at
|
||||
// WindowSurfaceWayland::Lock() we direct gecko rendering to
|
||||
578
mozilla-1686888.patch
Normal file
578
mozilla-1686888.patch
Normal file
@ -0,0 +1,578 @@
|
||||
diff -up firefox-86.0/Cargo.lock.1686888-dump-syms firefox-86.0/Cargo.lock
|
||||
--- firefox-86.0/Cargo.lock.1686888-dump-syms 2021-02-22 15:47:04.000000000 +0100
|
||||
+++ firefox-86.0/Cargo.lock 2021-02-24 10:01:09.217178617 +0100
|
||||
@@ -1241,6 +1241,13 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
+name = "dump_syms_rust_demangle"
|
||||
+version = "0.1.0"
|
||||
+dependencies = [
|
||||
+ "rustc-demangle",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
name = "dwrote"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
diff -up firefox-86.0/Cargo.toml.1686888-dump-syms firefox-86.0/Cargo.toml
|
||||
--- firefox-86.0/Cargo.toml.1686888-dump-syms 2021-02-22 15:47:04.000000000 +0100
|
||||
+++ firefox-86.0/Cargo.toml 2021-02-24 10:01:09.217178617 +0100
|
||||
@@ -13,6 +13,7 @@ members = [
|
||||
"netwerk/test/http3server",
|
||||
"security/manager/ssl/osclientcerts",
|
||||
"testing/geckodriver",
|
||||
+ "toolkit/crashreporter/rust",
|
||||
"toolkit/crashreporter/rust_minidump_writer_linux",
|
||||
"toolkit/library/gtest/rust",
|
||||
"toolkit/library/rust/",
|
||||
diff -up firefox-86.0/python/mozbuild/mozbuild/action/dumpsymbols.py.1686888-dump-syms firefox-86.0/python/mozbuild/mozbuild/action/dumpsymbols.py
|
||||
--- firefox-86.0/python/mozbuild/mozbuild/action/dumpsymbols.py.1686888-dump-syms 2021-02-22 14:43:46.000000000 +0100
|
||||
+++ firefox-86.0/python/mozbuild/mozbuild/action/dumpsymbols.py 2021-02-24 10:01:09.218178640 +0100
|
||||
@@ -29,7 +29,29 @@ def dump_symbols(target, tracking_file,
|
||||
# Build default args for symbolstore.py based on platform.
|
||||
sym_store_args = []
|
||||
|
||||
- dump_syms_bin = buildconfig.substs["DUMP_SYMS"]
|
||||
+ # Find the `dump_syms` binary to use.
|
||||
+ dump_syms_bin = None
|
||||
+ dump_syms_binaries = []
|
||||
+
|
||||
+ default_bin = buildconfig.substs.get("DUMP_SYMS")
|
||||
+ if default_bin:
|
||||
+ dump_syms_binaries.append(default_bin)
|
||||
+
|
||||
+ # Fallback to the in-tree breakpad version.
|
||||
+ dump_syms_binaries.append(
|
||||
+ os.path.join(
|
||||
+ buildconfig.topobjdir,
|
||||
+ "dist",
|
||||
+ "host",
|
||||
+ "bin",
|
||||
+ "dump_syms" + buildconfig.substs["BIN_SUFFIX"],
|
||||
+ )
|
||||
+ )
|
||||
+
|
||||
+ for dump_syms_bin in dump_syms_binaries:
|
||||
+ if os.path.exists(dump_syms_bin):
|
||||
+ break
|
||||
+
|
||||
os_arch = buildconfig.substs["OS_ARCH"]
|
||||
if os_arch == "WINNT":
|
||||
sym_store_args.extend(["-c", "--vcs-info"])
|
||||
diff -up firefox-86.0/taskcluster/ci/toolchain/minidump_stackwalk.yml.1686888-dump-syms firefox-86.0/taskcluster/ci/toolchain/minidump_stackwalk.yml
|
||||
--- firefox-86.0/taskcluster/ci/toolchain/minidump_stackwalk.yml.1686888-dump-syms 2021-02-22 15:47:05.000000000 +0100
|
||||
+++ firefox-86.0/taskcluster/ci/toolchain/minidump_stackwalk.yml 2021-02-24 10:01:09.218178640 +0100
|
||||
@@ -17,7 +17,9 @@ job-defaults:
|
||||
- 'config/external/zlib'
|
||||
- 'moz.configure'
|
||||
- 'toolkit/crashreporter'
|
||||
+ - 'toolkit/crashreporter/google-breakpad/src/common'
|
||||
- 'toolkit/crashreporter/google-breakpad/src/processor'
|
||||
+ - 'toolkit/crashreporter/rust'
|
||||
- 'tools/crashreporter/'
|
||||
toolchain-artifact: public/build/minidump_stackwalk.tar.xz
|
||||
run-on-projects:
|
||||
diff -up firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build.1686888-dump-syms firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build
|
||||
--- firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build.1686888-dump-syms 2021-02-24 10:01:09.218178640 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build 2021-02-24 10:01:09.218178640 +0100
|
||||
@@ -0,0 +1,35 @@
|
||||
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
+# vim: set filetype=python:
|
||||
+# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
+
|
||||
+HostLibrary('host_breakpad_dwarf_s')
|
||||
+HOST_SOURCES += [
|
||||
+ 'bytereader.cc',
|
||||
+ 'dwarf2diehandler.cc',
|
||||
+ 'dwarf2reader.cc',
|
||||
+ 'elf_reader.cc',
|
||||
+ 'functioninfo.cc',
|
||||
+]
|
||||
+HOST_CXXFLAGS += [
|
||||
+ '-O2',
|
||||
+ '-g',
|
||||
+]
|
||||
+
|
||||
+# need static lib
|
||||
+FORCE_STATIC_LIB = True
|
||||
+
|
||||
+# This code is only compiled for build-time tools,
|
||||
+# so enabling RTTI should be fine.
|
||||
+HOST_CXXFLAGS += [
|
||||
+ '-frtti',
|
||||
+ '-funsigned-char',
|
||||
+]
|
||||
+
|
||||
+if CONFIG['OS_ARCH'] == 'Darwin':
|
||||
+ HOST_CXXFLAGS += [
|
||||
+ '-stdlib=libc++',
|
||||
+ ]
|
||||
+
|
||||
+include('/toolkit/crashreporter/crashreporter.mozbuild')
|
||||
diff -up firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build.1686888-dump-syms firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
|
||||
--- firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build.1686888-dump-syms 2021-02-22 14:43:54.000000000 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build 2021-02-24 10:01:09.218178640 +0100
|
||||
@@ -21,6 +21,24 @@ if CONFIG['OS_TARGET'] != 'Android':
|
||||
'http_upload.cc',
|
||||
]
|
||||
|
||||
+if CONFIG['HOST_OS_ARCH'] == 'Linux':
|
||||
+ HostLibrary('host_breakpad_linux_common_s')
|
||||
+
|
||||
+ HOST_SOURCES += [
|
||||
+ 'crc32.cc',
|
||||
+ 'dump_symbols.cc',
|
||||
+ 'elf_symbols_to_module.cc',
|
||||
+ 'elfutils.cc',
|
||||
+ 'file_id.cc',
|
||||
+ 'linux_libc_support.cc',
|
||||
+ 'memory_mapped_file.cc',
|
||||
+ ]
|
||||
+
|
||||
+ HOST_CXXFLAGS += [
|
||||
+ '-O2',
|
||||
+ '-g',
|
||||
+ ]
|
||||
+
|
||||
if CONFIG['OS_TARGET'] == 'Android':
|
||||
DEFINES['ANDROID_NDK_MAJOR_VERSION'] = CONFIG['ANDROID_NDK_MAJOR_VERSION']
|
||||
DEFINES['ANDROID_NDK_MINOR_VERSION'] = CONFIG['ANDROID_NDK_MINOR_VERSION']
|
||||
@@ -36,6 +54,8 @@ if not CONFIG['HAVE_GETCONTEXT']:
|
||||
|
||||
Library('breakpad_linux_common_s')
|
||||
|
||||
+HOST_DEFINES['NO_STABS_SUPPORT'] = True
|
||||
+
|
||||
include('/toolkit/crashreporter/crashreporter.mozbuild')
|
||||
|
||||
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
|
||||
diff -up firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build.1686888-dump-syms firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
|
||||
--- firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build.1686888-dump-syms 2021-02-22 14:43:54.000000000 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build 2021-02-24 10:01:09.218178640 +0100
|
||||
@@ -13,6 +13,26 @@ UNIFIED_SOURCES += [
|
||||
'macho_walker.cc',
|
||||
]
|
||||
|
||||
+if CONFIG['HOST_OS_ARCH'] != 'Darwin':
|
||||
+ HOST_CXXFLAGS += [
|
||||
+ '-I%s/toolkit/crashreporter/google-breakpad/src/third_party/mac_headers/' % TOPSRCDIR,
|
||||
+ ]
|
||||
+
|
||||
+# This is a little weird, but we're building a host and a target lib here.
|
||||
+# The host lib is used for dump_syms, and the target lib for the
|
||||
+# crash reporter client. Therefore, we don't need all the srcs in both.
|
||||
+if CONFIG['MOZ_CRASHREPORTER']:
|
||||
+ HOST_SOURCES += UNIFIED_SOURCES
|
||||
+ HOST_SOURCES += [
|
||||
+ 'dump_syms.cc',
|
||||
+ ]
|
||||
+ HOST_CXXFLAGS += [
|
||||
+ '-O2',
|
||||
+ '-g',
|
||||
+ '-stdlib=libc++',
|
||||
+ ]
|
||||
+ HostLibrary('host_breakpad_mac_common_s')
|
||||
+
|
||||
SOURCES += [
|
||||
'bootstrap_compat.cc',
|
||||
'HTTPMultipartUpload.m',
|
||||
diff -up firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/moz.build.1686888-dump-syms firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/moz.build
|
||||
--- firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/moz.build.1686888-dump-syms 2021-02-22 14:43:54.000000000 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/moz.build 2021-02-24 10:01:09.218178640 +0100
|
||||
@@ -14,6 +14,51 @@ if CONFIG['OS_ARCH'] == 'Darwin':
|
||||
'md5.cc',
|
||||
]
|
||||
|
||||
+if CONFIG['OS_ARCH'] == 'Linux':
|
||||
+ HOST_DEFINES['HAVE_A_OUT_H'] = True
|
||||
+elif CONFIG['OS_ARCH'] == 'Darwin':
|
||||
+ HOST_DEFINES['HAVE_MACH_O_NLIST_H'] = True
|
||||
+ HOST_SOURCES += [
|
||||
+ 'stabs_reader.cc',
|
||||
+ 'stabs_to_module.cc',
|
||||
+ ]
|
||||
+ if CONFIG['HOST_OS_ARCH'] != 'Darwin':
|
||||
+ HOST_CXXFLAGS += [
|
||||
+ '-I%s/toolkit/crashreporter/google-breakpad/src/third_party/mac_headers/' % TOPSRCDIR,
|
||||
+ ]
|
||||
+
|
||||
+if CONFIG['HOST_OS_ARCH'] != 'WINNT':
|
||||
+ if CONFIG['OS_ARCH'] in ('Darwin', 'Linux'):
|
||||
+ DIRS += ['dwarf']
|
||||
+
|
||||
+ HOST_SOURCES += [
|
||||
+ 'arm_ex_reader.cc',
|
||||
+ 'arm_ex_to_module.cc',
|
||||
+ 'convert_UTF.cc',
|
||||
+ 'dwarf_cfi_to_module.cc',
|
||||
+ 'dwarf_cu_to_module.cc',
|
||||
+ 'dwarf_line_to_module.cc',
|
||||
+ 'dwarf_range_list_handler.cc',
|
||||
+ 'language.cc',
|
||||
+ 'md5.cc',
|
||||
+ 'module.cc',
|
||||
+ 'path_helper.cc',
|
||||
+ 'string_conversion.cc',
|
||||
+ ]
|
||||
+ if CONFIG['OS_ARCH'] == 'Darwin':
|
||||
+ HOST_CXXFLAGS += [
|
||||
+ '-stdlib=libc++',
|
||||
+ ]
|
||||
+ HOST_CXXFLAGS += [
|
||||
+ '-O2',
|
||||
+ '-g',
|
||||
+ ]
|
||||
+ HOST_DEFINES['HAVE_RUST_DEMANGLE'] = True
|
||||
+ LOCAL_INCLUDES += [
|
||||
+ '/toolkit/crashreporter/rust',
|
||||
+ ]
|
||||
+ HostLibrary('host_breakpad_common_s')
|
||||
+
|
||||
Library('breakpad_common_s')
|
||||
|
||||
include('/toolkit/crashreporter/crashreporter.mozbuild')
|
||||
diff -up firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build.1686888-dump-syms firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build
|
||||
--- firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build.1686888-dump-syms 2021-02-24 10:01:09.218178640 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build 2021-02-24 10:01:09.218178640 +0100
|
||||
@@ -0,0 +1,34 @@
|
||||
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
+# vim: set filetype=python:
|
||||
+# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
+
|
||||
+UNIFIED_SOURCES += [
|
||||
+ 'dump_symbols.cc',
|
||||
+ 'file_id.cc',
|
||||
+ 'guid_creator.cc',
|
||||
+]
|
||||
+
|
||||
+HostLibrary('host_breakpad_solaris_common_s')
|
||||
+
|
||||
+Library('breakpad_solaris_common_s')
|
||||
+
|
||||
+# not compiling http_upload.cc currently
|
||||
+# since it depends on libcurl
|
||||
+HOST_SOURCES += [
|
||||
+ 'dump_symbols.cc',
|
||||
+ 'file_id.cc',
|
||||
+ 'guid_creator.cc',
|
||||
+]
|
||||
+HOST_CXXFLAGS += [
|
||||
+ '-O2',
|
||||
+ '-g',
|
||||
+]
|
||||
+
|
||||
+FINAL_LIBRARY = 'xul'
|
||||
+
|
||||
+LOCAL_INCLUDES += [
|
||||
+ '../..',
|
||||
+]
|
||||
+
|
||||
diff -up firefox-86.0/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/moz.build.1686888-dump-syms firefox-86.0/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/moz.build
|
||||
--- firefox-86.0/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/moz.build.1686888-dump-syms 2021-02-24 10:01:09.218178640 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/moz.build 2021-02-24 10:01:09.218178640 +0100
|
||||
@@ -0,0 +1,45 @@
|
||||
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
+# vim: set filetype=python:
|
||||
+# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
+
|
||||
+HostProgram('dump_syms')
|
||||
+
|
||||
+HOST_SOURCES += [
|
||||
+ 'dump_syms.cc',
|
||||
+]
|
||||
+
|
||||
+HOST_CXXFLAGS += [
|
||||
+ '-O2',
|
||||
+ '-g',
|
||||
+]
|
||||
+
|
||||
+# host_breakpad_linux_common_s needs to come first
|
||||
+HOST_USE_LIBS += [
|
||||
+ 'host_breakpad_linux_common_s',
|
||||
+]
|
||||
+HOST_USE_LIBS += [
|
||||
+ 'host_breakpad_common_s',
|
||||
+ 'host_breakpad_dwarf_s',
|
||||
+]
|
||||
+# Order matters here, but HOST_USE_LIBS must be sorted.
|
||||
+HOST_USE_LIBS += [
|
||||
+ 'dump_syms_rust_demangle',
|
||||
+]
|
||||
+# Ideally, this should be derived from the output of rustc
|
||||
+# --print=native-static-libs or something like that.
|
||||
+HOST_OS_LIBS += [
|
||||
+ 'dl',
|
||||
+ 'pthread',
|
||||
+]
|
||||
+if CONFIG['HOST_OS_ARCH'] == 'Linux':
|
||||
+ HOST_OS_LIBS += [
|
||||
+ 'rt',
|
||||
+ ]
|
||||
+
|
||||
+LOCAL_INCLUDES += [
|
||||
+ '../../../common/linux',
|
||||
+]
|
||||
+
|
||||
+include('/toolkit/crashreporter/crashreporter.mozbuild')
|
||||
diff -up firefox-86.0/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/moz.build.1686888-dump-syms firefox-86.0/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/moz.build
|
||||
--- firefox-86.0/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/moz.build.1686888-dump-syms 2021-02-24 10:01:09.218178640 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/moz.build 2021-02-24 10:01:09.218178640 +0100
|
||||
@@ -0,0 +1,52 @@
|
||||
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
+# vim: set filetype=python:
|
||||
+# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
+
|
||||
+HostProgram('dump_syms')
|
||||
+
|
||||
+HOST_SOURCES += [
|
||||
+ 'dump_syms_tool.cc',
|
||||
+]
|
||||
+
|
||||
+HOST_CXXFLAGS += [
|
||||
+ '-O2',
|
||||
+ '-g',
|
||||
+ '-pthread',
|
||||
+ '-stdlib=libc++',
|
||||
+]
|
||||
+
|
||||
+# Order matters here, but HOST_USE_LIBS must be sorted.
|
||||
+HOST_USE_LIBS += [
|
||||
+ 'host_breakpad_mac_common_s',
|
||||
+]
|
||||
+HOST_USE_LIBS += [
|
||||
+ 'host_breakpad_common_s',
|
||||
+ 'host_breakpad_dwarf_s',
|
||||
+]
|
||||
+# Order matters here, but HOST_USE_LIBS must be sorted.
|
||||
+HOST_USE_LIBS += [
|
||||
+ 'dump_syms_rust_demangle',
|
||||
+]
|
||||
+# Ideally, this should be derived from the output of rustc
|
||||
+# --print=native-static-libs or something like that.
|
||||
+HOST_OS_LIBS += [
|
||||
+ 'dl',
|
||||
+ 'pthread',
|
||||
+]
|
||||
+if CONFIG['HOST_OS_ARCH'] == 'Linux':
|
||||
+ HOST_OS_LIBS += [
|
||||
+ 'rt',
|
||||
+ ]
|
||||
+
|
||||
+LOCAL_INCLUDES += [
|
||||
+ '../../../common/mac',
|
||||
+]
|
||||
+
|
||||
+if CONFIG['HOST_OS_ARCH'] != 'Darwin':
|
||||
+ HOST_CXXFLAGS += [
|
||||
+ '-I%s/toolkit/crashreporter/google-breakpad/src/third_party/mac_headers/' % TOPSRCDIR,
|
||||
+ ]
|
||||
+
|
||||
+include('/toolkit/crashreporter/crashreporter.mozbuild')
|
||||
diff -up firefox-86.0/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/moz.build.1686888-dump-syms firefox-86.0/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/moz.build
|
||||
--- firefox-86.0/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/moz.build.1686888-dump-syms 2021-02-24 10:01:09.218178640 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/moz.build 2021-02-24 10:01:09.218178640 +0100
|
||||
@@ -0,0 +1,27 @@
|
||||
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
+# vim: set filetype=python:
|
||||
+# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
+
|
||||
+HostProgram('dump_syms')
|
||||
+
|
||||
+HOST_SOURCES += [
|
||||
+ 'dump_syms.cc',
|
||||
+]
|
||||
+
|
||||
+HOST_CXXFLAGS += [
|
||||
+ '-O2',
|
||||
+ '-g',
|
||||
+]
|
||||
+
|
||||
+HOST_USE_LIBS += [
|
||||
+ 'host_breakpad_common_s',
|
||||
+ 'host_breakpad_solaris_common_s',
|
||||
+]
|
||||
+
|
||||
+LOCAL_INCLUDES += [
|
||||
+ '../../../common/solaris',
|
||||
+]
|
||||
+
|
||||
+include('/toolkit/crashreporter/crashreporter.mozbuild')
|
||||
diff -up firefox-86.0/toolkit/crashreporter/moz.build.1686888-dump-syms firefox-86.0/toolkit/crashreporter/moz.build
|
||||
--- firefox-86.0/toolkit/crashreporter/moz.build.1686888-dump-syms 2021-02-22 14:43:54.000000000 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/moz.build 2021-02-24 10:02:32.742171784 +0100
|
||||
@@ -43,6 +43,11 @@ if CONFIG["MOZ_CRASHREPORTER"]:
|
||||
"google-breakpad/src/common/mac",
|
||||
"google-breakpad/src/processor",
|
||||
]
|
||||
+ if not CONFIG["DUMP_SYMS"]:
|
||||
+ DIRS += [
|
||||
+ "google-breakpad/src/tools/mac/dump_syms",
|
||||
+ "rust",
|
||||
+ ]
|
||||
|
||||
elif CONFIG["OS_ARCH"] == "Linux":
|
||||
DIRS += [
|
||||
@@ -56,6 +61,12 @@ if CONFIG["MOZ_CRASHREPORTER"]:
|
||||
if CONFIG["MOZ_OXIDIZED_BREAKPAD"]:
|
||||
DIRS += ["rust_minidump_writer_linux"]
|
||||
|
||||
+ if not CONFIG["DUMP_SYMS"] and CONFIG["HOST_OS_ARCH"] == "Linux":
|
||||
+ DIRS += [
|
||||
+ "google-breakpad/src/tools/linux/dump_syms",
|
||||
+ "rust",
|
||||
+ ]
|
||||
+
|
||||
DIRS += [
|
||||
"client",
|
||||
"minidump-analyzer",
|
||||
diff -up firefox-86.0/toolkit/crashreporter/rust/Cargo.toml.1686888-dump-syms firefox-86.0/toolkit/crashreporter/rust/Cargo.toml
|
||||
--- firefox-86.0/toolkit/crashreporter/rust/Cargo.toml.1686888-dump-syms 2021-02-24 10:01:09.219178664 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/rust/Cargo.toml 2021-02-24 10:01:09.219178664 +0100
|
||||
@@ -0,0 +1,16 @@
|
||||
+[package]
|
||||
+name = "dump_syms_rust_demangle"
|
||||
+version = "0.1.0"
|
||||
+
|
||||
+[dependencies]
|
||||
+rustc-demangle = "0.1"
|
||||
+
|
||||
+[lib]
|
||||
+path = "lib.rs"
|
||||
+crate-type = ["staticlib"]
|
||||
+test = false
|
||||
+doctest = false
|
||||
+bench = false
|
||||
+doc = false
|
||||
+plugin = false
|
||||
+harness = false
|
||||
diff -up firefox-86.0/toolkit/crashreporter/rust/lib.rs.1686888-dump-syms firefox-86.0/toolkit/crashreporter/rust/lib.rs
|
||||
--- firefox-86.0/toolkit/crashreporter/rust/lib.rs.1686888-dump-syms 2021-02-24 10:01:09.219178664 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/rust/lib.rs 2021-02-24 10:01:09.219178664 +0100
|
||||
@@ -0,0 +1,32 @@
|
||||
+/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
+
|
||||
+extern crate rustc_demangle;
|
||||
+
|
||||
+use rustc_demangle::demangle;
|
||||
+use std::ffi::{CStr, CString};
|
||||
+use std::ptr;
|
||||
+
|
||||
+/// Demangle `name` as a Rust symbol.
|
||||
+///
|
||||
+/// The resulting pointer should be freed with `free_demangled_name`.
|
||||
+#[no_mangle]
|
||||
+pub extern "C" fn rust_demangle(name: *const std::os::raw::c_char) -> *mut std::os::raw::c_char {
|
||||
+ let demangled = format!(
|
||||
+ "{:#}",
|
||||
+ demangle(&unsafe { CStr::from_ptr(name) }.to_string_lossy())
|
||||
+ );
|
||||
+ CString::new(demangled)
|
||||
+ .map(|s| s.into_raw())
|
||||
+ .unwrap_or(ptr::null_mut())
|
||||
+}
|
||||
+
|
||||
+/// Free a string that was returned from `rust_demangle`.
|
||||
+#[no_mangle]
|
||||
+pub extern "C" fn free_rust_demangled_name(demangled: *mut std::os::raw::c_char) {
|
||||
+ if demangled != ptr::null_mut() {
|
||||
+ // Just take ownership here.
|
||||
+ unsafe { CString::from_raw(demangled) };
|
||||
+ }
|
||||
+}
|
||||
diff -up firefox-86.0/toolkit/crashreporter/rust/moz.build.1686888-dump-syms firefox-86.0/toolkit/crashreporter/rust/moz.build
|
||||
--- firefox-86.0/toolkit/crashreporter/rust/moz.build.1686888-dump-syms 2021-02-24 10:01:09.219178664 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/rust/moz.build 2021-02-24 10:01:09.219178664 +0100
|
||||
@@ -0,0 +1 @@
|
||||
+HostRustLibrary("dump_syms_rust_demangle")
|
||||
diff -up firefox-86.0/toolkit/crashreporter/rust/rust_demangle.h.1686888-dump-syms firefox-86.0/toolkit/crashreporter/rust/rust_demangle.h
|
||||
--- firefox-86.0/toolkit/crashreporter/rust/rust_demangle.h.1686888-dump-syms 2021-02-24 10:01:09.219178664 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/rust/rust_demangle.h 2021-02-24 10:01:09.219178664 +0100
|
||||
@@ -0,0 +1,21 @@
|
||||
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
||||
+/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
+
|
||||
+#ifndef __RUST_DEMANGLE_H__
|
||||
+#define __RUST_DEMANGLE_H__
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
+
|
||||
+extern char* rust_demangle(const char*);
|
||||
+extern void free_rust_demangled_name(char*);
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+#endif /* __RUST_DEMANGLE_H__ */
|
||||
diff -up firefox-86.0/toolkit/crashreporter/tools/unit-symbolstore.py.1686888-dump-syms firefox-86.0/toolkit/crashreporter/tools/unit-symbolstore.py
|
||||
--- firefox-86.0/toolkit/crashreporter/tools/unit-symbolstore.py.1686888-dump-syms 2021-02-22 14:43:54.000000000 +0100
|
||||
+++ firefox-86.0/toolkit/crashreporter/tools/unit-symbolstore.py 2021-02-24 10:01:09.219178664 +0100
|
||||
@@ -539,9 +539,12 @@ class TestFunctional(HelperMixin, unitte
|
||||
self.script_path = os.path.join(
|
||||
self.topsrcdir, "toolkit", "crashreporter", "tools", "symbolstore.py"
|
||||
)
|
||||
- self.dump_syms = buildconfig.substs.get("DUMP_SYMS")
|
||||
- if not self.dump_syms:
|
||||
- self.skip_test = True
|
||||
+ if "DUMP_SYMS" in buildconfig.substs:
|
||||
+ self.dump_syms = buildconfig.substs["DUMP_SYMS"]
|
||||
+ else:
|
||||
+ self.dump_syms = os.path.join(
|
||||
+ buildconfig.topobjdir, "dist", "host", "bin", "dump_syms"
|
||||
+ )
|
||||
|
||||
if target_platform() == "WINNT":
|
||||
self.target_bin = os.path.join(
|
||||
diff -up firefox-86.0/tools/crashreporter/app.mozbuild.1686888-dump-syms firefox-86.0/tools/crashreporter/app.mozbuild
|
||||
--- firefox-86.0/tools/crashreporter/app.mozbuild.1686888-dump-syms 2021-02-22 14:43:54.000000000 +0100
|
||||
+++ firefox-86.0/tools/crashreporter/app.mozbuild 2021-02-24 10:01:09.219178664 +0100
|
||||
@@ -4,6 +4,20 @@
|
||||
|
||||
DIRS += [
|
||||
'/config/external/zlib',
|
||||
+ '/toolkit/crashreporter/google-breakpad/src/common',
|
||||
'/toolkit/crashreporter/google-breakpad/src/processor',
|
||||
+ '/toolkit/crashreporter/rust',
|
||||
'/tools/crashreporter/minidump_stackwalk',
|
||||
]
|
||||
+
|
||||
+if CONFIG['OS_ARCH'] == 'Linux':
|
||||
+ DIRS += [
|
||||
+ '/toolkit/crashreporter/google-breakpad/src/common/linux',
|
||||
+ '/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms',
|
||||
+ ]
|
||||
+
|
||||
+if CONFIG['OS_ARCH'] == 'Darwin':
|
||||
+ DIRS += [
|
||||
+ '/toolkit/crashreporter/google-breakpad/src/common/mac',
|
||||
+ '/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms',
|
||||
+ ]
|
||||
diff -up firefox-86.0/tools/lint/clippy.yml.1686888-dump-syms firefox-86.0/tools/lint/clippy.yml
|
||||
--- firefox-86.0/tools/lint/clippy.yml.1686888-dump-syms 2021-02-22 15:47:05.000000000 +0100
|
||||
+++ firefox-86.0/tools/lint/clippy.yml 2021-02-24 10:01:09.219178664 +0100
|
||||
@@ -63,6 +63,7 @@ clippy:
|
||||
# not_unsafe_ptr_arg_deref
|
||||
- modules/libpref/parser/
|
||||
- tools/profiler/rust-helper/
|
||||
+ - toolkit/crashreporter/rust/
|
||||
- toolkit/library/rust/shared/
|
||||
- toolkit/library/gtest/rust/
|
||||
# not_unsafe_ptr_arg_deref
|
||||
@ -1,28 +0,0 @@
|
||||
changeset: 565888:91903b2fd4ab
|
||||
tag: tip
|
||||
parent: 565886:1a895ef04f9f
|
||||
user: stransky <stransky@redhat.com>
|
||||
date: Thu Jan 21 12:27:43 2021 +0100
|
||||
files: widget/gtk/nsWindow.cpp
|
||||
description:
|
||||
Bug 1687931 [Wayland] Don't cache monitor scale factor, r?jhorak
|
||||
|
||||
Differential Revision: https://phabricator.services.mozilla.com/D102590
|
||||
|
||||
|
||||
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
|
||||
--- a/widget/gtk/nsWindow.cpp
|
||||
+++ b/widget/gtk/nsWindow.cpp
|
||||
@@ -7714,10 +7714,10 @@ gint nsWindow::GdkScaleFactor() {
|
||||
(gint(*)(GdkWindow*))dlsym(RTLD_DEFAULT, "gdk_window_get_scale_factor");
|
||||
if (sGdkWindowGetScaleFactorPtr && scaledGdkWindow) {
|
||||
mWindowScaleFactor = (*sGdkWindowGetScaleFactorPtr)(scaledGdkWindow);
|
||||
+ mWindowScaleFactorChanged = false;
|
||||
} else {
|
||||
mWindowScaleFactor = ScreenHelperGTK::GetGTKMonitorScaleFactor();
|
||||
}
|
||||
- mWindowScaleFactorChanged = false;
|
||||
|
||||
return mWindowScaleFactor;
|
||||
}
|
||||
|
||||
@ -1,97 +0,0 @@
|
||||
|
||||
# HG changeset patch
|
||||
# User Cameron Kaiser <spectre@floodgap.com>
|
||||
# Date 1612231460 0
|
||||
# Node ID 579a66fd796690fb752485215b2edaa6167ebf16
|
||||
# Parent a00504e040bfd34d01c74d478beb9d308ec085be
|
||||
Bug 1690152 - on ppc64 properly skip parameter slots if we overflow GPRs while still having FPRs to burn. r=tcampbell
|
||||
|
||||
Differential Revision: https://phabricator.services.mozilla.com/D103724
|
||||
|
||||
diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
|
||||
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
|
||||
+++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
|
||||
@@ -86,27 +86,37 @@ extern "C" void invoke_copy_to_stack(uin
|
||||
case nsXPTType::T_WCHAR: value = s->val.wc; break;
|
||||
default: value = (uint64_t) s->val.p; break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!s->IsIndirect() && s->type == nsXPTType::T_DOUBLE) {
|
||||
if (nr_fpr < FPR_COUNT) {
|
||||
fpregs[nr_fpr++] = s->val.d;
|
||||
- nr_gpr++;
|
||||
+ // Even if we have enough FPRs, still skip space in
|
||||
+ // the parameter area if we ran out of placeholder GPRs.
|
||||
+ if (nr_gpr < GPR_COUNT) {
|
||||
+ nr_gpr++;
|
||||
+ } else {
|
||||
+ d++;
|
||||
+ }
|
||||
} else {
|
||||
*((double *)d) = s->val.d;
|
||||
d++;
|
||||
}
|
||||
}
|
||||
else if (!s->IsIndirect() && s->type == nsXPTType::T_FLOAT) {
|
||||
if (nr_fpr < FPR_COUNT) {
|
||||
// Single-precision floats are passed in FPRs too.
|
||||
fpregs[nr_fpr++] = s->val.f;
|
||||
- nr_gpr++;
|
||||
+ if (nr_gpr < GPR_COUNT) {
|
||||
+ nr_gpr++;
|
||||
+ } else {
|
||||
+ d++;
|
||||
+ }
|
||||
} else {
|
||||
#ifdef __LITTLE_ENDIAN__
|
||||
*((float *)d) = s->val.f;
|
||||
#else
|
||||
// Big endian needs adjustment to point to the least
|
||||
// significant word.
|
||||
float* p = (float*)d;
|
||||
p++;
|
||||
diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
|
||||
--- a/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
|
||||
+++ b/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
|
||||
@@ -98,27 +98,37 @@ PrepareAndDispatch(nsXPTCStubBase * self
|
||||
nr_gpr++;
|
||||
else
|
||||
ap++;
|
||||
}
|
||||
|
||||
if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
|
||||
if (nr_fpr < FPR_COUNT) {
|
||||
dp->val.d = fpregs[nr_fpr++];
|
||||
- nr_gpr++;
|
||||
+ // Even if we have enough FPRs, still skip space in
|
||||
+ // the parameter area if we ran out of placeholder GPRs.
|
||||
+ if (nr_gpr < GPR_COUNT) {
|
||||
+ nr_gpr++;
|
||||
+ } else {
|
||||
+ ap++;
|
||||
+ }
|
||||
} else {
|
||||
dp->val.d = *(double*)ap++;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
|
||||
if (nr_fpr < FPR_COUNT) {
|
||||
// Single-precision floats are passed in FPRs too.
|
||||
dp->val.f = (float)fpregs[nr_fpr++];
|
||||
- nr_gpr++;
|
||||
+ if (nr_gpr < GPR_COUNT) {
|
||||
+ nr_gpr++;
|
||||
+ } else {
|
||||
+ ap++;
|
||||
+ }
|
||||
} else {
|
||||
#ifdef __LITTLE_ENDIAN__
|
||||
dp->val.f = *(float*)ap++;
|
||||
#else
|
||||
// Big endian needs adjustment to point to the least
|
||||
// significant word.
|
||||
float* p = (float*)ap;
|
||||
p++;
|
||||
|
||||
6
sources
6
sources
@ -1,4 +1,4 @@
|
||||
SHA512 (cbindgen-vendor.tar.xz) = 3c925c5523246b7dfbcb4ce563483d5b45315a06dc90f2cf07cddef0c263dd15b410afbbe4d86594de96a308e93be3b27ffec01f5f759a42ecba3cc983b1677f
|
||||
SHA512 (mochitest-python.tar.gz) = 7f357cb8bd93d64be5cb75819a8a813d2f8f217ff25f0df8c3190910744132405d45797b3900775a44b554f5c70cf2682809c9e7a686ca131fddcd81e98028d9
|
||||
SHA512 (firefox-85.0.1.source.tar.xz) = ad2b72ec209ca14ec78ebcb4718553119f74895e951a5254f9a1e0fc9d7cad3087a7dd4f82368c2845e3018bb3677853241e9c1e575f03e9b7b565e65b860e22
|
||||
SHA512 (firefox-langpacks-85.0.1-20210208.tar.xz) = d8bf4924c37c9b3ac2f64cbc136f54d5f979deae2e3402bd8f76ffdd99f0671eb8bc9695fabb7199a5f021377db59bc11d5420c4ff49a8bf0d5c8af516ce6391
|
||||
SHA512 (cbindgen-vendor.tar.xz) = f122880b80009e5d5147b40147ba383731922e618d50312067cab0be6a0873adde5d5dbe2e6688b41c1a7e0f0ca2f1cccfa789e7b834b69f8c5445cc46ecccaf
|
||||
SHA512 (firefox-86.0.source.tar.xz) = f5a7b9aa53e2955e972e30cc62ae64ae955127eab951d7a1102d5ac8a73804982e01b917787c00a6e0a0ed03594567d29a24808271283ef61a9383bc4bb39e3f
|
||||
SHA512 (firefox-langpacks-86.0-20210222.tar.xz) = 05090d9b4b5ac628b31a5d5d727e8616269c0e92fd97d9d9066c9ff7bc46ae880cfe10c38c48174f4d5dde454200c8efc2e0a02067305821bf3af1f4aae8a766
|
||||
|
||||
Loading…
Reference in New Issue
Block a user