From 356078eb6705b47b08c98b7097bf760504cea6fd Mon Sep 17 00:00:00 2001 From: akhil Date: Sun, 10 Jul 2022 14:10:00 +0530 Subject: [PATCH 01/85] New package: cloud-utils-0.33 --- srcpkgs/cloud-utils/template | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 srcpkgs/cloud-utils/template diff --git a/srcpkgs/cloud-utils/template b/srcpkgs/cloud-utils/template new file mode 100644 index 000000000000..1875a60ab80f --- /dev/null +++ b/srcpkgs/cloud-utils/template @@ -0,0 +1,12 @@ +# Template file for 'cloud-utils' +pkgname=cloud-utils +version=0.33 +revision=1 +archs="x86_64" +build_style=gnu-makefile +short_desc="Set of utilities for interacting with a cloud" +maintainer="akhil " +license="GPL-3.0-or-later" +homepage="https://github.com/canonical/cloud-utils/" +distfiles="https://github.com/canonical/cloud-utils/archive/refs/tags/${version}.tar.gz" +checksum=338770d637788466aacfcbcec17a8d0046f92a13cc3b25fce8fceadb02a7339f From 89186e40192b62cb40842bc5e54d90fda10bed88 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 9 Jul 2022 17:14:44 +0200 Subject: [PATCH 02/85] New package: electron19-19.0.8 --- ...Update-skylab-tests-cros-img-version.patch | 92 + ...ew-tests-Refresh-skew-tests-for-M104.patch | 404 ++ ...XTBs-based-on-.GRDs-from-branch-5005.patch | 751 ++++ ...-extension-controlled-pref-observers.patch | 43 + ...crementing-VERSION-to-102.0.5005.126.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 110 + ...crementing-VERSION-to-102.0.5005.127.patch | 28 + ...crementing-VERSION-to-102.0.5005.128.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 73 + ...ce-that-thin-testers-have-TEST-execu.patch | 54 + ...crementing-VERSION-to-102.0.5005.129.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 83 + ...-M102-infra-Fix-future-lint-warnings.patch | 108 + ...ptr-T-and-T-are-treated-identically-.patch | 357 ++ ...crementing-VERSION-to-102.0.5005.130.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 889 ++++ ...BluetoothTest.ConstructDefaultAdapte.patch | 44 + ...crementing-VERSION-to-102.0.5005.131.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 308 ++ ...crementing-VERSION-to-102.0.5005.132.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 212 + ...crementing-VERSION-to-102.0.5005.133.patch | 28 + ...crementing-VERSION-to-102.0.5005.134.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 41 + ...crementing-VERSION-to-102.0.5005.135.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 262 ++ ...crementing-VERSION-to-102.0.5005.136.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 256 ++ ...add-free_space-dimension-to-Chromium.patch | 842 ++++ ...-configs-for-android_cronet-src-side.patch | 197 + ...ew-Fix-missing-destinations-in-dialo.patch | 77 + ...crementing-VERSION-to-102.0.5005.137.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 807 ++++ ...crementing-VERSION-to-102.0.5005.138.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 578 +++ ...he-root-vpython-spec-files-to-orches.patch | 57 + ...crementing-VERSION-to-102.0.5005.139.patch | 28 + ...crementing-VERSION-to-102.0.5005.140.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 101 + ...crementing-VERSION-to-102.0.5005.141.patch | 28 + ...crementing-VERSION-to-102.0.5005.142.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 46 + ...crementing-VERSION-to-102.0.5005.143.patch | 28 + ...k_static_initializers.py-for-python3.patch | 57 + ...45-sheriff-Disable-QuarantineMacTest.patch | 81 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 274 ++ ...ics_python_tests-to-python3-for-M102.patch | 106 + ...-M102-Let-GPU-Intel-Macs-target-12.4.patch | 1714 ++++++++ ...crementing-VERSION-to-102.0.5005.144.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 348 ++ ...crementing-VERSION-to-102.0.5005.145.patch | 28 + ...ionTest.SelfUpdateFromOldReal-in-M10.patch | 33 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 2077 +++++++++ ...crementing-VERSION-to-102.0.5005.146.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 106 + ...crementing-VERSION-to-102.0.5005.147.patch | 28 + ...XTBs-based-on-.GRDs-from-branch-5005.patch | 420 ++ ...crementing-VERSION-to-102.0.5005.148.patch | 28 + .../musl-patches/chromium-musl-hacks.patch | 34 + .../musl-patches/chromium-musl-libc++.patch | 55 + .../musl-patches/chromium-musl-sandbox.patch | 92 + .../chromium-musl-tid-caching.patch | 81 + .../musl-patches/chromium-no-mallinfo.patch | 95 + .../chromium-quiche-arena-size.patch | 11 + .../chromium-xxx-ppc64le-support.patch | 188 + ...omium-102-fenced_frame_utils-include.patch | 25 + .../chromium-102-regex_pattern-array.patch | 14 + .../patches/chromium-93-ffmpeg-4.4.patch | 36 + .../patches/chromium-browser-size_t.patch | 10 + .../chromium-cursed^Uscoped_file.patch | 18 + ...fix-missing-TEMP_FAILURE_RETRY-macro.patch | 21 + ...ium-fix-missing-cstdint-include-musl.patch | 10 + ...um-fix-musl-missing-unistd_h-include.patch | 10 + .../patches/chromium-fix-narrowing-cast.patch | 53 + .../chromium-fix-nasm-musl-config.patch | 12 + ...mium-fix-perfetto-GetThreadName-musl.patch | 22 + .../patches/chromium-fix-resolver-musl.patch | 66 + .../chromium-fix-stack-utils-with-musl.patch | 20 + ...ium-fix-swiftshader-llvm-musl-config.patch | 26 + .../chromium-fix-unbundled-libxmnl.patch | 10 + .../files/patches/chromium-libc_malloc.patch | 34 + .../files/patches/chromium-musl-stat.patch | 12 + ...-v8-monotonic-pthread-cont_timedwait.patch | 24 + .../files/patches/chromium-no-execinfo.patch | 75 + .../patches/chromium-no-getcontext.patch | 27 + .../patches/chromium-no-opaque-pointers.patch | 17 + .../chromium-remove-sys-cdefs-includes.patch | 39 + .../chromium-revert-drop-of-system-java.patch | 15 + ...chromium-roll-src-third_party-ffmpeg.patch | 333 ++ ...ium-roll-src-third_party-ffmpeg.patch.args | 1 + .../patches/chromium-sandbox-membarrier.patch | 10 + .../chromium-sandbox-sched_getparam.patch | 20 + .../files/patches/chromium-sndio.patch | 877 ++++ .../patches/chromium-system-nodejs.patch | 16 + .../patches/chromium-system-nodejs.patch:q | 0 ...undle-ffmpeg-av_stream_get_first_dts.patch | 12 + .../chromium-use-ffile-compilation-dir.patch | 66 + ...omium-use-ffile-compilation-dir.patch.args | 1 + .../files/patches/chromium-webrtc-r0.patch | 33 + .../patches/chromium-webrtc-size_t.patch | 10 + .../chromium-xxx-ppc64le-4k-pages.patch | 56 + .../patches/chromium-xxx-ppc64le-libvpx.patch | 72 + ...omium-xxx-ppc64le-sandbox-linux-stat.patch | 31 + .../chromium-xxx-ppc64le-support.patch | 3698 +++++++++++++++++ .../chromium-xxx-ppc64le-swiftshader.patch | 18 + ...a-script-to-list-patch-targets.patch.patch | 42 + .../patches/electron-Build-fixes.patch.patch | 33 + ...lectron-exclude-content-test-patches.patch | 10 + .../patches/electron-no-need-for-husky.patch | 17 + .../electron-std-vector-non-const.patch | 109 + .../sndio-files/audio_manager_openbsd.cc | 148 + .../files/sndio-files/audio_manager_openbsd.h | 65 + .../files/sndio-files/sndio_input.cc | 200 + .../files/sndio-files/sndio_input.h | 91 + .../files/sndio-files/sndio_output.cc | 183 + .../files/sndio-files/sndio_output.h | 86 + ...a_audio_linux_audio_manager_linux.cc.patch | 43 + ...src_3rdparty_chromium_media_BUILD.gn.patch | 12 + ...dparty_chromium_media_audio_BUILD.gn.patch | 23 + ...ty_chromium_media_media__options.gni.patch | 12 + srcpkgs/electron19/template | 409 ++ srcpkgs/electron19/update | 2 + 122 files changed, 20543 insertions(+) create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0001-skylab_tests-Update-skylab-tests-cros-img-version.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0002-lacros-skew-tests-Refresh-skew-tests-for-M104.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0003-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0004-M-102-lacros-fix-extension-controlled-pref-observers.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0005-Incrementing-VERSION-to-102.0.5005.126.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0006-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0007-Incrementing-VERSION-to-102.0.5005.127.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0008-Incrementing-VERSION-to-102.0.5005.128.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0009-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0010-M102-infra-Enforce-that-thin-testers-have-TEST-execu.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0011-Incrementing-VERSION-to-102.0.5005.129.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0012-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0013-M102-infra-Fix-future-lint-warnings.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0014-M102-Ensure-raw_ptr-T-and-T-are-treated-identically-.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0015-Incrementing-VERSION-to-102.0.5005.130.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0016-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0017-Sheriff-Disable-BluetoothTest.ConstructDefaultAdapte.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0018-Incrementing-VERSION-to-102.0.5005.131.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0019-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0020-Incrementing-VERSION-to-102.0.5005.132.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0021-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0022-Incrementing-VERSION-to-102.0.5005.133.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0023-Incrementing-VERSION-to-102.0.5005.134.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0024-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0025-Incrementing-VERSION-to-102.0.5005.135.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0026-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0027-Incrementing-VERSION-to-102.0.5005.136.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0028-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0029-M102-infra-add-free_space-dimension-to-Chromium.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0030-infra-Migrate-configs-for-android_cronet-src-side.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0031-M102-Print-Preview-Fix-missing-destinations-in-dialo.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0032-Incrementing-VERSION-to-102.0.5005.137.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0033-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0034-Incrementing-VERSION-to-102.0.5005.138.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0035-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0036-5005-infra-Add-the-root-vpython-spec-files-to-orches.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0037-Incrementing-VERSION-to-102.0.5005.139.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0038-Incrementing-VERSION-to-102.0.5005.140.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0039-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0040-Incrementing-VERSION-to-102.0.5005.141.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0041-Incrementing-VERSION-to-102.0.5005.142.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0042-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0043-Incrementing-VERSION-to-102.0.5005.143.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0044-testing-fix-check_static_initializers.py-for-python3.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0045-sheriff-Disable-QuarantineMacTest.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0046-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0047-migrate-metrics_python_tests-to-python3-for-M102.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0048-M102-Let-GPU-Intel-Macs-target-12.4.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0049-Incrementing-VERSION-to-102.0.5005.144.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0050-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0051-Incrementing-VERSION-to-102.0.5005.145.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0052-Disable-IntegrationTest.SelfUpdateFromOldReal-in-M10.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0053-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0054-Incrementing-VERSION-to-102.0.5005.146.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0055-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0056-Incrementing-VERSION-to-102.0.5005.147.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0057-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch create mode 100644 srcpkgs/electron19/files/chromium-upstream-patches/0058-Incrementing-VERSION-to-102.0.5005.148.patch create mode 100644 srcpkgs/electron19/files/musl-patches/chromium-musl-hacks.patch create mode 100644 srcpkgs/electron19/files/musl-patches/chromium-musl-libc++.patch create mode 100644 srcpkgs/electron19/files/musl-patches/chromium-musl-sandbox.patch create mode 100644 srcpkgs/electron19/files/musl-patches/chromium-musl-tid-caching.patch create mode 100644 srcpkgs/electron19/files/musl-patches/chromium-no-mallinfo.patch create mode 100644 srcpkgs/electron19/files/musl-patches/chromium-quiche-arena-size.patch create mode 100644 srcpkgs/electron19/files/musl-patches/chromium-xxx-ppc64le-support.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-102-fenced_frame_utils-include.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-102-regex_pattern-array.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-93-ffmpeg-4.4.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-browser-size_t.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-cursed^Uscoped_file.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-fix-missing-TEMP_FAILURE_RETRY-macro.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-fix-missing-cstdint-include-musl.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-fix-musl-missing-unistd_h-include.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-fix-narrowing-cast.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-fix-nasm-musl-config.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-fix-perfetto-GetThreadName-musl.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-fix-resolver-musl.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-fix-stack-utils-with-musl.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-fix-swiftshader-llvm-musl-config.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-fix-unbundled-libxmnl.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-libc_malloc.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-musl-stat.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-no-execinfo.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-no-getcontext.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-no-opaque-pointers.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-remove-sys-cdefs-includes.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-revert-drop-of-system-java.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-roll-src-third_party-ffmpeg.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-roll-src-third_party-ffmpeg.patch.args create mode 100644 srcpkgs/electron19/files/patches/chromium-sandbox-membarrier.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-sandbox-sched_getparam.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-sndio.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-system-nodejs.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-system-nodejs.patch:q create mode 100644 srcpkgs/electron19/files/patches/chromium-unbundle-ffmpeg-av_stream_get_first_dts.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-use-ffile-compilation-dir.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-use-ffile-compilation-dir.patch.args create mode 100644 srcpkgs/electron19/files/patches/chromium-webrtc-r0.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-webrtc-size_t.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-4k-pages.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-libvpx.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-sandbox-linux-stat.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-support.patch create mode 100644 srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-swiftshader.patch create mode 100644 srcpkgs/electron19/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch create mode 100644 srcpkgs/electron19/files/patches/electron-Build-fixes.patch.patch create mode 100644 srcpkgs/electron19/files/patches/electron-exclude-content-test-patches.patch create mode 100644 srcpkgs/electron19/files/patches/electron-no-need-for-husky.patch create mode 100644 srcpkgs/electron19/files/patches/electron-std-vector-non-const.patch create mode 100644 srcpkgs/electron19/files/sndio-files/audio_manager_openbsd.cc create mode 100644 srcpkgs/electron19/files/sndio-files/audio_manager_openbsd.h create mode 100644 srcpkgs/electron19/files/sndio-files/sndio_input.cc create mode 100644 srcpkgs/electron19/files/sndio-files/sndio_input.h create mode 100644 srcpkgs/electron19/files/sndio-files/sndio_output.cc create mode 100644 srcpkgs/electron19/files/sndio-files/sndio_output.h create mode 100644 srcpkgs/electron19/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch create mode 100644 srcpkgs/electron19/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch create mode 100644 srcpkgs/electron19/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch create mode 100644 srcpkgs/electron19/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch create mode 100644 srcpkgs/electron19/template create mode 100644 srcpkgs/electron19/update diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0001-skylab_tests-Update-skylab-tests-cros-img-version.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0001-skylab_tests-Update-skylab-tests-cros-img-version.patch new file mode 100644 index 000000000000..7bdf18731ab7 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0001-skylab_tests-Update-skylab-tests-cros-img-version.patch @@ -0,0 +1,92 @@ +From af94ae30d03668f0f4c93852d8e2d1f88ed04c62 Mon Sep 17 00:00:00 2001 +From: Skylab tests cros image roller + +Date: Fri, 10 Jun 2022 00:38:54 +0000 +Subject: [PATCH 01/59] [skylab_tests] Update skylab tests cros img version + +This CL will update cros image version for skylab tests. CROS_BOARD_LKGM +is updated according to chromeos/CHROMEOS_LKGM; CROS_BOARD_DEV, +CROS_BOARD_BETA and CROS_BOARD_STABLE are updated according to Omaha. + +If this CL caused regressions, please revert and pause the autoroller at +https://luci-scheduler.appspot.com/jobs/chrome/lacros-skylab-tests-cros-img-roller +Also please file a bug to OS>LaCrOS>Partner, and CC svenzheng@chromium.org, +yjt@google.com. + + +R=rubber-stamper@appspot.gserviceaccount.com + +Requires-Testing: True +Change-Id: I5b29e1b2b6de832dc51758037519f76f3f8f7ebd +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3698986 +Bot-Commit: Rubber Stamper +Commit-Queue: Rubber Stamper +Auto-Submit: skylab-test-cros-roller@chops-service-accounts.iam.gserviceaccount.com +Cr-Commit-Position: refs/branch-heads/5005@{#1160} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + testing/buildbot/variants.pyl | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl +index d6a822d49671..389bb3539547 100644 +--- a/testing/buildbot/variants.pyl ++++ b/testing/buildbot/variants.pyl +@@ -919,8 +919,8 @@ + 'CROS_ATLAS_RELEASE_BETA': { + 'skylab': { + 'cros_board': 'atlas', +- 'cros_chrome_version': '103.0.5060.33', +- 'cros_img': 'atlas-release/R103-14816.41.0', ++ 'cros_chrome_version': '103.0.5060.37', ++ 'cros_img': 'atlas-release/R103-14816.49.0', + }, + 'enabled': False, + 'identifier': 'ATLAS_RELEASE_BETA', +@@ -955,8 +955,8 @@ + 'CROS_EVE_RELEASE_BETA': { + 'skylab': { + 'cros_board': 'eve', +- 'cros_chrome_version': '103.0.5060.33', +- 'cros_img': 'eve-release/R103-14816.41.0', ++ 'cros_chrome_version': '103.0.5060.37', ++ 'cros_img': 'eve-release/R103-14816.49.0', + }, + 'enabled': False, + 'identifier': 'EVE_RELEASE_BETA', +@@ -1000,8 +1000,8 @@ + 'CROS_HANA_RELEASE_BETA': { + 'skylab': { + 'cros_board': 'hana', +- 'cros_chrome_version': '103.0.5060.33', +- 'cros_img': 'hana-release/R103-14816.41.0', ++ 'cros_chrome_version': '103.0.5060.37', ++ 'cros_img': 'hana-release/R103-14816.49.0', + }, + 'enabled': False, + 'identifier': 'HANA_RELEASE_LKGM', +@@ -1036,8 +1036,8 @@ + 'CROS_JACUZZI_RELEASE_BETA': { + 'skylab': { + 'cros_board': 'jacuzzi', +- 'cros_chrome_version': '103.0.5060.33', +- 'cros_img': 'jacuzzi-release/R103-14816.41.0', ++ 'cros_chrome_version': '103.0.5060.37', ++ 'cros_img': 'jacuzzi-release/R103-14816.49.0', + }, + 'enabled': False, + 'identifier': 'JACUZZI_RELEASE_BETA', +@@ -1081,8 +1081,8 @@ + 'CROS_OCTOPUS_RELEASE_BETA': { + 'skylab': { + 'cros_board': 'octopus', +- 'cros_chrome_version': '103.0.5060.33', +- 'cros_img': 'octopus-release/R103-14816.41.0', ++ 'cros_chrome_version': '103.0.5060.37', ++ 'cros_img': 'octopus-release/R103-14816.49.0', + }, + 'enabled': False, + 'identifier': 'OCTOPUS_RELEASE_BETA', +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0002-lacros-skew-tests-Refresh-skew-tests-for-M104.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0002-lacros-skew-tests-Refresh-skew-tests-for-M104.patch new file mode 100644 index 000000000000..81e09d8d6a6f --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0002-lacros-skew-tests-Refresh-skew-tests-for-M104.patch @@ -0,0 +1,404 @@ +From 30137148967bd1f918af493ad0fe82384924ccdf Mon Sep 17 00:00:00 2001 +From: chrome-weblayer-builder + +Date: Fri, 10 Jun 2022 01:23:33 +0000 +Subject: [PATCH 02/59] [lacros skew tests] Refresh skew tests for M104 + +This CL updates the ash version ['104.0.5111.0'] for Lacros version skew testing. +If this CL caused regressions, please revert and stop the autoroller +at https://luci-scheduler.appspot.com/jobs/chrome/lacros-version-skew-roller +Also please file a bug to OS>LaCrOS>Partner, and CC svenzheng@chromium.org, +yjt@google.com. + +R=rubber-stamper@appspot.gserviceaccount.com + +Bug: None +Change-Id: I95e56d3c445e495ed1d9a36441249615db9af009 +Requires-Testing: True +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3696160 +Bot-Commit: Rubber Stamper +Auto-Submit: chrome-weblayer-builder +Commit-Queue: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1161} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + testing/buildbot/chromium.chromiumos.json | 20 +++--- + testing/buildbot/chromium.fyi.json | 80 +++++++++++------------ + testing/buildbot/variants.pyl | 8 +-- + 3 files changed, 54 insertions(+), 54 deletions(-) + +diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json +index 82941bc7cd72..4ce3bb7c9e91 100644 +--- a/testing/buildbot/chromium.chromiumos.json ++++ b/testing/buildbot/chromium.chromiumos.json +@@ -6018,21 +6018,21 @@ + }, + { + "args": [ +- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome" ++ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome" + ], + "isolate_profile_data": true, + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, +- "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5109.0", ++ "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5111.0", + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", +- "location": "lacros_version_skew_tests_v104.0.5109.0", +- "revision": "version:104.0.5109.0" ++ "location": "lacros_version_skew_tests_v104.0.5111.0", ++ "revision": "version:104.0.5111.0" + } + ], + "dimension_sets": [ +@@ -6044,7 +6044,7 @@ + }, + "test": "lacros_chrome_browsertests", + "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests/", +- "variant_id": "Lacros version skew testing ash 104.0.5109.0" ++ "variant_id": "Lacros version skew testing ash 104.0.5111.0" + }, + { + "args": [ +@@ -6161,21 +6161,21 @@ + }, + { + "args": [ +- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome" ++ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome" + ], + "isolate_profile_data": true, + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, +- "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5109.0", ++ "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5111.0", + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", +- "location": "lacros_version_skew_tests_v104.0.5109.0", +- "revision": "version:104.0.5109.0" ++ "location": "lacros_version_skew_tests_v104.0.5111.0", ++ "revision": "version:104.0.5111.0" + } + ], + "dimension_sets": [ +@@ -6187,7 +6187,7 @@ + }, + "test": "lacros_chrome_browsertests_run_in_series", + "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/", +- "variant_id": "Lacros version skew testing ash 104.0.5109.0" ++ "variant_id": "Lacros version skew testing ash 104.0.5111.0" + }, + { + "args": [ +diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json +index 3d4f3c3b2c9f..f3e2e4997888 100644 +--- a/testing/buildbot/chromium.fyi.json ++++ b/testing/buildbot/chromium.fyi.json +@@ -87176,28 +87176,28 @@ + }, + { + "args": [ +- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome" ++ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome" + ], + "isolate_profile_data": true, + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, +- "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5109.0", ++ "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5111.0", + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", +- "location": "lacros_version_skew_tests_v104.0.5109.0", +- "revision": "version:104.0.5109.0" ++ "location": "lacros_version_skew_tests_v104.0.5111.0", ++ "revision": "version:104.0.5111.0" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "lacros_chrome_browsertests", + "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests/", +- "variant_id": "Lacros version skew testing ash 104.0.5109.0" ++ "variant_id": "Lacros version skew testing ash 104.0.5111.0" + }, + { + "args": [ +@@ -87294,28 +87294,28 @@ + }, + { + "args": [ +- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome" ++ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome" + ], + "isolate_profile_data": true, + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, +- "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5109.0", ++ "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5111.0", + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", +- "location": "lacros_version_skew_tests_v104.0.5109.0", +- "revision": "version:104.0.5109.0" ++ "location": "lacros_version_skew_tests_v104.0.5111.0", ++ "revision": "version:104.0.5111.0" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "lacros_chrome_browsertests_run_in_series", + "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/", +- "variant_id": "Lacros version skew testing ash 104.0.5109.0" ++ "variant_id": "Lacros version skew testing ash 104.0.5111.0" + }, + { + "args": [ +@@ -88682,20 +88682,20 @@ + }, + { + "args": [ +- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome" ++ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, +- "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5109.0", ++ "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5111.0", + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", +- "location": "lacros_version_skew_tests_v104.0.5109.0", +- "revision": "version:104.0.5109.0" ++ "location": "lacros_version_skew_tests_v104.0.5111.0", ++ "revision": "version:104.0.5111.0" + } + ], + "dimension_sets": [ +@@ -88708,7 +88708,7 @@ + }, + "test": "lacros_chrome_browsertests", + "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests/", +- "variant_id": "Lacros version skew testing ash 104.0.5109.0" ++ "variant_id": "Lacros version skew testing ash 104.0.5111.0" + }, + { + "args": [ +@@ -88825,20 +88825,20 @@ + }, + { + "args": [ +- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome" ++ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, +- "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5109.0", ++ "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5111.0", + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", +- "location": "lacros_version_skew_tests_v104.0.5109.0", +- "revision": "version:104.0.5109.0" ++ "location": "lacros_version_skew_tests_v104.0.5111.0", ++ "revision": "version:104.0.5111.0" + } + ], + "dimension_sets": [ +@@ -88851,7 +88851,7 @@ + }, + "test": "lacros_chrome_browsertests_run_in_series", + "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/", +- "variant_id": "Lacros version skew testing ash 104.0.5109.0" ++ "variant_id": "Lacros version skew testing ash 104.0.5111.0" + }, + { + "args": [ +@@ -90381,20 +90381,20 @@ + }, + { + "args": [ +- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome" ++ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, +- "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5109.0", ++ "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5111.0", + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", +- "location": "lacros_version_skew_tests_v104.0.5109.0", +- "revision": "version:104.0.5109.0" ++ "location": "lacros_version_skew_tests_v104.0.5111.0", ++ "revision": "version:104.0.5111.0" + } + ], + "dimension_sets": [ +@@ -90407,7 +90407,7 @@ + }, + "test": "lacros_chrome_browsertests", + "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests/", +- "variant_id": "Lacros version skew testing ash 104.0.5109.0" ++ "variant_id": "Lacros version skew testing ash 104.0.5111.0" + }, + { + "args": [ +@@ -90524,20 +90524,20 @@ + }, + { + "args": [ +- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome" ++ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, +- "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5109.0", ++ "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5111.0", + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", +- "location": "lacros_version_skew_tests_v104.0.5109.0", +- "revision": "version:104.0.5109.0" ++ "location": "lacros_version_skew_tests_v104.0.5111.0", ++ "revision": "version:104.0.5111.0" + } + ], + "dimension_sets": [ +@@ -90550,7 +90550,7 @@ + }, + "test": "lacros_chrome_browsertests_run_in_series", + "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/", +- "variant_id": "Lacros version skew testing ash 104.0.5109.0" ++ "variant_id": "Lacros version skew testing ash 104.0.5111.0" + }, + { + "args": [ +@@ -91286,27 +91286,27 @@ + }, + { + "args": [ +- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome" ++ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, +- "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5109.0", ++ "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5111.0", + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", +- "location": "lacros_version_skew_tests_v104.0.5109.0", +- "revision": "version:104.0.5109.0" ++ "location": "lacros_version_skew_tests_v104.0.5111.0", ++ "revision": "version:104.0.5111.0" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "lacros_chrome_browsertests", + "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests/", +- "variant_id": "Lacros version skew testing ash 104.0.5109.0" ++ "variant_id": "Lacros version skew testing ash 104.0.5111.0" + }, + { + "args": [ +@@ -91382,27 +91382,27 @@ + }, + { + "args": [ +- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome" ++ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, +- "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5109.0", ++ "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5111.0", + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", +- "location": "lacros_version_skew_tests_v104.0.5109.0", +- "revision": "version:104.0.5109.0" ++ "location": "lacros_version_skew_tests_v104.0.5111.0", ++ "revision": "version:104.0.5111.0" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "lacros_chrome_browsertests_run_in_series", + "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/", +- "variant_id": "Lacros version skew testing ash 104.0.5109.0" ++ "variant_id": "Lacros version skew testing ash 104.0.5111.0" + } + ] + }, +diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl +index 389bb3539547..4f39dbcf07ba 100644 +--- a/testing/buildbot/variants.pyl ++++ b/testing/buildbot/variants.pyl +@@ -28,15 +28,15 @@ + }, + 'LACROS_VERSION_SKEW_CANARY': { + 'args': [ +- '--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome', ++ '--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome', + ], +- 'identifier': 'Lacros version skew testing ash 104.0.5109.0', ++ 'identifier': 'Lacros version skew testing ash 104.0.5111.0', + 'swarming': { + 'cipd_packages': [ + { + 'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip', +- 'location': 'lacros_version_skew_tests_v104.0.5109.0', +- 'revision': 'version:104.0.5109.0', ++ 'location': 'lacros_version_skew_tests_v104.0.5111.0', ++ 'revision': 'version:104.0.5111.0', + }, + ], + }, +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0003-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0003-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..a6c156042ca7 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0003-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,751 @@ +From 3bc634919d42b33ab0b8749d0be44ae8df94eeef Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Fri, 10 Jun 2022 15:01:44 +0000 +Subject: [PATCH 03/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: I203671558bf72ece1dc32d28027ad7e9f9c62341 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3700111 +Auto-Submit: Ben Mason +Commit-Queue: Rubber Stamper +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1162} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + ash/strings/ash_strings_fa.xtb | 10 ++--- + ash/strings/ash_strings_ky.xtb | 4 +- + .../app/resources/generated_resources_ar.xtb | 16 ++++---- + .../app/resources/generated_resources_ca.xtb | 2 +- + .../app/resources/generated_resources_fa.xtb | 38 +++++++++---------- + .../app/resources/generated_resources_hr.xtb | 4 +- + .../app/resources/generated_resources_iw.xtb | 14 +++---- + .../app/resources/generated_resources_ko.xtb | 2 +- + .../app/resources/generated_resources_mr.xtb | 2 +- + .../app/resources/generated_resources_sl.xtb | 4 +- + .../app/resources/generated_resources_th.xtb | 2 +- + .../app/resources/generated_resources_uk.xtb | 2 +- + .../app/resources/generated_resources_ur.xtb | 2 +- + chromeos/strings/chromeos_strings_ca.xtb | 2 +- + chromeos/strings/chromeos_strings_id.xtb | 2 +- + .../resources/policy_templates_pt-BR.xtb | 2 +- + components/strings/components_strings_eu.xtb | 2 +- + components/strings/components_strings_fa.xtb | 6 +-- + components/strings/components_strings_te.xtb | 2 +- + .../blink_accessibility_strings_fa.xtb | 2 +- + .../strings/translations/blink_strings_fa.xtb | 4 +- + .../translations/ui_chromeos_strings_af.xtb | 2 +- + .../translations/ui_chromeos_strings_ca.xtb | 2 +- + .../translations/ui_chromeos_strings_ne.xtb | 2 +- + .../translations/ui_chromeos_strings_uk.xtb | 2 +- + .../ui_chromeos_strings_zh-TW.xtb | 2 +- + 26 files changed, 67 insertions(+), 67 deletions(-) + +diff --git a/ash/strings/ash_strings_fa.xtb b/ash/strings/ash_strings_fa.xtb +index 1ae6274c4fae..297fa02a8dcc 100644 +--- a/ash/strings/ash_strings_fa.xtb ++++ b/ash/strings/ash_strings_fa.xtb +@@ -329,7 +329,7 @@ + عدد بعدی + نمایش پیشنهادها + دکمه میکروفون دستگاه خاموش است. +-نمایش دستگاه‌های ارسال محتوا. ++نمایش دستگاه‌های پخش محتوا. + ‏«ذره‌بین متصل» فعال شد. برای خاموش کردن آن، Ctrl+Search+D را دوباره فشار دهید. + صدای مونو + خروجی +@@ -570,7 +570,7 @@ + ذره‌بین + دستیار درحال بار کردن است... + حالت تضاد بالا +-تنظیمات ارسال محتوا ++تنظیمات پخش محتوا + ، قدرت سیگنال درصد + در حال اتصال.. + این‌ها ابزارهای قلم شما هستند +@@ -616,7 +616,7 @@ + میکروفون شما خاموش است، دکمه میکروفون دستگاهتان را روشن کنید. + منوی تنظیمات باز شد + میکروفون روشن است +-توقف ارسال محتوا به گیرنده ناشناس ++توقف پخش محتوا به گیرنده ناشناس + توقف دوربین خودگرفت + میکروفون خاموش است + زمینه تیره خاموش است +@@ -911,7 +911,7 @@ + اموجی‌ها + قدرت سیگنال ، باتری تلفن + بارگیری درحال اسکن +-ارسال محتوا به ++پخش محتوا به + + نصب جدید + سؤال از سرپرست +@@ -1344,7 +1344,7 @@ + نمایش ۱ نتیجه برای + این ویژگی امکان می‌دهد بدون نیاز به گذرواژه، به هر کاربری که به سیستم واردشده به‌سرعت دسترسی داشته باشید. تنها برای حساب‌های مورد اعتمادتان از این ویژگی استفاده کنید. + ذره‌بین تمام‌صفحه +-درحال ارسال محتوا به گیرنده ناشناس ++درحال پخش محتوا به گیرنده ناشناس + ورود به سیستم حسابی دیگر... + وضوح به تغییر کرد. برای حفظ تغییرات، روی تأیید کلیک کنید. تنظیمات قبلی دیگر بازیابی خواهد شد. + ‏ را به این Chromebook متصل کنید +diff --git a/ash/strings/ash_strings_ky.xtb b/ash/strings/ash_strings_ky.xtb +index f64658ebacfe..3816b25eca33 100644 +--- a/ash/strings/ash_strings_ky.xtb ++++ b/ash/strings/ash_strings_ky.xtb +@@ -85,7 +85,7 @@ + Кошумча + Оң + Менюну жыйыштыруу +-Chromebook'тун кулпусун ачуу үчүн манжаңыздын изин колдонуңуз ++Chromebook'тун кулпусун манжаңыздын изи менен ачыңыз + Транскрипция түзүлгөн жок + Иш тактаны кийинкиге сактоо + Кеп файлдары жүктөлүп алынган жок. Кийинчерээк кайталаңыз. +@@ -240,7 +240,7 @@ + Кытайча "Салам" + Тил жөндөөлөрү + Медианы башкаруу элементтери +-Chromebook'тун кулпусун ачуу үчүн манжаңыздын изин колдонуңуз же телефонуңуздун кулпусун ачыңыз ++Chromebook'тун кулпусун манжаңыздын изи менен ачыңыз же телефонуңуздун кулпусун ачыңыз + Туташкан жок + PIN кодуңузду киргизиңиз + Жаңы версия бар +diff --git a/chrome/app/resources/generated_resources_ar.xtb b/chrome/app/resources/generated_resources_ar.xtb +index 0f3b8a2fce9d..62cc88d48a2e 100644 +--- a/chrome/app/resources/generated_resources_ar.xtb ++++ b/chrome/app/resources/generated_resources_ar.xtb +@@ -1131,7 +1131,7 @@ + إضافة علامة التبويب إلى مجموعة جديدة + اختيار لون المظهر + يُرجى إعادة المحاولة +-‏الشبكة الافتراضية الخاصة (VPN) قيد التشغيل دائمًا ++‏شبكة افتراضية خاصة (VPN) قيد التشغيل دائمًا + الطباعة: + لن يُتاح التسجيل إلا بعد تثبيت نظام التشغيل . + للوصول إلى الشاشة الرئيسية في أي وقت، مرّر سريعًا بإصبعك من أسفل الشاشة إلى أعلاها. +@@ -1169,7 +1169,7 @@ + تم إخفاء . + {COUNT,plural, =1{رقم هاتف واحد}zero{# رقم هاتف}two{رقما هاتف}few{# أرقام هاتف}many{# رقم هاتف}other{# رقم هاتف}} + محو الأنواع +-إضافة علامة تبويب جديدة يمينًا ++إضافة علامة تبويب جديدة على اليمين + مرحبًا، + تثبيت علامة التبويب + فتح &ملف... +@@ -1545,7 +1545,7 @@ + العنوان غير صالح يُرجى التحقّق من العنوان وإعادة المحاولة. + ظل النص + قد تحتاج المواقع الإلكترونية أيضًا إلى التعرُّف على جهازك باستخدام أحد المعرّفات. +-إغلاق علامات التبويب على اليمين ++إغلاق علامات التبويب على اليسار + دليل الجذر للإضافة مطلوب. + إنشاء ملف شخصي جديد + ذو صلة بعملية البحث +@@ -2301,7 +2301,7 @@ + مشاركة علامة التبويب هذه مع + قد يحظر بعض مشغلي شبكات الجوّال هذه الميزة. + يمكنك أيضًا تخطي تسجيل الدخول والتصفح كضيف. +-إضافة علامة تبويب جديدة على اليمين ++إضافة علامة تبويب جديدة على اليسار + لغة الصفحة: + خط النص + التصفُّح الآمن (يحميك ويحمي جهازك من المواقع الإلكترونية الضارة) +@@ -3164,7 +3164,7 @@ + – + ‏بروتوكول (TCP) + نسخ تفاصيل الإصدار +-إغلاق علامات التبويب على اليمين ++إغلاق علامات التبويب على اليسار + إ&ضافة إلى القاموس + جارٍ تحديد تكوين الجهاز. + كتم صوت الموقع الإلكتروني المحدد +@@ -3868,7 +3868,7 @@ + إزالة التمييز + التعرّف على كيفية تحديث التطبيقات + {NUM_TABS,plural, =1{إعادة صوت موقع إلكتروني واحد}zero{إعادة صوت المواقع الإلكترونية}two{إعادة صوت موقعيِّ الويب}few{إعادة صوت المواقع الإلكترونية}many{إعادة صوت المواقع الإلكترونية}other{إعادة صوت المواقع الإلكترونية}} +-‏الوصول إلى "مساعد Google" من خلال قول الكلمة المفتاح Ok Google ++‏الوصول إلى "مساعد Google" من خلال قول Ok Google + الرسائل + ‏تتّصل المواقع الإلكترونية عادةً بأجهزة HID لتتيح الميزات التي تستخدم لوحات المفاتيح غير العادية ووحدات التحكّم في الألعاب وغيرها من الأجهزة. + ‏عليك الانتقال إلى هاتفك لمراجعة بعض الأذونات الإضافية. تأكَّد من تفعيل البلوتوث وWi-Fi على هاتفك. +@@ -4972,7 +4972,7 @@ + الأخطاء الجسيمة + تم إنهاء مشاركة الشاشة + يتم الآن التنفيذ... +-إضافة علامة تبويب جديدة يمينًا ++إضافة علامة تبويب جديدة على اليمين + تم تغيير القناة. يمكنك إعادة تشغيل الجهاز لتدخل التغييرات حيز التنفيذ. + الطابعة المُختارة غير متاحة أو لم يتم تثبيتها بشكلٍ صحيح. يُرجى التحقُّق من الطابعة أو تجربة اختيار طابعة أخرى. + الشبكات المعروفة +@@ -6717,7 +6717,7 @@ + التبديل إلى علامة التبويب التي يتم تسجيلها + ‏مفتاح caps lock متوقف + عرض الأذونات والبيانات المُخزَّنة على المواقع +-إضافة علامة تبويب جديدة على اليمين ++إضافة علامة تبويب جديدة على اليسار + ‏مرحبًا بك في Chrome‏ + معدّل إعادة التحميل + علامة التبويب: +diff --git a/chrome/app/resources/generated_resources_ca.xtb b/chrome/app/resources/generated_resources_ca.xtb +index 34e962d18fe8..cc790fea63b6 100644 +--- a/chrome/app/resources/generated_resources_ca.xtb ++++ b/chrome/app/resources/generated_resources_ca.xtb +@@ -7084,7 +7084,7 @@ Prem un interruptor o una tecla assignats per suprimir una assignació.Mai + Acceleració del ratolí tàctil + Altres dispositius poden veure aquest nom per a les connexions Bluetooth i a la xarxa +-L'Assistent utilitza aquestes gravacions i les sol·licituds de veu per crear i actualitzar el teu model de veu, que només es desa als dispositius en què has activat Voice Match. Consulta l'activitat de veu o torna a entrenar el model a Configuració de l'Assistent. ++L'Assistent utilitza aquestes gravacions i les sol·licituds de veu per crear i actualitzar el teu model de veu, que només es desa als dispositius en què has activat Voice Match. Consulta l'activitat de veu o torna a entrenar el model a la configuració de l'Assistent. + C&opia l'adreça de la imatge + {COUNT,plural, =1{1 element a la llista d'adreces d'interès}other{{COUNT} elements a la llista d'adreces d'interès}} + Opcions de proveïdors +diff --git a/chrome/app/resources/generated_resources_fa.xtb b/chrome/app/resources/generated_resources_fa.xtb +index 3efc0d74cd22..05d479b3f7ee 100644 +--- a/chrome/app/resources/generated_resources_fa.xtb ++++ b/chrome/app/resources/generated_resources_fa.xtb +@@ -79,7 +79,7 @@ + اگر تنظیم «فعالیت وب و برنامه» تکمیلی برای «حساب Google» فرزندتان روشن باشد، ممکن است داده‌های فرزندتان در «حساب Google» او ذخیره شود. در families.google.com، درباره این تنظیمات و نحوه تغییر آن‌ها بیشتر بدانید. + اگر مالک دستگاه «ارسال داده‌های استفاده و عیب‌یابی» را روشن کند، ممکن است گزارش‌های خرابی نیز برای Google بارگذاری شود. + پیمایش کردن صفحه‌ها با نشانگر نوشتار +-نمایش جلسه‌های دیگر ارسال محتوا ++نمایش جلسه‌های دیگر پخش محتوا + فعال کردن زمینه + فرزندتان می‌تواند برای باز کردن قفل دستگاه از پین استفاده کند. + Microsoft Internet Explorer +@@ -176,7 +176,7 @@ + &نمای منبع قاب + در سایت فریب‌دهنده وارد شده است + خطا +-بستن برگه‌ها به چپ ++بستن برگه‌های سمت راست + مرور به‌روزرسانی نام + به میزکار تعلق دارد + باز کردن با ... +@@ -1175,7 +1175,7 @@ + پنهان شده است + {COUNT,plural, =1{شماره تلفن}one{# شماره تلفن}other{# شماره تلفن}} + پاک کردن نوع +-برگه جدید در راست ++برگه جدید در سمت راست + خوش آمدید، + کوچک کردن برگه + باز کردن &فایل... +@@ -1337,7 +1337,7 @@ + خروج از سیستم و ورود دوباره به آن + نرخ بازآوری صفحه + ‏بازخورد شما به ما کمک می‌کند Google Cast را بهبود ببخشیم و بابت ارائه آن از شما سپاس‌گزاریم. +- برای دریافت راهنمایی درباره عیب‌یابی مشکلات ارسال محتوا، لطفاً به ++ برای دریافت راهنمایی درباره عیب‌یابی مشکلات پخش محتوا، لطفاً به + + مرکز راهنمایی مراجعه کنید. + وقتی سایتی می‌خواهد به دستگاه‌های مجهز به بلوتوث دسترسی پیدا کند سؤال شود (توصیه می‌شود) +@@ -2196,7 +2196,7 @@ + صفحهٔ وب، کامل + موتورهای گفتار + ‏دستگاه‌های HID از فروشنده +-گزارش‌های ارسال محتوا و دستگاه‌ها ++گزارش‌های پخش محتوا و دستگاه‌ها + اندازه نمایش + کاربرد کلید گواهی + فعال کردن پین کاربر +@@ -2309,7 +2309,7 @@ + درحال هم‌رسانی این برگه با + برخی شرکت‌های مخابراتی ممکن است این قابلیت را مسدود کنند. + همچنین می‌توانید از ورود به سیستم صرف‌نظر کرده، به عنوان مهمان مرور کنید. +-برگه جدید در چپ ++برگه جدید در سمت چپ + زبان صفحه: + قلم نوشتار + مرور ایمن (از شما و دستگاهتان درمقابل سایت‌های خطرناک محافظت می‌کند) +@@ -2503,7 +2503,7 @@ + محتوای صفحه ارسال نشد. + سایت‌هایی که مجاز هستند از شناسه‌ها برای پخش محتوای محافظت‌شده استفاده کنند + ‏برای جستجوی هر بخشی از سایت و دریافت اطلاعات بیشتر درباره محتوای بصری که هنگام مرور و خرید در وب می‌بینید، کلیک راست کنید و «جستجوی تصاویر با «لنز Google»» را انتخاب کنید. +-‏با کلیک کردن روی دکمه «پذیرفتن و ادامه»، با پردازش مربوط به این سرویس‌های Google که در بالا توضیح داده شد موافقت می‌کنید. ++‏با کلیک کردن روی دکمه «پذیرفتن و ادامه دادن»، با پردازش مربوط به این سرویس‌های Google که در بالا توضیح داده شد موافقت می‌کنید. + ثابت می‌ماند + اعلان‌ها غیرفعال خواهند شد + × ( هرتز) - درهم‌بافته +@@ -3480,7 +3480,7 @@ + جمع‌آوری خطاها + مفید + دسترسی به مکان شما همیشه مسدود شود +-Hey Google ++Ok Google + ‏برای ارائه بهترین تجربه، داده‌های سخت‌افزار مربوط دستگاه‌ها را جمع‌آوری می‌کند و آن‌ها را با Google هم‌رسانی می‌کند تا مشخص شود چه به‌روزرسانی‌هایی باید ارائه شود. درصورت تمایل، می‌توانید به Google اجازه دهید از این داده‌ها برای اهداف دیگری مانند پشتیبانی و بهبود بخشیدن به سرویس و تجربه استفاده کند. + می‌توانید در این دستگاه به سیستم وارد شوید و به بخش CHROMEOSFLEX_HARDWARE_INFO در chrome://system بروید تا این موارد را ببینید: داده‌های ارسال‌شده به Google برای فیلتر کردن به‌روزرسانی‌ها و همچنین هر نمونه دیگری از انتخاب هم‌رسانی داده با Google. + برای دریافت جزئیات بیشتر درباره داده‌هایی که ممکن است با Google هم‌رسانی کند و نحوه استفاده از این داده‌ها، از g.co/flex/HWDataCollection بازدید کنید. +@@ -3494,7 +3494,7 @@ + کلید خصوصی برای این گواهی کارخواه موجود نیست یا نامعتبر است + باز کردن به‌عنوان برگه + حساب پیش‌فرض در شما است +-هیچ مقصدی برای ارسال محتوا پیدا نشد. نیاز به راهنمایی دارید؟ ++هیچ مقصدی برای پخش محتوا پیدا نشد. نیاز به راهنمایی دارید؟ + خربزه + در حال اشتراک‌گذاری یک پنجره است. + نمایش اعلان‌ها +@@ -3529,7 +3529,7 @@ + سایت‌هایی که هرگز گذرواژه را ذخیره نمی‌کنند در اینجا نشان داده نخواهند شد + برای تغییر عملکرد کلیدهای ردیف بالا، کلید «راه‌انداز» را نگه‌دارید + برای نشانک‌گذاری یک برگه، می‌توانید روی ستاره کلیک کنید +-برای ارسال محتوا، بااستفاده از کد متصل شوید ++برای پخش محتوا، بااستفاده از کد متصل شوید + از اینکه سایت‌ها بدانند چه زمانی به‌صورت فعال از این دستگاه استفاده می‌کنید جلوگیری می‌شود + ‏هرزمان خواستید به‌آسانی داده‌هایتان را بازیابی کنید یا دستگاه‌هایتان را عوض کنید. داده‌های پشتیبان در Google بارگذاری می‌شوند و با گذرواژه «حساب Google» فرزندتان رمزگذاری می‌شوند. + پوشه دیگری را انتخاب کنید +@@ -4671,7 +4671,7 @@ + پس از این، نیازی نیست برای به‌روزرسانی‌ها صبر کنید + این نماد وقتی قابل رؤیت است که برنامهٔ افزودنی بتواند برای صفحه فعلی کار کند. + ارائه دهنده مجوز ایمیل +-چرخش دوربین ++چرخاندن دوربین + انتخاب ویژگی حفاظتی «مرور ایمن» + تازه‌سازی + این سایت مسدود شده است زیرا احتمالاً حاوی محتوای بزرگ‌سالان است +@@ -4983,7 +4983,7 @@ + خطاهای سخت‌افزاری + هم‌رسانی صفحه به‌پایان رسید + درحال اجرا… +-برگه جدید در راست ++برگه جدید در سمت راست + کانال تغییر کرد. برای اعمال تغییرات دستگاه خود را مجدداً راه‌اندازی کنید. + چاپگر انتخابی موجود نیست یا به‌درستی نصب نشده است. چاپگر خود را بررسی کنید یا چاپگر دیگری را انتخاب کنید. + شبکه‌های شناخته‌شده +@@ -5155,7 +5155,7 @@ + اگر تنظیم «فعالیت وب و برنامه» تکمیلی برای «حساب Google» فرزندتان روشن باشد، ممکن است داده‌های فرزندتان در این حساب ذخیره شود. در families.google.com، درباره این تنظیمات و نحوه تغییر آن‌ها بیشتر بدانید. + سازمان شما این فایل را به‌دلیل عدم رعایت خط‌مشی امنیتی مسدود کرد + • +-برای شروع ارسال محتوا، کد دسترسی را تایپ کنید ++برای شروع پخش محتوا، کد دسترسی را تایپ کنید + ‏اعتبار گواهی SSL + &حذف داده‌های مرور... + گروه برگه اخیراً بسته‌شده +@@ -5799,7 +5799,7 @@ + بازیابی همه برگه‌ها + درحال بارگیری آخرین به‌روزرسانی + ‏باز کردن Google Play +-بستن برگه‌ها به چپ ++بستن برگه‌های سمت راست + برگه به راست منتقل شد + ذخیره گذرواژه‌تان + پنهان کردن +@@ -6459,7 +6459,7 @@ + سایت‌ها می‌توانند برای اتصال به دستگاه‌های بلوتوث درخواست دهند + راهنمای گزینه‌های حریم‌خصوصی + دسترسی درخواست شده +-ارسال محتوا… ++پخش محتوا… + انتخاب فایل + اندازه نمایشگر + درحال اسکن کردن برای یافتن دستگاه‌های اطراف… +@@ -6512,7 +6512,7 @@ + سایت‌ها شاید برای نمایش آگهی از بالاپر استفاده کنند، یا بااستفاده از هدایت‌ها شما را به وب‌سایت‌هایی هدایت کنند که شاید نخواهید بازدید کنید + نشانک‌ها وارد شد. + بپرسید که آیا می‌خواهد به دوربین و میکرفون شما دسترسی داشته باشد +-ارسال محتوا به دستگاه ++پخش محتوا به دستگاه + بله، موافقم + ‏حافظه GPU + ۱۸ برابر +@@ -6727,7 +6727,7 @@ + رفتن به برگه ضبط‌شده + ‏caps lock غیرفعال + مشاهده مجوزها و داده‌های ذخیره‌شده در همه سایت‌ها +-برگه جدید در چپ ++برگه جدید در سمت چپ + ‏به Chrome خوش آمدید + نرخ بازآوری + برگه: +@@ -8015,7 +8015,7 @@ + باز کردن در برنامه + وقتی سایتی می‌خواهد از دستگاه‌ها و داده‌های واقعیت مجازی استفاده کند سؤال شود (توصیه می‌شود) + متصل نیست +-ارسال محتوا به دستگاه: ++پخش محتوا به دستگاه: + ‏ارتقا دادن Linux + انتخاب وضعیت نمایان بودن + این تنظیم در جلسه نمایشی قابل‌تغییر نیست. +@@ -8391,7 +8391,7 @@ + این سایت تلاش کرده است چند فایل را به‌طور خودکار بارگیری کند + حدود ۱ ساعت باقی مانده است + درخت پوشه نشانک +-‏سرپرست IT شما Chrome Goodies را برای دستگاهتان غیرفعال کرده است. ++‏سرپرست فناوری اطلاعات شما Chrome Goodies را برای دستگاهتان غیرفعال کرده است. + {NUM_APLLICATIONS,plural, =1{برنامه}one{برنامه}other{برنامه}} + تنظیم صفحه‌نمایش + ارسال و دریافت پیامک از شما. بیشتر بدانید +diff --git a/chrome/app/resources/generated_resources_hr.xtb b/chrome/app/resources/generated_resources_hr.xtb +index b11e723c46f7..36c265474811 100644 +--- a/chrome/app/resources/generated_resources_hr.xtb ++++ b/chrome/app/resources/generated_resources_hr.xtb +@@ -3869,7 +3869,7 @@ i Ctrl + Alt + Smanjivanje svjetline da biste smanjili prikaz. + Ukloni isticanje + Saznajte kako ažurirati aplikacije + {NUM_TABS,plural, =1{Uključi zvuk na web-lokaciji}one{Uključi zvuk na web-lokacijama}few{Uključi zvuk na web-lokacijama}other{Uključi zvuk na web-lokacijama}} +-Pristupajte Asistentu tako što ćete reći "Hey Google" ++Pristupite Asistentu tako da kažete Ok Google + Poruke + Web-lokacije se obično povezuju s HID uređajima radi značajki koje koriste neuobičajene tipkovnice, upravljače za igre i druge uređaje + Pregled daljnjih nekoliko dopuštenja nastavite na telefonu. Provjerite jesu li na telefonu uključeni Bluetooth i Wi-Fi. +@@ -6491,7 +6491,7 @@ Toj radnji možete dodijeliti više prekidača. + Telefonom povezanim USB kabelom + {NUM_HOURS,plural, =1{Sigurnosna provjera izvršena je prije sat vremena}one{Sigurnosna provjera izvršena je prije {NUM_HOURS} sata}few{Sigurnosna provjera izvršena je prije {NUM_HOURS} sata}other{Sigurnosna provjera izvršena je prije {NUM_HOURS} sati}} + Skočni prozor blokiran +-Uvezi i uveži ++Uvezi i poveži + Većina korisnika blokira obavijesti s te web-lokacije + Dodajte poslužitelj za ispis + Posebno velik +diff --git a/chrome/app/resources/generated_resources_iw.xtb b/chrome/app/resources/generated_resources_iw.xtb +index 3fa3578d6d0f..68a5ad9bb773 100644 +--- a/chrome/app/resources/generated_resources_iw.xtb ++++ b/chrome/app/resources/generated_resources_iw.xtb +@@ -176,7 +176,7 @@ + &הצגת מקור המסגרת + הוזנה באתר מטעה + שגיאה +-סגירת הכרטיסיות משמאל ++סגירת הכרטיסיות מימין + בדיקת עדכון השם + הכרטיסייה שייכת לשולחן העבודה הווירטואלי + הפתיחה תתבצע בעוד ... +@@ -1177,7 +1177,7 @@ + ההסתרה של בוצעה + {COUNT,plural, =1{מספר טלפון}two{# מספרי טלפון}many{# מספרי טלפון}other{# מספרי טלפון}} + ניקוי הסוגים +-כרטיסייה חדשה מצד שמאל ++כרטיסייה חדשה מצד ימין + שלום, + הצמדת כרטיסייה + פתיחת &קובץ... +@@ -1556,7 +1556,7 @@ + כתובת לא חוקית. יש לבדוק את הכתובת ולנסות שוב. + צללית טקסט + ייתכן שגם באתרים יהיה צורך לזהות את המכשיר שלך באמצעות מזהה +-סגירת הכרטיסיות מימין ++סגירת הכרטיסיות משמאל + ספריית הבסיס של ההרחבה נחוצה. + יצירת פרופיל חדש + קשור לחיפוש שלך +@@ -3177,7 +3177,7 @@ + ‏– + (TCP) + ‏העתקת פרטי build +-סגירת הכרטיסיות מימין ++סגירת הכרטיסיות משמאל + &הוספה למילון + קביעת התצורה של המכשיר. + השתקת האתרים שנבחרו +@@ -4986,7 +4986,7 @@ + שגיאות חמורות + שיתוף המסך הסתיים + התכונה פעילה… +-כרטיסייה חדשה מצד שמאל ++כרטיסייה חדשה מצד ימין + הערוץ שונה. יש להפעיל מחדש את המכשיר להחלת השינויים. + המדפסת שבחרת אינה זמינה או שאינה מותקנת כראוי. יש לבדוק את המדפסת או לנסות לבחור מדפסת אחרת. + רשתות מוכרות +@@ -5802,7 +5802,7 @@ + ש&חזור כל הכרטיסיות + המערכת מורידה את העדכון האחרון + ‏פתיחת Google Play +-סגירת הכרטיסיות משמאל ++סגירת הכרטיסיות מימין + הכרטיסייה הועברה שמאלה + שמירת הסיסמה שלך + הסתרה של +@@ -6730,7 +6730,7 @@ + לכרטיסייה המוקלטת + ‏caps lock מושבת + הצגת הרשאות ונתונים המאוחסנים באתרים שונים +-כרטיסייה חדשה מצד ימין ++כרטיסייה חדשה מצד שמאל + ‏ברוך בואך אל Chrome + קצב רענון + כרטיסייה: +diff --git a/chrome/app/resources/generated_resources_ko.xtb b/chrome/app/resources/generated_resources_ko.xtb +index c7af8a98f874..6e986a095589 100644 +--- a/chrome/app/resources/generated_resources_ko.xtb ++++ b/chrome/app/resources/generated_resources_ko.xtb +@@ -6053,7 +6053,7 @@ https://support.google.com/chromebook/?p=tpm + 공유를 마운트하는 중 오류가 발생했습니다. 연결하려는 파일 서버가 SMBv2 이상을 지원하는지 확인하세요. + 브라우저에 관리되는 프로필을 추가하려고 합니다. 관리자가 프로필을 제어하고 프로필 데이터에 액세스할 수 있습니다. 북마크, 방문 기록, 비밀번호 및 기타 설정이 계정에 동기화되고 이를 관리자가 관리할 수 있습니다. + 학교 계정에서는 자녀 보호 기능이 지원되지 않습니다. 집에서 학교 과제를 위해 Google 클래스룸 및 다른 웹사이트에 액세스할 수 있는 학교 계정을 추가하려면 먼저 자녀의 개인 계정으로 로그인하세요. 설정에서 학교 계정을 나중에 추가할 수 있습니다. +-Ok Google ++Hey Google + 외장 보안 키 또는 내장 센서 + {NUM_EXTENSIONS,plural, =1{확장 프로그램 1개 거부됨}other{확장 프로그램 #개 거부됨}} + 클릭 강도 +diff --git a/chrome/app/resources/generated_resources_mr.xtb b/chrome/app/resources/generated_resources_mr.xtb +index 6878a20fa76b..765298e60f1b 100644 +--- a/chrome/app/resources/generated_resources_mr.xtb ++++ b/chrome/app/resources/generated_resources_mr.xtb +@@ -3480,7 +3480,7 @@ + एरर संकलित करा + उपयुक्त + तुमचे स्थान अ‍ॅक्सेस करण्यापासून ला नेहमी ब्लॉक करा +-Hey Google ++Ok Google + सर्वोत्तम अनुभव पुरवण्यासाठी, हे डिव्हाइसबद्दल हार्डवेअर डेटा गोळा करते आणि कोणती अपडेट डिलिव्हर केली पाहिजे हे निर्धारित करण्यासाठी तो Google सोबत शेअर करते. याव्यतिरिक्त, तुम्ही मधील अनुभव आणि सेवा यांच्याशी संबंधित सपोर्ट आणि सुधारणा यांसारख्या अतिरिक्त उद्देशांसाठी Google ला हा डेटा वापरण्याची अनुमती देऊ शकता. + फिल्टर करण्याचे पर्याय अपडेट करण्यासाठी Google ला पाठवलेला डेटा तसेच असे कोणतेही प्रसंग ज्यात तुम्ही Google सोबत डेटा शेअर करण्याचे निवडले होते हे पाहण्याकरिता तुम्ही या डिव्हाइसवर लॉग इन करू शकता आणि chrome://system मधील CHROMEOSFLEX_HARDWARE_INFO विभागाला भेट देऊ शकता. + हे Google सोबत कदाचित शेअर करेल असा डेटा आणि तो कसा वापरला जातो याविषयीच्या अधिक तपशिलांसाठी g.co/flex/HWDataCollection ला भेट द्या. +diff --git a/chrome/app/resources/generated_resources_sl.xtb b/chrome/app/resources/generated_resources_sl.xtb +index f033654a6177..025f3dee2671 100644 +--- a/chrome/app/resources/generated_resources_sl.xtb ++++ b/chrome/app/resources/generated_resources_sl.xtb +@@ -3486,7 +3486,7 @@ Domena zahteva, da je pametna kartica vstavljena.Zbiranje napak + Uporabno + Gostitelju vedno prepreči dostop do lokacije +-Hey Google ++OK Google + Zaradi omogočanja najboljše izkušnje operacijski sistem zbira podatke o strojni opremi naprav in jih deli z Googlom zaradi določanja, katere posodobitve naj vam zagotovi. Izbirno lahko dovolite Googlu, da te podatke uporablja za dodatne namene, kot so podpora in izboljšanje izkušnje sistema ter njegovih storitev. + Prijavite se lahko v to napravo in obiščete razdelek CHROMEOSFLEX_HARDWARE_INFO na chrome://system, kjer si ogledate podatke, poslane Googlu zaradi filtriranja posodobitev, in druge primere, v katerih ste izbrali deljenje podatkov z Googlom. + Če želite več podrobnosti o podatkih, ki jih morda deli z Googlom in kako se ti uporabljajo, obiščite g.co/flex/HWDataCollection. +@@ -6818,7 +6818,7 @@ Domena zahteva, da je pametna kartica vstavljena.Dodaj &mapo... + Funkcije »cryptohome« za aplikacijo za kiosk ni bilo mogoče vpeti. + Tega varnostnega ključa ni mogoče ponastaviti. Napaka . +-»Hey Google« ++»OK Google« + Nadgradnja Crostinija + Orodje označevalnika + V telefonu »«: +diff --git a/chrome/app/resources/generated_resources_th.xtb b/chrome/app/resources/generated_resources_th.xtb +index a0ba01a3bed6..5122e2a35fcc 100644 +--- a/chrome/app/resources/generated_resources_th.xtb ++++ b/chrome/app/resources/generated_resources_th.xtb +@@ -1128,7 +1128,7 @@ + จัดกลุ่มแท็บ + เลือกสีธีม + โปรดลองอีกครั้ง +-VPN แบบเปิดตลอดเวลา ++การเชื่อมต่อ VPN ตลอดเวลา + พิมพ์: + รองรับการลงทะเบียนหลังจากที่คุณติดตั้ง แล้วเท่านั้น + เลื่อนขึ้นจากด้านล่างเพื่อไปยังหน้าจอหลักได้ทุกเมื่อ +diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb +index a43c7436accf..192af20891bc 100644 +--- a/chrome/app/resources/generated_resources_uk.xtb ++++ b/chrome/app/resources/generated_resources_uk.xtb +@@ -1077,7 +1077,7 @@ + Функції, яким потрібні зображення, не працюватимуть + Тепер можете налаштувати обладнання для Google Meet + Вимкнути збір даних про ефективність +-На жаль, зараз пристрій зовнішньої пам’яті не підтримується. ++На жаль, ваш зовнішній носій наразі не підтримується. + ПК підключено до дротової мережі, а Chromecast – до Wi-Fi + &Відкрити аудіо в новій вкладці + Показати налаштування мережевої адреси +diff --git a/chrome/app/resources/generated_resources_ur.xtb b/chrome/app/resources/generated_resources_ur.xtb +index af977346c790..1a10baaec419 100644 +--- a/chrome/app/resources/generated_resources_ur.xtb ++++ b/chrome/app/resources/generated_resources_ur.xtb +@@ -174,7 +174,7 @@ + &فریم کا ماخذ دیکھیں + فریب والی سائٹ پر درج کیا گیا + خرابی +-دائیں جانب ٹیبز بند کریں ++دائیں جانب والے ٹیبز بند کریں + نام میں ہوئی اپ ڈیٹ کا جائزہ لیں + ڈیسک سے تعلق رکھتی ہے + میں کھولا جا رہا ہے… +diff --git a/chromeos/strings/chromeos_strings_ca.xtb b/chromeos/strings/chromeos_strings_ca.xtb +index 7133df744585..ef0650d31ccc 100644 +--- a/chromeos/strings/chromeos_strings_ca.xtb ++++ b/chromeos/strings/chromeos_strings_ca.xtb +@@ -490,7 +490,7 @@ Toca el micròfon per demanar-me qualsevol cosa. + L'alimentador de documents de l'escàner està encallat. Comprova l'alimentador i torna-ho a provar. + Fitxers d'imatge + Coincidència d'assumpte +-VPN oberta ++OpenVPN + Feble () + Ves a la configuració del compte + Bona +diff --git a/chromeos/strings/chromeos_strings_id.xtb b/chromeos/strings/chromeos_strings_id.xtb +index 00017fd849ed..b0040b2a4895 100644 +--- a/chromeos/strings/chromeos_strings_id.xtb ++++ b/chromeos/strings/chromeos_strings_id.xtb +@@ -681,7 +681,7 @@ Ketuk mikrofon untuk bertanya apa saja. + Saluran + pound + Bergabung dengan jaringan +-Kunci yang dibagikan sebelumnya ++Pre-shared key + Tidak ada album. Buat album di Google Foto. + Gunakan tombol Panah kiri atau kanan untuk mengelola fitur ini. + Mengerti +diff --git a/components/policy/resources/policy_templates_pt-BR.xtb b/components/policy/resources/policy_templates_pt-BR.xtb +index 3103c084819c..854417e118b1 100644 +--- a/components/policy/resources/policy_templates_pt-BR.xtb ++++ b/components/policy/resources/policy_templates_pt-BR.xtb +@@ -4060,7 +4060,7 @@ Se esta política for definida como "Falsa", o não u + + Se ela for definida como falsa, o não poderá mostrar informações do produto como conteúdo em guia cheia. + +- Esta política controla a apresentação das informações promocionais em uma guia inteira. Isso inclui conteúdo como as páginas de boas-vindas que ajudam os usuários a fazer login em , definir como navegador padrão ou descobrir os recursos do produto. ++ Esta política controla a apresentação das informações promocionais em uma guia inteira. Isso inclui conteúdo como as páginas de recepção que ajudam os usuários a fazer login em , definir como navegador padrão ou descobrir os recursos do produto. + Esta política controla a visibilidade de cards na página Nova guia. Os cards exibem pontos de entrada para inicializar jornadas de usuário comuns com base no comportamento de navegação do usuário. + + Se a política for definida como "Ativada", a página Nova guia exibirá os cards caso haja conteúdo disponível. +diff --git a/components/strings/components_strings_eu.xtb b/components/strings/components_strings_eu.xtb +index b3273f52b458..69f099c37cea 100644 +--- a/components/strings/components_strings_eu.xtb ++++ b/components/strings/components_strings_eu.xtb +@@ -712,7 +712,7 @@ Bestela, pribatutasun-ezarpenek blokeatu egingo dute baimen hori. Baimen honekin + Helbideak + Ez al da orriko hizkuntza? + Aldaketa bat hauteman da sarean. +-Laneko kontabilitateaz arduratzen den erabiltzailearen IDa ++Laneko kontabilitateaz arduratzen den erabiltzaile IDa + Eskuarki, webguneak enkriptatzea erabiltzen du informazioa babesteko. Chrome webgunera konektatzen saiatu denean, webguneak kredentzial desegokiak eta ezohikoak bidali ditu. Erasotzaile bat webgunearen plantak egiten ari delako gerta daiteke hori, edo wifi-sarean saioa hasteko pantailak konexioa eten duelako. Zure informazioa seguru dago, datuak trukatu aurretik eten baitu Chrome-k konexioa. + Hutsegitearen ordua: + Margotzea +diff --git a/components/strings/components_strings_fa.xtb b/components/strings/components_strings_fa.xtb +index 3277824004b3..e9d671b9971b 100644 +--- a/components/strings/components_strings_fa.xtb ++++ b/components/strings/components_strings_fa.xtb +@@ -2062,7 +2062,7 @@ + نسبی با فشرده‌سازی نقطه سیاه + ‏چون به سیستم وارد شده‌اید، Chrome پیشنهاد می‌کند کارت‌ها را در حساب Google ذخیره کنید. در تنظیمات می‌توانید این رفتار را تغییر دهید. نام دارنده کارت از حساب شما گرفته شده است. + ‏، برای پیدا کردن دستگاهتان در «حساب Google»، کلید «جهش» و سپس «ورود» را فشار دهید +-دکمه «هم‌رسانی این برگه»؛ برای هم‌رسانی این برگه ازطریق هم‌رسانی پیوند، ایجاد رمزینه پاسخ‌سریع، ارسال محتوا، و موارد دیگر، کلید «ورود» را فشار دهید ++دکمه «هم‌رسانی این برگه»؛ برای هم‌رسانی این برگه ازطریق هم‌رسانی پیوند، ایجاد رمزینه پاسخ‌سریع، پخش محتوا، و موارد دیگر، کلید «ورود» را فشار دهید + ایجاد شده: + ارائه کردن + اخبار +@@ -2312,7 +2312,7 @@ + به‌روزرسانی نشانی + بررسی ایمنی + نشانی وب +-هم‌رسانی این برگه ازطریق هم‌رسانی پیوند، ایجاد رمزینه پاسخ‌سریع، ارسال محتوا، و موارد دیگر ++هم‌رسانی این برگه ازطریق هم‌رسانی پیوند، ایجاد رمزینه پاسخ‌سریع، پخش محتوا، و موارد دیگر + دستگاه تحت مدیریت است + ‏<p>اگر در رایانه Windows نرم‌افزار Superfish داشته باشید، این خطا را می‌بینید.</p> + <p>برای غیرفعال کردن موقت این نرم‌افزار و دسترسی به وب، این مراحل را دنبال کنید. لازم است امتیازهای سرپرست را داشته باشید.</p> +@@ -2883,7 +2883,7 @@ + نشانی صورت‌حساب کارت لازم است + این صفحه به ترجمه شده است + A8 +-؛ برای هم‌رسانی این برگه ازطریق هم‌رسانی پیوند، ایجاد رمزینه پاسخ‌سریع، ارسال محتوا، و موارد دیگر، کلید «جهش» و سپس «ورود» را فشار دهید ++؛ برای هم‌رسانی این برگه ازطریق هم‌رسانی پیوند، ایجاد رمزینه پاسخ‌سریع، پخش محتوا، و موارد دیگر، کلید «جهش» و سپس «ورود» را فشار دهید + (نامعتبر) + تک‌رنگ + خطای امنیتی +diff --git a/components/strings/components_strings_te.xtb b/components/strings/components_strings_te.xtb +index c9abd68b6f99..a7175812f17b 100644 +--- a/components/strings/components_strings_te.xtb ++++ b/components/strings/components_strings_te.xtb +@@ -613,7 +613,7 @@ + గ్రూప్‌గా చేయి + 'సెక్యూరిటీ సెట్టింగ్‌లను మేనేజ్ చేయండి' బటన్, Chrome సెట్టింగ్‌లలో మీ సురక్షిత బ్రౌజింగ్‌ను, అలాగే మరిన్నింటిని మేనేజ్ చేయడానికి 'Enter'ను నొక్కండి + క్లిప్‌బోర్డ్ +-ప్రచురణకర్త . దీన్ని మరియు మరో ఇతర కథనాలను చదవండి. ++పబ్లిషర్‌ . దీన్ని మరియు మరో ఇతర కథనాలను చదవండి. + డైరెక్టరీ API ID: + వేగవంతమైన వెబ్ వీక్షణ: + ఈ పరికరం మరియు ఖాతా రెండూ కూడా కంపెనీ లేదా ఇతర సంస్థ నిర్వహణలో లేవు. +diff --git a/third_party/blink/public/strings/translations/blink_accessibility_strings_fa.xtb b/third_party/blink/public/strings/translations/blink_accessibility_strings_fa.xtb +index 1a0b12ff66e8..298e9c74a670 100644 +--- a/third_party/blink/public/strings/translations/blink_accessibility_strings_fa.xtb ++++ b/third_party/blink/public/strings/translations/blink_accessibility_strings_fa.xtb +@@ -33,7 +33,7 @@ + ‏نماد «Twitter» + نماد «جهت‌نمای چپ»، می‌تواند به‌معنای «برگشتن» باشد + نماد «بلندگو»، می‌تواند به‌معنای «میزان صدا» باشد +-نماد «ارسال محتوا»، می‌تواند به‌معنای ارسال محتوای ویدیویی به صفحه‌نمایش ازراه‌دور باشد ++نماد «پخش محتوا»، می‌تواند به‌معنای ارسال محتوای ویدیویی به صفحه‌نمایش ازراه‌دور باشد + این تصویر برچسب ندارد. برای دریافت شرح تصویر، منوی «گزینه‌های بیشتر» را در بالا سمت چپ باز کنید. + نماد «پیکان سمت چپ» + ظاهراً را نشان می‌دهد +diff --git a/third_party/blink/public/strings/translations/blink_strings_fa.xtb b/third_party/blink/public/strings/translations/blink_strings_fa.xtb +index 2c7dd213e6b1..668501099274 100644 +--- a/third_party/blink/public/strings/translations/blink_strings_fa.xtb ++++ b/third_party/blink/public/strings/translations/blink_strings_fa.xtb +@@ -102,7 +102,7 @@ + گسترده شد، گزینه‌های تکمیل خودکار دردسترس است. + خاموش + تمام صفحه +-درحال ارسال محتوا به ++درحال پخش محتوا به + روشن + بازنشانی + هفته +@@ -168,7 +168,7 @@ + ۱٫۷۵ + شکست خط + لطفاً یکی از این گزینه‌ها را انتخاب کنید. +-درحال ارسال محتوا به تلویزیون ++درحال پخش محتوا به تلویزیون + خطا در بازپخش ویدئو + رنگ‌مایه + کیلوبایت +diff --git a/ui/chromeos/translations/ui_chromeos_strings_af.xtb b/ui/chromeos/translations/ui_chromeos_strings_af.xtb +index 0458265f9530..97a675ca5b4d 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_af.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_af.xtb +@@ -121,7 +121,7 @@ + Gaan na lêerligging toe + Bestuur in Drive + Alle data wat op 'n skyf geberg is, sal uitgevee word wanneer dit geformateer word. Hierdie handeling kan nie ontdoen word nie. +-Tigrinya ++Tigrinja + RAR-argief + Saamgeperste LZMA-teerargief + Russies +diff --git a/ui/chromeos/translations/ui_chromeos_strings_ca.xtb b/ui/chromeos/translations/ui_chromeos_strings_ca.xtb +index 1208d85315aa..1c6ab25c8ede 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_ca.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_ca.xtb +@@ -908,7 +908,7 @@ + Islandès + El PIN no és correcte. Et queden  intents. + - Port +-No els comprovis ++No comprovis + Contrasenya incorrecta + Dibuix de Google + Entesos +diff --git a/ui/chromeos/translations/ui_chromeos_strings_ne.xtb b/ui/chromeos/translations/ui_chromeos_strings_ne.xtb +index fe499ab6dcd0..07e94eed7c1f 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_ne.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_ne.xtb +@@ -478,7 +478,7 @@ + फाइलहरू मेटाइने छन् + मा वटा वस्तु सारिँदै छन् + त्रुटि भयो। +-हिब्रु ++हिब्रू + कुनै त्रुटि भयो। केही वस्तुहरू रिस्टोर नभएका हुन सक्छन्। + अङ्ग्रेजी (क्यानाडा) + बास्केटबल +diff --git a/ui/chromeos/translations/ui_chromeos_strings_uk.xtb b/ui/chromeos/translations/ui_chromeos_strings_uk.xtb +index ae2e1f090652..42fbe4472af3 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_uk.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_uk.xtb +@@ -359,7 +359,7 @@ + Файл "" переміщено. + Увімкнути режим офлайн + Документ Google +-Вибір файлів для архівування ++Додати в архів .zip + Іспанська (Латинська Америка) + Грузинська + Щоб отримати доступ до цього файлу, потрібно перебувати в режимі онлайн. +diff --git a/ui/chromeos/translations/ui_chromeos_strings_zh-TW.xtb b/ui/chromeos/translations/ui_chromeos_strings_zh-TW.xtb +index bebd64d8f9ea..cfb57e3d9928 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_zh-TW.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_zh-TW.xtb +@@ -385,7 +385,7 @@ + 第 個網路 (共 個)，，，，訊號強度 %，由系統管理員管理，詳細資料 + 遠端已拒絕驗證憑證 + 外部連結 +-擷取全部 ++解壓縮全部 + 擷取作業失敗： + 為檔案建立捷徑 + 我的雲端硬碟 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0004-M-102-lacros-fix-extension-controlled-pref-observers.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0004-M-102-lacros-fix-extension-controlled-pref-observers.patch new file mode 100644 index 000000000000..85cb17020c3d --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0004-M-102-lacros-fix-extension-controlled-pref-observers.patch @@ -0,0 +1,43 @@ +From 8416ba6a9b0e6d607655580b55c684cde6a435ee Mon Sep 17 00:00:00 2001 +From: Ian Helmke +Date: Fri, 10 Jun 2022 16:36:43 +0000 +Subject: [PATCH 04/59] M-102: lacros - fix extension controlled pref observers + +Currently creating an observer for an extension controlled pref causes +ash to crash. This is a prerequisite to the full implementation of +extension-controlled pref observers in lacros. + +(cherry picked from commit c3fe354aeee8432539fe42ddb4b3ac3e71736cd4) + +Bug: 1218145, 1334985 +Change-Id: Iad18872f3614a4125c5623226a69c9848554512b +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3690828 +Reviewed-by: Erik Chen +Commit-Queue: Ian Helmke +Cr-Original-Commit-Position: refs/heads/main@{#1011757} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3695789 +Commit-Queue: Erik Chen +Reviewed-by: Hidehiko Abe +Cr-Commit-Position: refs/branch-heads/5005@{#1163} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/browser/ash/crosapi/prefs_ash.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/chrome/browser/ash/crosapi/prefs_ash.cc b/chrome/browser/ash/crosapi/prefs_ash.cc +index 5ddec3bda554..a9ade8d99ac1 100644 +--- a/chrome/browser/ash/crosapi/prefs_ash.cc ++++ b/chrome/browser/ash/crosapi/prefs_ash.cc +@@ -302,7 +302,8 @@ absl::optional PrefsAsh::GetState(mojom::PrefPath path) { + return absl::nullopt; + } + std::string pref_name = GetExtensionPrefNameForPref(path); +- return State{profile_prefs_registrar_->prefs(), nullptr, true, pref_name}; ++ return State{profile_prefs_registrar_->prefs(), ++ profile_prefs_registrar_.get(), true, pref_name}; + } + default: + LOG(WARNING) << "Unknown pref path: " << path; +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0005-Incrementing-VERSION-to-102.0.5005.126.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0005-Incrementing-VERSION-to-102.0.5005.126.patch new file mode 100644 index 000000000000..ecf389f14d38 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0005-Incrementing-VERSION-to-102.0.5005.126.patch @@ -0,0 +1,28 @@ +From c1183bc113b0e24cb2d66b924b246b00e975b671 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Sat, 11 Jun 2022 01:00:49 +0000 +Subject: [PATCH 05/59] Incrementing VERSION to 102.0.5005.126 + +Change-Id: Id7f380472d528daafaed371354a37a49d998c7b0 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3700892 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1164} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 6c2850a7ebf2..4db5628c5de0 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=125 ++PATCH=126 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0006-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0006-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..3b6287e3eb72 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0006-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,110 @@ +From 072cee8911fc04072b9867585ad49ced2c922851 Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Sat, 11 Jun 2022 14:19:04 +0000 +Subject: [PATCH 06/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: Ib9c403509905557d2e7ffc90cbb19af7166d1e0b +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3701213 +Auto-Submit: Ben Mason +Bot-Commit: Rubber Stamper +Commit-Queue: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1165} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/app/resources/generated_resources_nl.xtb | 10 +++++----- + chrome/app/resources/google_chrome_strings_tr.xtb | 2 +- + ios/chrome/app/strings/resources/ios_strings_bs.xtb | 2 +- + ui/chromeos/translations/ui_chromeos_strings_hr.xtb | 2 +- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/chrome/app/resources/generated_resources_nl.xtb b/chrome/app/resources/generated_resources_nl.xtb +index b457647f2406..b3c649849179 100644 +--- a/chrome/app/resources/generated_resources_nl.xtb ++++ b/chrome/app/resources/generated_resources_nl.xtb +@@ -347,7 +347,7 @@ + Mediatabbladen worden ook getoond in het gedeelte Geopende tabbladen + Bevestigen en opnieuw opstarten + Rechts +-Updates en apps installeren. Als je doorgaat, ga je ermee akkoord dat je apparaat ook automatisch updates en apps van Google, je provider en de fabrikant kan downloaden en installeren. Hiervoor worden mogelijk mobiele data gebruikt. Sommige van deze apps kunnen in-app-aankopen aanbieden. Meer informatie ++Updates en apps installeren. Als je doorgaat, ga je ermee akkoord dat je apparaat ook automatisch updates en apps van Google, je provider en de fabrikant kan downloaden en installeren. Hiervoor worden mogelijk mobiele data gebruikt. Sommige van deze apps kunnen in-app aankopen aanbieden. Meer informatie + Linux-opslag + De update wordt gestart wanneer de batterij voor % vol is. + Als je opties voor ouderlijk toezicht, zoals app-goedkeuring en schermtijdlimieten, wilt gebruiken, moet je kind een Google-account hebben dat wordt beheerd door een ouder. Je kunt later een schoolaccount toevoegen voor tools zoals Google Classroom. +@@ -853,7 +853,7 @@ Rechten die je al hebt gegeven aan apps, kunnen van toepassing zijn op dit accou + Licht + Apps die je hebt gedownload via Google Play worden van deze Chromebook verwijderd. + +- De content die je hebt gekocht, zoals films, tv-programma's, muziek, boeken of andere in-app-aankopen, worden mogelijk ook verwijderd. ++ De content die je hebt gekocht, zoals films, tv-programma's, muziek, boeken of andere in-app aankopen, worden mogelijk ook verwijderd. + + Dit is niet van invloed op apps of content op andere apparaten. + Mijn bookmarks, geschiedenis, wachtwoorden en andere instellingen toevoegen aan +@@ -4516,7 +4516,7 @@ Je kunt meerdere schakelaars toewijzen aan deze actie. + Gemakkelijk inloggen bij apparaten + Altijd vertalen + Rechtsom &draaien +-Als je doorgaat, ga je ermee akkoord dat dit apparaat ook automatisch updates of apps van Google, je provider of de fabrikant van je apparaat kan downloaden en installeren, en dat hiervoor mogelijk mobiele data worden gebruikt. Sommige van deze apps kunnen in-app-aankopen aanbieden. ++Als je doorgaat, ga je ermee akkoord dat dit apparaat ook automatisch updates of apps van Google, je provider of de fabrikant van je apparaat kan downloaden en installeren, en dat hiervoor mogelijk mobiele data worden gebruikt. Sommige van deze apps kunnen in-app aankopen aanbieden. + (Update is beschikbaar) + Zoeken op je scherm met + Er moet een update voor de Trusted Platform Module-firmware worden geïnstalleerd. Zie +@@ -4562,7 +4562,7 @@ Je kunt meerdere schakelaars toewijzen aan deze actie. + Hallo. Ik ben je stem voor tekst-naar-spraak. + Wachtwoorden voor deze site opslaan + IBM +-Als je verdergaat, ga je ermee akkoord dat dit apparaat ook automatische updates en apps van Google, de provider van je kind en de fabrikant van dit apparaat kan downloaden en installeren, waarbij mogelijk mobiele data worden gebruikt. Sommige van deze apps kunnen in-app-aankopen aanbieden. ++Als je verdergaat, ga je ermee akkoord dat dit apparaat ook automatische updates en apps van Google, de provider van je kind en de fabrikant van dit apparaat kan downloaden en installeren, waarbij mogelijk mobiele data worden gebruikt. Sommige van deze apps kunnen in-app aankopen aanbieden. + {NUM_CHARACTERS,plural, =1{De pincode moet ten minste 1 teken bevatten}other{De pincode moet ten minste # tekens bevatten}} + vereist dat je nu verbinding maakt met wifi en een update downloadt. Je kunt de update ook downloaden via een verbinding met datalimiet (er kunnen kosten van toepassing zijn). + Geen toestemming om automatisch meerdere bestanden te downloaden +@@ -4930,7 +4930,7 @@ Je kunt meerdere schakelaars toewijzen aan deze actie. + Fahrenheit + Nieuwe content voorstellen om te bekijken + Syntaxisfout in relatie: +-Installeer updates en apps. Als je doorgaat, ga je ermee akkoord dat je apparaat ook automatisch updates en apps van Google, je provider en de fabrikant kan downloaden en installeren. Hiervoor worden mogelijk mobiele data gebruikt. Sommige van deze apps kunnen in-app-aankopen aanbieden. ++Installeer updates en apps. Als je doorgaat, ga je ermee akkoord dat je apparaat ook automatisch updates en apps van Google, je provider en de fabrikant kan downloaden en installeren. Hiervoor worden mogelijk mobiele data gebruikt. Sommige van deze apps kunnen in-app aankopen aanbieden. + Al toegevoegd + Uitgever + Oeps! Er is iets misgegaan bij de aanmelding van dit apparaat. Probeer het opnieuw of neem contact op met een medewerker van het supportteam. +diff --git a/chrome/app/resources/google_chrome_strings_tr.xtb b/chrome/app/resources/google_chrome_strings_tr.xtb +index 045e90543fd8..c635cf85eec7 100644 +--- a/chrome/app/resources/google_chrome_strings_tr.xtb ++++ b/chrome/app/resources/google_chrome_strings_tr.xtb +@@ -9,7 +9,7 @@ + Bu sizin Chrome'unuz + Chrome'u kim kullanıyor? + Chrome güncellenemiyor +-&ChromeOS hakkında ++ChromeOS hakkında + &Chrome'da aç + Bu sayfada bulunmayan bir ayar varsa ChromeOS Flex ayarlarınıza + bakın +diff --git a/ios/chrome/app/strings/resources/ios_strings_bs.xtb b/ios/chrome/app/strings/resources/ios_strings_bs.xtb +index 783065579808..77d80f45e1c9 100644 +--- a/ios/chrome/app/strings/resources/ios_strings_bs.xtb ++++ b/ios/chrome/app/strings/resources/ios_strings_bs.xtb +@@ -504,7 +504,7 @@ Da biste promijenili tu postavku, poništite sinkronizac + Više postavki koje se odnose na privatnost, sigurnost i prikupljanje podataka možete pronaći u Googleovim uslugama. + Web lokacije koje pratite ćete pronaći ovdje + Otvori sliku +-Odbaci izmjene ++Odbaci promjene + Posljednjih 7 dana + Uredite lozinku + Kopirano je korisničko ime +diff --git a/ui/chromeos/translations/ui_chromeos_strings_hr.xtb b/ui/chromeos/translations/ui_chromeos_strings_hr.xtb +index acfe5612f35e..703533a8b033 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_hr.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_hr.xtb +@@ -312,7 +312,7 @@ + Sinkronizacija Google diska onemogućena je prema zadanim postavkama kada se upotrebljavaju mobilni podaci. + Otkažite . + Mreža od , , nije aktivirana, , jačina signala %, pojedinosti +-sinhaleški ++singalski + Nije moguće otvoriti ovaj uređaj jer nije podržan njegov datotečni sustav. + Promjena te postavke utjecat će na sve dijeljene mreže + Ukloni s bočne trake +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0007-Incrementing-VERSION-to-102.0.5005.127.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0007-Incrementing-VERSION-to-102.0.5005.127.patch new file mode 100644 index 000000000000..fc1bf71a96a3 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0007-Incrementing-VERSION-to-102.0.5005.127.patch @@ -0,0 +1,28 @@ +From f50593a7b3b30b172cd11bf2b1696b9897f68fe2 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Sun, 12 Jun 2022 01:00:41 +0000 +Subject: [PATCH 07/59] Incrementing VERSION to 102.0.5005.127 + +Change-Id: Icd5ee669cd0a2a6305e3be9f6129a0e900db4de4 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3701673 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1166} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 4db5628c5de0..f8c59ccd1144 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=126 ++PATCH=127 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0008-Incrementing-VERSION-to-102.0.5005.128.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0008-Incrementing-VERSION-to-102.0.5005.128.patch new file mode 100644 index 000000000000..9dc7df184c56 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0008-Incrementing-VERSION-to-102.0.5005.128.patch @@ -0,0 +1,28 @@ +From 4fcbdecc1f7334a52b90f6a9bf8f8c9b6cf6bc51 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Mon, 13 Jun 2022 01:00:40 +0000 +Subject: [PATCH 08/59] Incrementing VERSION to 102.0.5005.128 + +Change-Id: I22d833006358ea4bd8ef7dc3c9d58d5c308eedfd +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3697583 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1167} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index f8c59ccd1144..88774f2ace3f 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=127 ++PATCH=128 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0009-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0009-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..7b7406b7da2e --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0009-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,73 @@ +From cfe6727d5e34b66c6db9889c4bb6f732795d3558 Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Mon, 13 Jun 2022 14:27:20 +0000 +Subject: [PATCH 09/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: Idb67aeab99bc0544b5f908b1e82d2e62155f6a18 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3702757 +Bot-Commit: Rubber Stamper +Auto-Submit: Ben Mason +Commit-Queue: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1168} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/app/resources/generated_resources_da.xtb | 2 +- + .../strings/translations/android_chrome_strings_eu.xtb | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/chrome/app/resources/generated_resources_da.xtb b/chrome/app/resources/generated_resources_da.xtb +index a60a0ae6c617..5e3aaa5db75a 100644 +--- a/chrome/app/resources/generated_resources_da.xtb ++++ b/chrome/app/resources/generated_resources_da.xtb +@@ -3387,7 +3387,7 @@ Vil du starte ? + Apps, der styrer et website, kan kun downloades fra det pågældende website + Screenshot + Nej +-Tilmelding af terminal- og signeringsenhed ++Tilmelding af enhed til terminal- og signeringstilstand + Webside, enkelt fil (Web Bundle) + Bluetooth er deaktiveret + – faneindholdet deles +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb +index 64845ecef4a1..86cf1fdbe9fb 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb +@@ -162,7 +162,7 @@ Arakatze-historia ezabatzen duzunean (osorik nahiz webgune zehatz bat), neurketa + Beste hizkuntzak + Egin prezioaren jarraipena hemen + Aurrera egiten baduzu, onartu egingo dituzu Zerbitzu-baldintzak. +-Partekatzeko aukeren zerrenda itxita dago. ++Partekatze-aukeren zerrenda itxita dago. + Ahozko bilaketa egite aldera Laguntzailea zerbitzuari baimena emateko erabiltzaile-interfazea altuera erdian irekita dago + Baimendu Chrome-n saioa hastea + Iradokitako hizkuntzak +@@ -237,7 +237,7 @@ Sakatu bilatu nahi duzun hitza. Bilaketa mugatzeko, eduki testua sakatuta eta ha + Pasahitza ezabatzen baduzu ere, ez da ezabatuko webguneko kontua + aplikazioa ireki nahi duzu? + Fakturazio-helbidea +-Partekatzeko aukeren zerrenda. ++Partekatze-aukeren zerrenda. + Ez da aurkitu gailu bateragarririk + Ezarpen hau erabiltzeko, Hobetu bilaketak eta arakatze-jarduerak eginbideak aktibatuta egon behar du + Sakatu hau dei bat egiteko +@@ -567,7 +567,7 @@ Eduki sakatuta bilatu nahi duzun hitza. Bilaketa mugatzeko, hautatu hitz gehiago + Fitxa partekatzeko hautatutako gailuen zerrenda itxita dago. + Gailuak une honetan darabilen hizkuntza + Ikasi Chrome erabiltzen +-Ireki da partekatzeko aukeren zerrenda altuera osoan. ++Partekatze-aukeren zerrenda altuera osoan irekita dago. + Webgunearen ezarpenak + Zerbitzua ez dago erabilgarri. Saiatu berriro geroago. + Hizkuntzak +@@ -986,7 +986,7 @@ Fidagarritasun-tokenek sareko pribatutasuna hobetzen dute eta ezin dira erabili + Inkestak + Ezin da ireki fitxategia + Chrome-n irekitako webguneak ikus ditzakezu, eta haiek erabiltzeko tenporizadoreak ezarri.\n\nGoogle-k informazioa jasotzen du tenporizadoreak ezarri dizkiezun webguneei buruz eta haietan zenbat denbora eman duzun kalkulatzen du. Ongizate digitala programa hobetzeko erabiltzen da informazio hori. +-Partekatzeko aukeren zerrenda altuera erdian irekita dago. ++Partekatze-aukeren zerrenda altuera erdian irekita dago. + Deskargatu bideoa + Webgune hauek garrantzitsuak dira zuretzat: + Ezin izan da deskargatu , memoria beteta dagoelako. +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0010-M102-infra-Enforce-that-thin-testers-have-TEST-execu.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0010-M102-infra-Enforce-that-thin-testers-have-TEST-execu.patch new file mode 100644 index 000000000000..579052e37e32 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0010-M102-infra-Enforce-that-thin-testers-have-TEST-execu.patch @@ -0,0 +1,54 @@ +From f397daf7cd26e3ecc105dd9af34e65e38fce6457 Mon Sep 17 00:00:00 2001 +From: Garrett Beaty +Date: Mon, 13 Jun 2022 18:46:56 +0000 +Subject: [PATCH 10/59] [M102][infra] Enforce that thin testers have TEST + execution mode. + +Currently, the thin_tester function simply passes through the builder +spec via kwargs. If a builder spec is set with the COMPILE_AND_TEST +execution mode (the default), it gets passed through and the builder +config will be generated incorrectly. This change adds a check for the +execution mode to ensure that that it is correctly set. + +(cherry picked from commit 85e12dbbf8c46b63d3a558b3bc822ee63892904f) + +Change-Id: Id772dad71e3b79df104b6c7e44c063e2f0d14efc +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3703060 +Reviewed-by: Ben Pastene +Commit-Queue: Ben Pastene +Auto-Submit: Garrett Beaty +Cr-Original-Commit-Position: refs/heads/main@{#1013571} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3703484 +Commit-Queue: Rubber Stamper +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1169} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + infra/config/lib/ci.star | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/infra/config/lib/ci.star b/infra/config/lib/ci.star +index 557b741b2342..edc064ddc5be 100644 +--- a/infra/config/lib/ci.star ++++ b/infra/config/lib/ci.star +@@ -15,6 +15,7 @@ to set the default value. Can also be accessed through `ci.defaults`. + + load("./args.star", "args") + load("./branches.star", "branches") ++load("./builder_config.star", "builder_config") + load("./builders.star", "builders", "os", "os_category") + load("//project.star", "settings") + +@@ -261,6 +262,9 @@ def thin_tester( + Returns: + The `luci.builder` keyset. + """ ++ builder_spec = kwargs.get("builder_spec") ++ if builder_spec and builder_spec.execution_mode != builder_config.execution_mode.TEST: ++ fail("thin testers with builder specs must have TEST execution mode") + cores = defaults.get_value("thin_tester_cores", cores) + kwargs.setdefault("goma_backend", None) + kwargs.setdefault("reclient_instance", None) +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0011-Incrementing-VERSION-to-102.0.5005.129.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0011-Incrementing-VERSION-to-102.0.5005.129.patch new file mode 100644 index 000000000000..808898432cbd --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0011-Incrementing-VERSION-to-102.0.5005.129.patch @@ -0,0 +1,28 @@ +From 147b50af1e8a10424912455e819d8e3427003cc4 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Tue, 14 Jun 2022 01:00:40 +0000 +Subject: [PATCH 11/59] Incrementing VERSION to 102.0.5005.129 + +Change-Id: Iefa095c3eb454cb07caf23bc988ffa80eb320cf0 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3703321 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1170} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 88774f2ace3f..a538c4b46baf 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=128 ++PATCH=129 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0012-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0012-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..f232b33ff2a8 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0012-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,83 @@ +From ab2aa6886c4333de42bcceaf226bde6d195b0944 Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Tue, 14 Jun 2022 14:24:26 +0000 +Subject: [PATCH 12/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: I1811d9f375854b01cab83c7d08ad3f6f1f50aeb8 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3702974 +Auto-Submit: Ben Mason +Commit-Queue: Rubber Stamper +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1171} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/app/resources/generated_resources_nl.xtb | 4 ++-- + chrome/app/resources/google_chrome_strings_zh-CN.xtb | 2 +- + .../strings/translations/android_chrome_strings_nl.xtb | 2 +- + ios/chrome/app/strings/resources/ios_strings_nl.xtb | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/chrome/app/resources/generated_resources_nl.xtb b/chrome/app/resources/generated_resources_nl.xtb +index b3c649849179..51d184860f6b 100644 +--- a/chrome/app/resources/generated_resources_nl.xtb ++++ b/chrome/app/resources/generated_resources_nl.xtb +@@ -2885,7 +2885,7 @@ Foutcode: . + Ik heb de Servicevoorwaarden van Google en de Aanvullende servicevoorwaarden van Chrome en Chrome OS gelezen en ga ermee akkoord. + Recente foto's en meldingen + SSL-servercertificaat +-Verzenden naar je apparaten ++Naar je apparaten sturen + Sites kunnen vragen of ze automatisch meerdere bestanden mogen downloaden + Deze extensie schendt het beleid voor de Chrome Web Store. + Kan mobiel apparaat niet activeren +@@ -7375,7 +7375,7 @@ Bewaar je sleutelbestand op een veilige plaats. Je hebt het bestand nodig om nie + Toegang krijgen tot je microfoon en je spraak analyseren + Chrome-tip + OEM-map +-Verzenden naar je apparaten ++Naar je apparaten sturen + Aanbieden om pagina's te vertalen die in een voor jou onbekende taal zijn + Geen opslagruimte + Nu vernieuwen +diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/resources/google_chrome_strings_zh-CN.xtb +index 504051df27f8..c0b508274377 100644 +--- a/chrome/app/resources/google_chrome_strings_zh-CN.xtb ++++ b/chrome/app/resources/google_chrome_strings_zh-CN.xtb +@@ -9,7 +9,7 @@ + 这是您的专属Chrome + 谁在使用 Chrome？ + 无法更新 Chrome +-关于 Chrome 操作系统 ++关于 ChromeOS + 在 Chrome 中打开(&O) + 如果此页面中未显示某项设置，请在 ChromeOS Flex 设置中查找 + Chrome 建议您不要下载或打开此文件 +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb +index c252a3f5d69f..fd4290716186 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb +@@ -510,7 +510,7 @@ Tik op een woord en houd dit vast om te zoeken. Selecteer meer of minder woorden + Deze instelling staat uit omdat ouderlijk toezicht is aangezet + Servicevoorwaarden van Google + Basisgegevens en informatie over de websites die je bezoekt en de apps die je gebruikt +-Verzenden naar je apparaten ++Naar je apparaten sturen + Toegevoegd aan startscherm + {TAB_COUNT,plural, =1{1 tabblad}other{# tabbladen}} + Autoplay beheren +diff --git a/ios/chrome/app/strings/resources/ios_strings_nl.xtb b/ios/chrome/app/strings/resources/ios_strings_nl.xtb +index 3d33d1b441cc..be8132d576fe 100644 +--- a/ios/chrome/app/strings/resources/ios_strings_nl.xtb ++++ b/ios/chrome/app/strings/resources/ios_strings_nl.xtb +@@ -352,7 +352,7 @@ Volg de onderstaande stappen: + Voortgangsbalk voor laden van pagina, geladen. + Titel + Wachtwoorden worden in je Google-account opgeslagen, zodat je deze op elk apparaat kunt gebruiken. +-Verzenden naar je apparaten ++Naar je apparaten sturen + Activiteit beheren + Geen app op dit apparaat kan het bestand openen. + Zoeken op pagina +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0013-M102-infra-Fix-future-lint-warnings.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0013-M102-infra-Fix-future-lint-warnings.patch new file mode 100644 index 000000000000..dedafeeae2c0 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0013-M102-infra-Fix-future-lint-warnings.patch @@ -0,0 +1,108 @@ +From 1cb6163bd0fe1a956aad2beee9351dbd2b0f0d28 Mon Sep 17 00:00:00 2001 +From: Garrett Beaty +Date: Tue, 14 Jun 2022 18:57:44 +0000 +Subject: [PATCH 13/59] [M102][infra] Fix future lint warnings. + +The upcoming version of lucicfg has updated buildifier library +that has more lint checks (in particular stricter 'unused-variable' +and 'return-value' checks). To avoid breaking validation of +Chromium configs, this CL fixes them in advance. + +(cherry picked from commit bbf8109aaa463dcd34a1196bd170999fed50a1a3) + +Change-Id: I0eb2406b30c93cbf9efba188887884ace520aa0c +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3703880 +Auto-Submit: Garrett Beaty +Reviewed-by: Vadim Shtayura +Commit-Queue: Garrett Beaty +Cr-Original-Commit-Position: refs/heads/main@{#1014084} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3705899 +Commit-Queue: Rubber Stamper +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1172} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + infra/config/lib/args.star | 2 ++ + infra/config/lib/consoles.star | 11 ++++------- + infra/config/outages/outages.star | 2 +- + 3 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/infra/config/lib/args.star b/infra/config/lib/args.star +index 2f3bbb42a57f..a5947a9485c2 100644 +--- a/infra/config/lib/args.star ++++ b/infra/config/lib/args.star +@@ -96,6 +96,8 @@ def defaults(extends = None, **vars): + return listify(value) + return listify(default, value) + ++ fail("unknown merge value: {}".format(merge)) ++ + def get_value_from_kwargs(name, kwargs, merge = None): + return get_value(name, kwargs.get(name, DEFAULT), merge = merge) + +diff --git a/infra/config/lib/consoles.star b/infra/config/lib/consoles.star +index 3eed963fa62d..d07a73baf77d 100644 +--- a/infra/config/lib/consoles.star ++++ b/infra/config/lib/consoles.star +@@ -40,7 +40,7 @@ defaults = args.defaults( + _CONSOLE_VIEW_ORDERING = nodes.create_unscoped_node_type("console_view_ordering") + _OVERVIEW_CONSOLE_ORDERING = nodes.create_unscoped_node_type("overview_console_ordering") + +-def _console_view_ordering_impl(ctx, *, console_name, ordering): ++def _console_view_ordering_impl(_ctx, *, console_name, ordering): + key = _CONSOLE_VIEW_ORDERING.add(console_name, props = { + "ordering": ordering, + }) +@@ -49,7 +49,7 @@ def _console_view_ordering_impl(ctx, *, console_name, ordering): + + _console_view_ordering = lucicfg.rule(impl = _console_view_ordering_impl) + +-def _overview_console_view_ordering_impl(ctx, *, console_name, top_level_ordering): ++def _overview_console_view_ordering_impl(_ctx, *, console_name, top_level_ordering): + key = _OVERVIEW_CONSOLE_ORDERING.add(console_name, props = { + "top_level_ordering": top_level_ordering, + }) +@@ -266,7 +266,7 @@ def console_view(*, name, branch_selector = branches.MAIN, ordering = None, **kw + ordering = ordering or {}, + ) + +-def overview_console_view(*, name, top_level_ordering, branch_selector = branches.MAIN, **kwargs): ++def overview_console_view(*, name, top_level_ordering, **kwargs): + """Create an overview console view. + + An overview console view is a console view that contains a subset of +@@ -285,9 +285,6 @@ def overview_console_view(*, name, top_level_ordering, branch_selector = branche + name does not appear in the list will be sorted lexicographically + by the console name and appear after entries whose console does + appear in the list. +- branch_selector - A branch selector value controlling whether the +- console view definition is executed. See branches.star for +- more information. + kwargs - Additional keyword arguments to forward on to + `luci.console_view`. The header and repo arguments support + module-level defaults. +@@ -351,7 +348,7 @@ def _get_list_view_key_fn(console_name): + return None + return lambda b: b.name + +-def _sorted_list_view_impl(ctx, *, console_name): ++def _sorted_list_view_impl(_ctx, *, console_name): + key = _sorted_list_view_graph_key(console_name) + graph.add_node(key) + graph.add_edge(keys.project(), key) +diff --git a/infra/config/outages/outages.star b/infra/config/outages/outages.star +index 16736121c21e..6ada1be72649 100644 +--- a/infra/config/outages/outages.star ++++ b/infra/config/outages/outages.star +@@ -33,7 +33,7 @@ def _disable_cq_experiments(ctx): + for b in c.verifiers.tryjob.builders: + if not b.experiment_percentage: + continue +- project, bucket, builder = b.name.split("/", 2) ++ project, bucket, _ = b.name.split("/", 2) + if project == "chromium" and bucket == "try": + b.includable_only = True + b.experiment_percentage = 0 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0014-M102-Ensure-raw_ptr-T-and-T-are-treated-identically-.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0014-M102-Ensure-raw_ptr-T-and-T-are-treated-identically-.patch new file mode 100644 index 000000000000..8e7aa1db365e --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0014-M102-Ensure-raw_ptr-T-and-T-are-treated-identically-.patch @@ -0,0 +1,357 @@ +From f427936d32dbe1e9c27c0bcf54eff6818bddb906 Mon Sep 17 00:00:00 2001 +From: Daniel Cheng +Date: Tue, 14 Jun 2022 19:11:17 +0000 +Subject: [PATCH 14/59] [M102] Ensure raw_ptr and T* are treated identically + in //base callback. + +There are safety checks associated with raw pointers (e.g. ensuring +receiver pointers are not raw pointers). Make sure these checks are +applied whether the input type is T* or raw_ptr. + +- Implement base::IsPointer and base::RemovePointer, which are + similar to std::is_pointer and std::remove_pointer, except they + also consider raw_ptr a raw pointer type. +- Fix failures from the strengthened asserts: WebAppInstallFinalizer + does not need a callback at all, while the privacy sandbox dialog + tests can safely use base::Unretained(). +- Add test cases to cover this in the //base callback nocompile test + suite. +- Fix the existing nocompile tests, which did not escape `||` and + inadvertently matched any error text. + +(cherry picked from commit 00c072a2c7f24921af3bbf8441abb34ecb0551a6) + +Bug: 1335458 +Change-Id: I470e3d5bc35ed52bf125136db738a868ef90b7e7 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3700700 +Reviewed-by: Lei Zhang +Commit-Queue: Daniel Cheng +Cr-Original-Commit-Position: refs/heads/main@{#1013266} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3703779 +Cr-Commit-Position: refs/branch-heads/5005@{#1173} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + base/bind_internal.h | 17 +++++----- + base/bind_unittest.cc | 28 +++++++++++++++++ + base/bind_unittest.nc | 31 +++++++++++++++++-- + base/memory/raw_ptr.h | 31 +++++++++++++++++++ + .../raw_scoped_refptr_mismatch_checker.h | 5 +-- + ...privacy_sandbox_dialog_handler_unittest.cc | 26 +++++++++------- + .../web_app_install_finalizer.cc | 15 ++++----- + 7 files changed, 121 insertions(+), 32 deletions(-) + +diff --git a/base/bind_internal.h b/base/bind_internal.h +index 60607efadb30..1b06e54b65a4 100644 +--- a/base/bind_internal.h ++++ b/base/bind_internal.h +@@ -859,8 +859,8 @@ bool QueryCancellationTraits(const BindStateBase* base, + template + std::enable_if_t< + !(MakeFunctorTraits::is_method && +- std::is_pointer_v> && +- IsRefCountedType>>::value)> ++ IsPointerV> && ++ IsRefCountedType>>::value)> + BanUnconstructedRefCountedReceiver(const Receiver& receiver, Unused&&...) {} + + template +@@ -870,8 +870,8 @@ void BanUnconstructedRefCountedReceiver() {} + template + std::enable_if_t< + MakeFunctorTraits::is_method && +- std::is_pointer_v> && +- IsRefCountedType>>::value> ++ IsPointerV> && ++ IsRefCountedType>>::value> + BanUnconstructedRefCountedReceiver(const Receiver& receiver, Unused&&...) { + DCHECK(receiver); + +@@ -1006,19 +1006,20 @@ struct MakeBindStateTypeImpl { + static_assert(!std::is_array_v>, + "First bound argument to a method cannot be an array."); + static_assert( +- !std::is_pointer_v || +- IsRefCountedType>::value, ++ !IsPointerV || ++ IsRefCountedType>::value, + "Receivers may not be raw pointers. If using a raw pointer here is safe" + " and has no lifetime concerns, use base::Unretained() and document why" + " it's safe."); ++ + static_assert(!HasRefCountedTypeAsRawPtr...>::value, + "A parameter is a refcounted type and needs scoped_refptr."); + + public: + using Type = BindState< + std::decay_t, +- std::conditional_t, +- scoped_refptr>, ++ std::conditional_t, ++ scoped_refptr>, + DecayedReceiver>, + MakeStorageType...>; + }; +diff --git a/base/bind_unittest.cc b/base/bind_unittest.cc +index a5f681fe53b9..6844b6796d9f 100644 +--- a/base/bind_unittest.cc ++++ b/base/bind_unittest.cc +@@ -1169,6 +1169,28 @@ TYPED_TEST(BindVariantsTest, UniquePtrReceiver) { + TypeParam::Bind(&NoRef::VoidMethod0, std::move(no_ref)).Run(); + } + ++TYPED_TEST(BindVariantsTest, ImplicitRefPtrReceiver) { ++ StrictMock has_ref; ++ EXPECT_CALL(has_ref, AddRef()).Times(1); ++ EXPECT_CALL(has_ref, Release()).Times(1); ++ EXPECT_CALL(has_ref, HasAtLeastOneRef()).WillRepeatedly(Return(true)); ++ ++ HasRef* ptr = &has_ref; ++ auto ptr_cb = TypeParam::Bind(&HasRef::HasAtLeastOneRef, ptr); ++ EXPECT_EQ(1, std::move(ptr_cb).Run()); ++} ++ ++TYPED_TEST(BindVariantsTest, RawPtrReceiver) { ++ StrictMock has_ref; ++ EXPECT_CALL(has_ref, AddRef()).Times(1); ++ EXPECT_CALL(has_ref, Release()).Times(1); ++ EXPECT_CALL(has_ref, HasAtLeastOneRef()).WillRepeatedly(Return(true)); ++ ++ raw_ptr rawptr(&has_ref); ++ auto rawptr_cb = TypeParam::Bind(&HasRef::HasAtLeastOneRef, rawptr); ++ EXPECT_EQ(1, std::move(rawptr_cb).Run()); ++} ++ + // Tests for Passed() wrapper support: + // - Passed() can be constructed from a pointer to scoper. + // - Passed() can be constructed from a scoper rvalue. +@@ -1751,6 +1773,12 @@ TEST(BindDeathTest, BanFirstOwnerOfRefCountedType) { + EXPECT_CALL(has_ref, HasAtLeastOneRef()).WillOnce(Return(false)); + base::BindOnce(&HasRef::VoidMethod0, &has_ref); + }); ++ ++ EXPECT_DCHECK_DEATH({ ++ raw_ptr rawptr(&has_ref); ++ EXPECT_CALL(has_ref, HasAtLeastOneRef()).WillOnce(Return(false)); ++ base::BindOnce(&HasRef::VoidMethod0, rawptr); ++ }); + } + + } // namespace +diff --git a/base/bind_unittest.nc b/base/bind_unittest.nc +index 20b0e0ba2cee..29807298ca3c 100644 +--- a/base/bind_unittest.nc ++++ b/base/bind_unittest.nc +@@ -93,7 +93,7 @@ void WontCompile() { + method_to_const_cb.Run(); + } + +-#elif defined(NCTEST_METHOD_BIND_NEEDS_REFCOUNTED_OBJECT) // [r"fatal error: static_assert failed due to requirement '!std::is_pointer_v || IsRefCountedType::value' \"Receivers may not be raw pointers. If using a raw pointer here is safe and has no lifetime concerns, use base::Unretained() and document why it's safe.\""] ++#elif defined(NCTEST_METHOD_BIND_NEEDS_REFCOUNTED_OBJECT) // [r"fatal error: static_assert failed due to requirement '!IsPointerV \|\| IsRefCountedType::value' \"Receivers may not be raw pointers. If using a raw pointer here is safe and has no lifetime concerns, use base::Unretained\(\) and document why it's safe.\""] + + + // Method bound to non-refcounted object. +@@ -106,7 +106,7 @@ void WontCompile() { + no_ref_cb.Run(); + } + +-#elif defined(NCTEST_CONST_METHOD_NEEDS_REFCOUNTED_OBJECT) // [r"fatal error: static_assert failed due to requirement '!std::is_pointer_v || IsRefCountedType::value' \"Receivers may not be raw pointers. If using a raw pointer here is safe and has no lifetime concerns, use base::Unretained() and document why it's safe.\""] ++#elif defined(NCTEST_CONST_METHOD_BIND_NEEDS_REFCOUNTED_OBJECT) // [r"fatal error: static_assert failed due to requirement '!IsPointerV \|\| IsRefCountedType::value' \"Receivers may not be raw pointers. If using a raw pointer here is safe and has no lifetime concerns, use base::Unretained\(\) and document why it's safe.\""] + + // Const Method bound to non-refcounted object. + // +@@ -118,6 +118,33 @@ void WontCompile() { + no_ref_const_cb.Run(); + } + ++#elif defined(NCTEST_METHOD_BIND_RAW_PTR_RECEIVER_NEEDS_REFCOUNTED_OBJECT) // [r"fatal error: static_assert failed due to requirement '!IsPointerV]+>> \|\| IsRefCountedType::value' \"Receivers may not be raw pointers. If using a raw pointer here is safe and has no lifetime concerns, use base::Unretained\(\) and document why it's safe.\""] ++ ++ ++// Method bound to non-refcounted object. ++// ++// We require refcounts unless you have Unretained(). ++void WontCompile() { ++ NoRef no_ref; ++ raw_ptr rawptr(&no_ref); ++ RepeatingCallback no_ref_cb = ++ BindRepeating(&NoRef::VoidMethod0, rawptr); ++ no_ref_cb.Run(); ++} ++ ++#elif defined(NCTEST_CONST_METHOD_BIND_RAW_PTR_RECEIVER_NEEDS_REFCOUNTED_OBJECT) // [r"fatal error: static_assert failed due to requirement '!IsPointerV]+>> \|\| IsRefCountedType::value' \"Receivers may not be raw pointers. If using a raw pointer here is safe and has no lifetime concerns, use base::Unretained\(\) and document why it's safe.\""] ++ ++// Const Method bound to non-refcounted object. ++// ++// We require refcounts unless you have Unretained(). ++void WontCompile() { ++ NoRef no_ref; ++ raw_ptr rawptr(&no_ref); ++ RepeatingCallback no_ref_const_cb = ++ BindRepeating(&NoRef::VoidConstMethod0, rawptr); ++ no_ref_const_cb.Run(); ++} ++ + #elif defined(NCTEST_CONST_POINTER) // [r"static_assert failed.+?BindArgument<0>::ForwardedAs<.+?>::ToParamWithType<.+?>::kCanBeForwardedToBoundFunctor.+?Type mismatch between bound argument and bound functor's parameter\."] + // Const argument used with non-const pointer parameter of same type. + // +diff --git a/base/memory/raw_ptr.h b/base/memory/raw_ptr.h +index 4d978e979863..639713cd6199 100644 +--- a/base/memory/raw_ptr.h ++++ b/base/memory/raw_ptr.h +@@ -1051,6 +1051,37 @@ ALWAYS_INLINE bool operator>=(const raw_ptr& lhs, + return lhs.GetForComparison() >= rhs.GetForComparison(); + } + ++// Template helpers for working with T* or raw_ptr. ++template ++struct IsPointer : std::false_type {}; ++ ++template ++struct IsPointer : std::true_type {}; ++ ++template ++struct IsPointer> : std::true_type {}; ++ ++template ++inline constexpr bool IsPointerV = IsPointer::value; ++ ++template ++struct RemovePointer { ++ using type = T; ++}; ++ ++template ++struct RemovePointer { ++ using type = T; ++}; ++ ++template ++struct RemovePointer> { ++ using type = T; ++}; ++ ++template ++using RemovePointerT = typename RemovePointer::type; ++ + } // namespace base + + using base::raw_ptr; +diff --git a/base/memory/raw_scoped_refptr_mismatch_checker.h b/base/memory/raw_scoped_refptr_mismatch_checker.h +index 9e50458ec98b..7afae066fa3e 100644 +--- a/base/memory/raw_scoped_refptr_mismatch_checker.h ++++ b/base/memory/raw_scoped_refptr_mismatch_checker.h +@@ -7,6 +7,7 @@ + + #include + ++#include "base/memory/raw_ptr.h" + #include "base/template_util.h" + + // It is dangerous to post a task with a T* argument where T is a subtype of +@@ -35,8 +36,8 @@ struct IsRefCountedType + struct NeedsScopedRefptrButGetsRawPtr +- : conjunction, +- IsRefCountedType>> { ++ : conjunction, ++ IsRefCountedType>> { + static_assert(!std::is_reference::value, + "NeedsScopedRefptrButGetsRawPtr requires non-reference type."); + }; +diff --git a/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_dialog_handler_unittest.cc b/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_dialog_handler_unittest.cc +index d812d82a08c3..ee22b02bdbed 100644 +--- a/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_dialog_handler_unittest.cc ++++ b/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_dialog_handler_unittest.cc +@@ -93,9 +93,7 @@ class PrivacySandboxDialogHandlerTest : public testing::Test { + content::TestWebUI* web_ui() { return web_ui_.get(); } + PrivacySandboxDialogHandler* handler() { return handler_.get(); } + TestingProfile* profile() { return &profile_; } +- raw_ptr dialog_mock() { +- return dialog_mock_.get(); +- } ++ MockPrivacySandboxDialogView* dialog_mock() { return dialog_mock_.get(); } + MockPrivacySandboxService* mock_privacy_sandbox_service() { + return mock_privacy_sandbox_service_; + } +@@ -120,15 +118,18 @@ class PrivacySandboxConsentDialogHandlerTest + : public PrivacySandboxDialogHandlerTest { + protected: + std::unique_ptr CreateHandler() override { ++ // base::Unretained is safe because the created handler does not outlive the ++ // mock. + return std::make_unique( +- base::BindOnce(&MockPrivacySandboxDialogView::Close, dialog_mock()), ++ base::BindOnce(&MockPrivacySandboxDialogView::Close, ++ base::Unretained(dialog_mock())), + base::BindOnce(&MockPrivacySandboxDialogView::ResizeNativeView, +- dialog_mock()), ++ base::Unretained(dialog_mock())), + base::BindOnce(&MockPrivacySandboxDialogView::ShowNativeView, +- dialog_mock()), ++ base::Unretained(dialog_mock())), + base::BindOnce( + &MockPrivacySandboxDialogView::OpenPrivacySandboxSettings, +- dialog_mock()), ++ base::Unretained(dialog_mock())), + PrivacySandboxService::DialogType::kConsent); + } + }; +@@ -247,15 +248,18 @@ class PrivacySandboxNoticeDialogHandlerTest + : public PrivacySandboxDialogHandlerTest { + protected: + std::unique_ptr CreateHandler() override { ++ // base::Unretained is safe because the created handler does not outlive the ++ // mock. + return std::make_unique( +- base::BindOnce(&MockPrivacySandboxDialogView::Close, dialog_mock()), ++ base::BindOnce(&MockPrivacySandboxDialogView::Close, ++ base::Unretained(dialog_mock())), + base::BindOnce(&MockPrivacySandboxDialogView::ResizeNativeView, +- dialog_mock()), ++ base::Unretained(dialog_mock())), + base::BindOnce(&MockPrivacySandboxDialogView::ShowNativeView, +- dialog_mock()), ++ base::Unretained(dialog_mock())), + base::BindOnce( + &MockPrivacySandboxDialogView::OpenPrivacySandboxSettings, +- dialog_mock()), ++ base::Unretained(dialog_mock())), + PrivacySandboxService::DialogType::kNotice); + } + }; +diff --git a/chrome/browser/web_applications/web_app_install_finalizer.cc b/chrome/browser/web_applications/web_app_install_finalizer.cc +index 2b85d7645980..cf57d375d0d3 100644 +--- a/chrome/browser/web_applications/web_app_install_finalizer.cc ++++ b/chrome/browser/web_applications/web_app_install_finalizer.cc +@@ -505,10 +505,6 @@ void WebAppInstallFinalizer::SetWebAppManifestFieldsAndWriteData( + web_app_info.shortcuts_menu_icon_bitmaps; + IconsMap other_icon_bitmaps = web_app_info.other_icon_bitmaps; + +- auto write_icons_callback = base::BindOnce( +- &WebAppIconManager::WriteData, icon_manager_, app_id, +- std::move(icon_bitmaps), std::move(shortcuts_menu_icon_bitmaps), +- std::move(other_icon_bitmaps)); + auto write_translations_callback = base::BindOnce( + &WebAppInstallFinalizer::WriteTranslations, + weak_ptr_factory_.GetWeakPtr(), app_id, std::move(web_app_info)); +@@ -516,11 +512,12 @@ void WebAppInstallFinalizer::SetWebAppManifestFieldsAndWriteData( + base::BindOnce(&WebAppInstallFinalizer::CommitToSyncBridge, + weak_ptr_factory_.GetWeakPtr(), std::move(web_app)); + +- std::move(write_icons_callback) +- .Run(base::BindOnce( +- std::move(write_translations_callback), +- base::BindOnce(std::move(commit_to_sync_bridge_callback), +- std::move(commit_callback)))); ++ icon_manager_->WriteData( ++ app_id, std::move(icon_bitmaps), std::move(shortcuts_menu_icon_bitmaps), ++ std::move(other_icon_bitmaps), ++ base::BindOnce(std::move(write_translations_callback), ++ base::BindOnce(std::move(commit_to_sync_bridge_callback), ++ std::move(commit_callback)))); + } + + void WebAppInstallFinalizer::WriteTranslations( +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0015-Incrementing-VERSION-to-102.0.5005.130.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0015-Incrementing-VERSION-to-102.0.5005.130.patch new file mode 100644 index 000000000000..be1c25bad6ea --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0015-Incrementing-VERSION-to-102.0.5005.130.patch @@ -0,0 +1,28 @@ +From 9821e4a21a7d69f0c0cb97718e879a2f3c89f46a Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Wed, 15 Jun 2022 01:00:25 +0000 +Subject: [PATCH 15/59] Incrementing VERSION to 102.0.5005.130 + +Change-Id: I68fc3b8c4b0963091997a833f8d2a0b82110db5d +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3702546 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1174} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index a538c4b46baf..2a835d053cb4 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=129 ++PATCH=130 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0016-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0016-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..7b7ce87219c2 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0016-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,889 @@ +From 1a4d97d59d24ed5583007288ea30138e7be680fa Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Wed, 15 Jun 2022 14:56:42 +0000 +Subject: [PATCH 16/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: Ic65df5e8ca6d69e7f009fee9037f2579681704ec +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3707693 +Auto-Submit: Ben Mason +Commit-Queue: Rubber Stamper +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1175} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + .../app/resources/generated_resources_bs.xtb | 2 +- + .../resources/generated_resources_en-GB.xtb | 132 +++++++++--------- + .../resources/generated_resources_es-419.xtb | 4 +- + .../app/resources/generated_resources_gl.xtb | 2 +- + .../android_chrome_strings_eu.xtb | 2 +- + .../strings/components_strings_en-GB.xtb | 32 ++--- + .../resources/ios_chromium_strings_en-GB.xtb | 2 +- + .../ios_google_chrome_strings_en-GB.xtb | 2 +- + .../strings/resources/ios_strings_en-GB.xtb | 10 +- + 9 files changed, 94 insertions(+), 94 deletions(-) + +diff --git a/chrome/app/resources/generated_resources_bs.xtb b/chrome/app/resources/generated_resources_bs.xtb +index c07a6e47b0b6..7234e04492b8 100644 +--- a/chrome/app/resources/generated_resources_bs.xtb ++++ b/chrome/app/resources/generated_resources_bs.xtb +@@ -7607,7 +7607,7 @@ Fajl ključa: + Traka preuzetih fajlova + Dodatak je onemogućen. + Ovaj korisnički račun ne ispunjava uslove za ovu uslugu. +-Za prostorije sa slabim svjetlom. Također optimizirano za vijek trajanja baterije. ++Za prostorije sa slabim svjetlom. Također optimizirano prema vijeku trajanja baterije. + Nije važeće + Za pokretanje dodatka je potrebno vaše odobrenje + Ova kartica reproducira videozapis u načinu rada slike u slici. +diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb +index ebdba205fed4..750571d685d8 100644 +--- a/chrome/app/resources/generated_resources_en-GB.xtb ++++ b/chrome/app/resources/generated_resources_en-GB.xtb +@@ -51,7 +51,7 @@ + &Language settings + Poor + Complete setup on your phone +-Open original image in new tab ++Open Original &Image in New Tab + {NUM_WEEKS,plural, =1{Update within 1 week}other{Update within {NUM_WEEKS} weeks}} + Warning + PUK +@@ -85,7 +85,7 @@ + Microsoft Internet Explorer + Couldn’t download spell check dictionary for . Try again. + Always block camera access +-{NUM_TABS,plural, =1{ – 1 tab}other{ – # tabs}} ++{NUM_TABS,plural, =1{ – 1 Tab}other{ – # Tabs}} + Your administrator has blocked some functionality for this device + wants to restore your Chrome settings to their original defaults. This will reset your homepage, new tab page and search engine, disable your extensions and unpin all tabs. It will also clear other temporary and cached data, such as cookies, content and site data. + Removing this password will not delete your account on . Change your password or delete your account on to keep it safe from others. +@@ -95,7 +95,7 @@ + Don't allow sites to connect to MIDI devices + Chrome is removing harmful software from your computer… + Enter Reader Mode +-No background apps running ++No Background Apps Running + Before pairing, make sure that this code is the same on both devices + Press ESCAPE to skip (Non-official builds only). + Visible Networks: +@@ -176,7 +176,7 @@ + &View frame source + Entered on deceptive site + Error +-Close tabs to the right ++Close Tabs to the Right + Review name update + belongs to desk + Opening in ... +@@ -388,7 +388,7 @@ + Allowed to use your microphone + will restart when updates are complete. + Allowed to use fonts installed on your device +-Open as a standard tab ++Open as a Standard Tab + is not authorised to print to . Please contact your administrator. + Sun and clouds + Updater started +@@ -481,7 +481,7 @@ Permissions that you've already given to apps may apply to this account. You can + Pizza slice + Left + Can't use this profile +-{NUM_TABS,plural, =1{Add tab to new group}other{Add tabs to new group}} ++{NUM_TABS,plural, =1{Add Tab to New Group}other{Add Tabs to New Group}} + Use this device + To turn caret browsing on or off, use the shortcut Ctrl+Search+7 + Show more +@@ -534,7 +534,7 @@ Permissions that you've already given to apps may apply to this account. You can + Viewed in the past month + Text-to-speech engines + Keyboard +-No, thanks ++No, Thanks + Use only Wi-Fi to determine location + Restart Linux + Enable touchpad scroll acceleration +@@ -602,7 +602,7 @@ Permissions that you've already given to apps may apply to this account. You can + &JavaScript console + Touch the power button with your finger + Normal +-Open link with... ++Open Link With... + Right-click card + Show spelling and grammar + Give Parallels Desktop permission to access USB devices. Parallels Desktop won't remember a USB device after it's removed. +@@ -720,7 +720,7 @@ Permissions that you've already given to apps may apply to this account. You can + An error occurred during installation of your Linux application. + Do not allow sites to see text and images copied to the clipboard + New Incognito Window +-Turn on caret browsing? ++Turn on Caret Browsing? + Accent colour + Recent photos and messaging apps + Enable glide typing +@@ -889,7 +889,7 @@ Permissions that you've already given to apps may apply to this account. You can + Checking + Art gallery + This plug-in is not supported on this device +-{COUNT,plural, =0{&Open all}=1{&Open bookmark}other{&Open all ({COUNT})}} ++{COUNT,plural, =0{&Open All}=1{&Open Bookmark}other{&Open All ({COUNT})}} + Print Using System Dialogue... + Penguin + Zoom &Out +@@ -1251,7 +1251,7 @@ You can manage this account’s settings by installing the Family Link app on yo + Sign in anyway + Check your Internet connection + Add requisition ID to this device +-&Manage search engines and Site Search ++&Manage Search Engines and Site Search + Quick launch bar + Unable to add printer. Please check your printer's configuration and try again. + QR code +@@ -1462,7 +1462,7 @@ You can manage this account’s settings by installing the Family Link app on yo + can't be downloaded securely + Your child can use a number (PIN) instead of a password to unlock this device. To set a PIN later, go to Settings. + Bookmarks added +-Focus this tab ++Focus This Tab + Couldn’t connect with the server. Check your network connection and try again. If you're still having trouble, try restarting your Chromebook. + 1 page to + For example, if you visit a site to buy shoes for a marathon, the site might define your interest as running marathons. Later, if you visit a different site to register for a race, that site can show you an ad for running shoes based on your interests. +@@ -1759,7 +1759,7 @@ You can manage this account’s settings by installing the Family Link app on yo + Twitter + Signing + Chrome cannot access the image. +-Search tabs… ++Search Tabs… + Incorrect PIN. You have one attempt remaining. + Update... + Sign-in image +@@ -2005,7 +2005,7 @@ and Ctrl+Alt+Brightness down to zoom out. + Set your profile picture + Screenshot of programs that are currently on the screen + Checking power sources… +-Open as pinned tab ++Open as Pinned Tab + This extension is outdated and disabled by enterprise policy. It might become enabled automatically when a newer version is available. + Site + Updating... +@@ -2023,7 +2023,7 @@ and Ctrl+Alt+Brightness down to zoom out. + Scan in progress. Open now? + Add mobile… + Access your Universal 2nd Factor devices +-When you click the extension ++When You Click the Extension + will restart and reset momentarily + Task Manager + A problem occurred when decoding server response. +@@ -2284,7 +2284,7 @@ and Ctrl+Alt+Brightness down to zoom out. + Default yellow avatar + Listening... + The given request is not supported to: "". +-New group ++New Group + Cancel sync + Play from the beginning + Open link as +@@ -2313,7 +2313,7 @@ and Ctrl+Alt+Brightness down to zoom out. + Some operators might block this feature. + You may also skip signing in and browse as Guest. + New tab to the left +-Page language: ++Page Language: + Text font + Safe Browsing (protects you and your device from dangerous sites) + Spell check +@@ -2811,7 +2811,7 @@ and Ctrl+Alt+Brightness down to zoom out. + Write to files and folders that you open in the application + Change channel + Up-to-date +-Change languages… ++Change Languages… + Warns you if passwords are exposed in a data breach + Keyboard apps + Sign in again with a school account +@@ -2836,7 +2836,7 @@ and Ctrl+Alt+Brightness down to zoom out. + Don't allow closed sites to finish sending or receiving data + The browser was shut down before the download completed. + To protect your privacy, we auto-delete sites from the list that are older than four weeks. A site that you visit again might appear on the list again. Or you can remove a site if you don’t want that site to ever define interests for you. +-Paste and go to ++Paste and Go to + Found printers from the print server + Account update required + Save page &as... +@@ -2994,14 +2994,14 @@ and Ctrl+Alt+Brightness down to zoom out. + Offer to translate websites in other languages + Output tray is full + Pack extension +-Import bookmarks and settings... ++Import Bookmarks and Settings... + Please verify that this is a valid provider or try again later + Select Time Zone + Lift, then touch again + Name + Username '' is not available + Show on startup +-&Restore group ++&Restore Group + Resolution + Description + Drag or use arrow keys to move a display +@@ -3038,7 +3038,7 @@ and Ctrl+Alt+Brightness down to zoom out. + Include recent Assistant history via Sherlog. This may include your identity, location and debug info. Learn more + Add folder + Move to Google Account? +-&Manage search engines… ++&Manage Search Engines… + Kerberos username + Sites can ask to know when you're actively using your device + {COUNT,plural, =1{an image}other{# images}} +@@ -3052,7 +3052,7 @@ and Ctrl+Alt+Brightness down to zoom out. + Repair app + is out of date + Enable extension +-Show all controls ++Show All &Controls + Cu&t + Activation code + New Tab page +@@ -3392,7 +3392,7 @@ and Ctrl+Alt+Brightness down to zoom out. + – Tab content shared + Note + No network found. Please insert your SIM and reboot your device before trying again. +-Translation language: ++Translation Language: + Battery Discharge Rate in Watts (Negative value means battery is charging) + Sa&ve Video As... + File System +@@ -3460,7 +3460,7 @@ and Ctrl+Alt+Brightness down to zoom out. + Developer Website + Verification was not successful + No internet connection +-Close other tabs ++Close Other Tabs + File incomplete + Uninstalling … + Ice water +@@ -3686,7 +3686,7 @@ and Ctrl+Alt+Brightness down to zoom out. + Browse fast with Google Chrome + Right button + Google Assistant voice input +-No tabs from other devices ++No Tabs From Other Devices + Set automatically + Your security key has no fingerprints stored + Some supported links will still open in . +@@ -3738,7 +3738,7 @@ and Ctrl+Alt+Brightness down to zoom out. + You have certificates on file that identify these servers + Storage management + Wi-Fi available via multiple devices +-Mark as unread ++Mark as Unread + Always allow to access your camera and microphone + Do not allow sites to create a 3D map of your surroundings or track camera position + &Find... +@@ -3815,7 +3815,7 @@ and Ctrl+Alt+Brightness down to zoom out. + What data is used: + Offline data in installed apps will also be cleared + Open stylus tools when the stylus is removed +-You previously chose to allow all extensions on ++You Previously Chose To Allow All Extensions On + Create shortcuts for searching sites and manage your search engine + Phone Hub, learn more + GPU memory +@@ -4013,7 +4013,7 @@ and Ctrl+Alt+Brightness down to zoom out. + Search history + Don't remind me next time + Open +-Follow site ++Follow Site + Has access to this site + Sites usually use your microphone for communication features like video chatting + All sites +@@ -4064,7 +4064,7 @@ and Ctrl+Alt+Brightness down to zoom out. + Nothing to see here, move along. + Print destinations + Developers +-Turn on ++Turn On + Date + embedded on + Notification syncing is not supported for phones in a work profile +@@ -4171,7 +4171,7 @@ and Ctrl+Alt+Brightness down to zoom out. + Spellcheck isn’t supported for the languages that you have selected + Edit site + Unnamed group – +-Search image with Google Lens ++Search Image with Google Lens + See all card options in Customise Chrome + Connecting to the container + When you click the extension +@@ -4511,7 +4511,7 @@ and Ctrl+Alt+Brightness down to zoom out. + You + Hidden bookmarks + Out of bounds page reference, limit is +-Unfollow site ++Unfollow Site + Download update using mobile data + Always block cookies on + Press a switch or keyboard key to assign it to ''. +@@ -4534,7 +4534,7 @@ You can assign multiple switches to this action. + Continue downloading + Sign in easily across devices + Always Translate +-Rotate &clockwise ++Rotate &Clockwise + By continuing, you agree that this device may also automatically download and install updates and apps from Google, your operator and your device's manufacturer, possibly using mobile data. Some of these apps may offer in-app purchases. + (Update is available) + Search your screen with +@@ -4592,7 +4592,7 @@ You can assign multiple switches to this action. + Add app + Restore All Tabs + Confirm password +-Simulate browser restart ++Simulate Browser Restart + Rename profile to + Clear data + '' copied +@@ -4999,7 +4999,7 @@ You can assign multiple switches to this action. + Preferred Wi-Fi networks + Restart + Your saved preferences and activity will be ready on any Chrome OS Flex device when you sign in with your Google Account. You can choose what to sync in Settings. +-Don't allow ++Don't Allow + Google Profile photo + Mirroring quality details + Your fingerprint data is stored securely and never leaves your . Learn more +@@ -5009,7 +5009,7 @@ You can assign multiple switches to this action. + Couldn't set up because of a configuration problem. Please contact your administrator. Error code: . + Nearly up to date! Restart your device to finish updating. + Data associated with this app will be removed from this device. +-Start app when you sign in ++Start App When You Sign In + Mouse scroll speed + Delete this profile and browsing data? + Sa&ve Image As... +@@ -5304,7 +5304,7 @@ You can assign multiple switches to this action. + Sign out then sign in again... + Change PIN + Discard file +-Manage extension ++Manage Extension + Remove this account? + You can use your PIN to sign in to or unlock your device. + Cop&y Image +@@ -5316,7 +5316,7 @@ You can assign multiple switches to this action. + Component updating + Your device includes a Chrome Enterprise Upgrade, but your username is not associated with an enterprise account. Please create an enterprise account by visiting g.co/ChromeEnterpriseAccount on a secondary device. + In the address bar, use this keyboard shortcut with shortcuts for search engines and site search +-{COUNT,plural, =0{Open all in &new tab group}=1{Open in &new tab group}other{Open all ({COUNT}) in &new tab group}} ++{COUNT,plural, =0{Open All in &New Tab Group}=1{Open in &New Tab Group}other{Open All ({COUNT}) in &New Tab Group}} + Show advanced network properties + Turn off display + Email Link +@@ -5506,7 +5506,7 @@ You can assign multiple switches to this action. + Split vertical + Search languages + Can't access your mobile account +-Move tab to new window ++Move Tab to New Window + Suggest strong password + Allowed to show insecure content + Send system information and metrics +@@ -5799,7 +5799,7 @@ You can assign multiple switches to this action. + Available: + Rate + Take photo +-Restore all tabs ++R&estore All Tabs + Downloading the latest update + Open Google Play + Close tabs to the right +@@ -5938,7 +5938,7 @@ You can assign multiple switches to this action. + Keep changes + Entire screen + Ask when a site wants to use system exclusive messages to access MIDI devices (recommended) +-Page language to translate ++Page Language to Translate + Built-in virus protection + Touchpad tap-to-click + Copy &Email Address +@@ -6164,7 +6164,7 @@ You can assign multiple switches to this action. + Introducing a new way to navigate with gestures + Mobile data service management + Security and privacy +-{COUNT,plural, =0{Open all in &incognito window}=1{Open in &incognito window}other{Open all ({COUNT}) in &incognito window}} ++{COUNT,plural, =0{Open All in &Incognito Window}=1{Open in &Incognito Window}other{Open All ({COUNT}) in &Incognito Window}} + Crostini is not installed. Please install Crostini to view credits. + Passwords + Sends URLs to Safe Browsing to check them +@@ -6208,7 +6208,7 @@ You can assign multiple switches to this action. + Ambient colours + Never show this again. + may require a newer or different kind of security key +-This can read and change site data ++This Can Read and Change Site Data + Shortcut name + PKCS #1 MD5 With RSA Encryption + Manage HTTPS/SSL certificates and settings +@@ -6246,7 +6246,7 @@ You can assign multiple switches to this action. + No reachable contacts + Please try again later + Sign in Again... +-Show managed bookmarks ++Show Managed Bookmarks + Read the list of your signed-in devices + This page allows you to manage your signed-in Google Accounts. Learn more + Chrome Browser and Android traffic will be blocked unless a VPN is connected +@@ -6287,7 +6287,7 @@ You can assign multiple switches to this action. + Minimum font size + Turn on notification when devices are nearby + Profile picture +-Add profile… ++Add Profile… + Don't enrol + {NUM_TABS,plural, =1{Add tab to new group}other{Add tabs to new group}} + Open settings +@@ -6337,11 +6337,11 @@ You can assign multiple switches to this action. + Network type missing + Apps listed below can handle protocol links as well. Other apps will ask for permission. + Screen lock and sign-in +-&Restore window ++&Restore Window + Customise your text size + View, dismiss and reply to your phone’s notifications + Renaming failed +-Search images with ++Search Images with + Cancelling Linux restore + Fetching activities... + Your security key does not have enough space for any more accounts. +@@ -6576,7 +6576,7 @@ You can assign multiple switches to this action. + Allowed to see your clipboard + Error: Unable to decode extension + Slower +-No, thanks ++No, Thanks + Restore all + {NUM_DAYS,plural, =1{Immediate return required}other{Return within {NUM_DAYS} days}} + Netscape Lost Password URL +@@ -6632,7 +6632,7 @@ You can assign multiple switches to this action. + {NUM_DOWNLOADS,plural, =1{1 more}other{{NUM_DOWNLOADS} more}} + Placeholder + Update it in your Google Account, +-Don’t open ++Don’t Open + Check your Internet connection. If the problem continues, try signing out and signing in again. + {0,plural, =1{Close guest}other{Close guest}} + Discharge Rate in Watts +@@ -6742,8 +6742,8 @@ You can assign multiple switches to this action. + This is the only time that you’ll wait for an update. On Chromebooks, software updates happen in the background. + Spam and fraud reduction + Something went wrong. Please try again. +-Pinned by your administrator +-Install on this device ++Pinned by your Administrator ++Install on this Device + Not enough disk space + Failed to fetch the SAML redirect URL from the server + automatically signs you in to eligible sites with passwords that you saved. +@@ -7098,12 +7098,12 @@ Press an assigned switch or key to remove assignment. + See device information, such as its serial number or asset ID + Open keyboard device settings + The file contained multiple certificates, some of which were not imported: +-New incognito tab ++New Incognito &Tab + Never + Touchpad acceleration + This name is visible to other devices for Bluetooth and network connections + Your Assistant uses these recordings and your spoken requests to create and update your voice model, which is only stored on devices where you've turned on Voice Match. View or retrain voice activity in Assistant Settings. +-C&opy image address ++C&opy Image Address + {COUNT,plural, =1{1 item in bookmark list}other{{COUNT} items in bookmark list}} + Provider options + Read and modify data that you copy and paste +@@ -7319,12 +7319,12 @@ Keep your key file in a safe place. You will need it to create new versions of y + - , + With Privacy Sandbox, Chrome is developing new technologies to safeguard you from cross-site tracking while preserving the open web. + Reader mode for web pages +-{NUM_TABS,plural, =1{Move tab to new window}other{Move tabs to new window}} ++{NUM_TABS,plural, =1{Move Tab to New Window}other{Move Tabs to New Window}} + Crostini port forwarding + {COUNT,plural, =1{a phone number}other{# phone numbers}} + Your bookmarks, passwords, history and more are synced on all your devices + Content +-{NUM_TABS,plural, =1{Add tab to reading list}other{Add tabs to reading list}} ++{NUM_TABS,plural, =1{Add Tab to Reading List}other{Add Tabs to Reading List}} + Hide all cards + Device information + Back up to Google Drive. Easily restore data or switch device at any time. This backup includes app data. Backups are uploaded to Google and encrypted using your child's Google Account password. Learn More +@@ -7401,7 +7401,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + Access your microphone and analyse your speech + Chrome tip + OEM folder +-Send to your devices ++Send to Your Devices + Offer to translate pages that aren't in a language you read + Out of storage space + Refresh now +@@ -7415,7 +7415,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + Mouse + This extension is not listed in the and may have been added without your knowledge. + Delete +-Name this group ++Name This Group + has disabled your mouse cursor. + This setting is managed by your administrator. + "" triggered full screen. +@@ -7569,7 +7569,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + Change + Pin to task bar + You can use your PIN to unlock your device. +-Save group ++Save Group + Enabling + Dictation sends your voice to Google to allow voice typing in any text field. + embedded on any host +@@ -7664,13 +7664,13 @@ Keep your key file in a safe place. You will need it to create new versions of y + Enhanced Safe Browsing is off + Oops! Something went wrong when trying to join the domain. Please try again. + Netscape Certificate Renewal URL +-Quick commands ++Quick Commands + Sound on key-press + No (HttpOnly) + Upgrade + Enter a correctly formatted URL + Using a hidden network isn't recommended for security reasons. +-Mark as read ++Mark as Read + Roaming required by provider + Did not find any printers from the print server + Press a switch or keyboard key to assign it to '' +@@ -7689,7 +7689,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + Keep touching your security key until your fingerprint is captured + Turn on 'Google Chrome' in Location Services on your Mac + Next download is at . +-{COUNT,plural, =0{Open all in &new window}=1{Open in &new window}other{Open all ({COUNT}) in &new window}} ++{COUNT,plural, =0{Open All in &New Window}=1{Open in &New Window}other{Open All ({COUNT}) in &New Window}} + Elephant + Proceed with caution + +@@ -7752,7 +7752,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + Sleep while charging + Petals + Sites will be blocked from asking to show you notifications. If a site requests notifications, a blocked indicator will appear in the address bar. +-You previously chose not to allow any extensions on ++You Previously Chose Not To Allow Any Extensions On + Recent activity + You will no longer be able to use your virtual card with Google Pay. Learn about virtual cards + Reloading... +@@ -7925,7 +7925,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + Binned Average + Stylus + When your child sees this icon, a fingerprint can be used for identification or to approve purchases. +-{NUM_TABS,plural, =1{Unnamed group – 1 tab}other{Unnamed group – # tabs}} ++{NUM_TABS,plural, =1{Unnamed Group – 1 Tab}other{Unnamed Group – # Tabs}} + Send a ‘Do Not Track’ request with your browsing traffic + While the hotspot is on, your will: + New Window +@@ -7935,7 +7935,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + When on + Open a new tab with one click + Opens in +-{NUM_TABS,plural, =1{Move tab to another window}other{Move tabs to another window}} ++{NUM_TABS,plural, =1{Move Tab to Another Window}other{Move Tabs to Another Window}} + Confirm sync settings to start sync. + can reopen accidentally closed tabs + Stable +@@ -8311,7 +8311,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + Running Chrome Connectivity Diagnostics + + Picture in Picture +-Show reading list ++Show Reading List + The profile is not supported + Do it later + View keyboard shortcuts +@@ -8410,7 +8410,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + Bookmark URL + Touch the power button with your finger. Your data is stored securely and never leaves your . + Quit +-Language to translate into ++Language to Translate into + Autocorrect undo dialogue is shown for corrected to . Press up arrow to access, escape to ignore. + Initial punctuation width is Full + This window will close after cancellation is complete. +diff --git a/chrome/app/resources/generated_resources_es-419.xtb b/chrome/app/resources/generated_resources_es-419.xtb +index 2b3ebf97bd67..feff984e5988 100644 +--- a/chrome/app/resources/generated_resources_es-419.xtb ++++ b/chrome/app/resources/generated_resources_es-419.xtb +@@ -2860,7 +2860,7 @@ y Ctrl + Alt + Disminuir brillo para alejar. + El ahora también puede desbloquear este dispositivo . + El sitio está usando el micrófono + Transmitiendo pantalla +-Establece un PIN ++Establecer un PIN + Permite que Asistente de Google utilice información de la pantalla de para que le sea útil + No se encontraron sitios + Descargando secuencia de comandos proxy... +@@ -3863,7 +3863,7 @@ y Ctrl + Alt + Disminuir brillo para alejar. + Quitar el texto destacado + Obtener información sobre cómo actualizar las aplicaciones + {NUM_TABS,plural, =1{Activar el sonido del sitio}other{Activar el sonido de los sitios}} +-Accede a tu Asistente mediante "Hey Google" ++Accede a tu Asistente con "Hey Google" + Mensajes + Por lo general, los sitios se conectan a dispositivos HID para usarlos en funciones que utilizan teclados poco habituales, controles de juegos y otros dispositivos. + Revisa algunos permisos en tu teléfono. Asegúrate de que las conexiones Bluetooth y Wi-Fi del teléfono estén activadas. +diff --git a/chrome/app/resources/generated_resources_gl.xtb b/chrome/app/resources/generated_resources_gl.xtb +index cb6696652d43..5bdf99d81713 100644 +--- a/chrome/app/resources/generated_resources_gl.xtb ++++ b/chrome/app/resources/generated_resources_gl.xtb +@@ -1875,7 +1875,7 @@ Se máis tarde decides que prefires que o teu fillo ou filla non utilice Voice M + Asegúrate de que o contrasinal que gardas coincida co contrasinal de + Bloqueouse a cámara + Detalles da VPN +-Contacta co teu provedor de telefonía móbil ++Contacta co teu operador móbil + Pequeno + Pe&gar e ir + Preguntar a teu pai ou túa nai +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb +index 86cf1fdbe9fb..f67d74e790b1 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb +@@ -332,7 +332,7 @@ Eduki sakatuta bilatu nahi duzun hitza. Bilaketa mugatzeko, hautatu hitz gehiago + FLoC + Ikusi eta kudeatu Google-ko kontuan gordetako pasahitzak + Laster-markak gailu guztietan izateko, hasi saioa eta aktibatu sinkronizazioa +-Jarioko txartelaren menua irekita dago eta altuera erdia hartzen du ++Jarioko txartelaren menua altuera erdian irekita dago + Ezkutatu dira arbeleko edukiak + Pribatutasun-gidaren azalpena altuera erdian irekita dago + Utzi diozu webguneari jarraitzeari +diff --git a/components/strings/components_strings_en-GB.xtb b/components/strings/components_strings_en-GB.xtb +index 6586ebd3063e..b2067efb301b 100644 +--- a/components/strings/components_strings_en-GB.xtb ++++ b/components/strings/components_strings_en-GB.xtb +@@ -45,7 +45,7 @@ + Tray 19 + Index-5x8 + Add Name on Card +-Change password ++Change Password + This field should not have more than entries. All further entries will be discarded. + Resume your journey button, press Enter to resume your journey and see relevant activity in your Chrome history + Error action +@@ -77,7 +77,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con + Web browsers + Pause + Remove +-Check passwords ++Check Passwords + Notifications are automatically blocked for all sites except ones that you allow + Orange + Next +@@ -138,7 +138,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con + Show More + Save and fill addresses + Left gate fold +-Play Chrome Dino game ++Play Chrome Dino Game + Your activity might still be visible to: + + Websites that you visit +@@ -452,7 +452,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con + PDF producer: + The templates that you've specified may not be applied due to the DnsOverHttpsMode policy not being set. + Men's clothing +-Mobile bookmarks ++Mobile Bookmarks + Cancel payment + Add Card + Connection is not secure +@@ -574,7 +574,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con + JSON Parser + Scan new card + Go back +-Protect account ++Protect Account + Food and grocery retailers + Not allowed (default) + Set Chrome as default browser button, press Enter to set Chrome as the system's default browser in iOS settings +@@ -744,7 +744,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con + &Redo + , currently selected. + Opera +-Open incognito tab ++Open Incognito Tab + If enabled, Chromium will store a copy of your card on this device for faster form filling. + Enter a valid address + This pickup method isn’t available. Try a different method. +@@ -1388,7 +1388,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con + You just entered your password on a deceptive site. To secure your accounts, Chromium recommends checking your saved passwords. + Add contact info + Use your microphone +-Run Chrome safety check ++Run Chrome Safety Check + The web page at might be temporarily down or it may have moved permanently to a new web address. + Dual staple bottom + An unknown error has occurred. +@@ -1515,7 +1515,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con + Device statistics such as CPU/RAM usage + A2 + Site is not secure +-Manage payment methods ++Manage Payment Methods + A5 + Tray 18 + virtual reality +@@ -1613,7 +1613,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con + Delivery method + Chrome found the password that you just used in a data breach. To secure your accounts, we recommend checking your saved passwords. + Detailed system logs +-Save address? ++Save Address? + Beating heart + Application is blocked + NFC devices +@@ -1764,7 +1764,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con + . + Do you want to fill in your ? + Permissions +-View your Chrome history ++View Your Chrome History + Simulation games + Your connection to is encrypted using an obsolete cipher suite. + When security events are flagged by Chrome, relevant data about the events is sent to your administrator. This can include URLs of pages that you visit in Chrome, file names or metadata, and the username that you use to sign in to web-based applications, your device and Chrome. +@@ -1904,7 +1904,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con + Clean beauty + Grinning + Trim after each document +-Manage settings ++Manage Settings + Google Pay logo + Hide suggestions + Print compositor service +@@ -2081,7 +2081,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con + Policy Value + chrome://flags + Your device went to sleep. +-Update address? ++Update Address? + Hagaki (Postcard) + JIS B2 + Commercial lending +@@ -2308,7 +2308,7 @@ Additional details: + Not applicable + {0,plural, =1{Your device will restart in 1 minute}other{Your device will restart in # minutes}} + Confirm Card +-Update address ++Update Address + Safety check + URL + Share this tab by sharing the link, creating a QR code, casting and more +@@ -2342,7 +2342,7 @@ Additional details: + The screening is different from what you selected. Continue? + Australian football + Form is not secure +-No, thanks ++No, Thanks + Forward + No data found. + Who’s behind this information? +@@ -2499,7 +2499,7 @@ Additional details: + Change your Google Account password + protected content IDs + Your password may be compromised +-Save address ++Save Address + Brown + Cargo trucks and trailers + Check your CVC and try again +@@ -2634,7 +2634,7 @@ Additional details: + Manage accessibility settings button, Enter to personalise your accessibility tools in Chrome OS settings + Billing address required + This app is designed for mobile +-Show all saved passwords ++Show All Saved Passwords + Delete + Edge stitch bottom + Visible data +diff --git a/ios/chrome/app/strings/resources/ios_chromium_strings_en-GB.xtb b/ios/chrome/app/strings/resources/ios_chromium_strings_en-GB.xtb +index 55816e9537b4..b989b6b970ac 100644 +--- a/ios/chrome/app/strings/resources/ios_chromium_strings_en-GB.xtb ++++ b/ios/chrome/app/strings/resources/ios_chromium_strings_en-GB.xtb +@@ -69,7 +69,7 @@ + Chromium page + Welcome to Chromium + You are signing in with an account managed by and giving its administrator control over your Chromium data. Your data will become permanently tied to this account. Signing out of Chromium will delete your data from this device, but it will remain stored in your Google Account. +-Make Chromium better ++Make Chromium Better + By using Chromium, you agree to the Terms of Service. + To make Chromium your default: + 1. Open settings +diff --git a/ios/chrome/app/strings/resources/ios_google_chrome_strings_en-GB.xtb b/ios/chrome/app/strings/resources/ios_google_chrome_strings_en-GB.xtb +index 8bf1d9a78d85..8e1ad94d00ea 100644 +--- a/ios/chrome/app/strings/resources/ios_google_chrome_strings_en-GB.xtb ++++ b/ios/chrome/app/strings/resources/ios_google_chrome_strings_en-GB.xtb +@@ -59,7 +59,7 @@ + To help improve the app, Chrome sends usage and crash data to Google. Manage + Not supported on Chrome beta + Chrome can help keep you safe from data breaches, unsafe websites and more. +-Make Chrome better ++Make Chrome Better + Select Chrome + Chrome is out of date. If no update is available in the app store, it's possible that your device doesn't support new versions of Chrome anymore. + Google Chrome can't use your camera because it's in use by another application +diff --git a/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb b/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb +index 8edfa8b82175..44dcc47c5133 100644 +--- a/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb ++++ b/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb +@@ -74,7 +74,7 @@ Your search engine is . See their instructions for deletin + Features on many sites may break + Never saved + Allow All Cookies +-No, thanks ++No, Thanks + Your current setting may cause some sites to break. To manage cookies for all sites, see Cookie settings. + Address 1 + Scan QR Code +@@ -185,7 +185,7 @@ Sites can't use cookies to see your browsing activity across different sites, fo + Clear site cookies + Password copied + Check your connection and try signing in again. +-Search tabs… ++Search Tabs… + Cookies in Use + Delete Read + Submit +@@ -243,7 +243,7 @@ Sites can't use cookies to see your browsing activity across different sites, fo + Add Payment Method... + Open in New Tab + Aw, Snap! +-Don't sign in ++Don't Sign In + You won't be signed out of your Google Account. Other forms of activity may be saved in your Google Account when you’re signed in. You can delete them at any time. + + +@@ -459,7 +459,7 @@ To change this setting, reset sync + Save... + Mark Read + Discover by Google +-Turn on ++Turn On + Sorry, there was a problem sharing your item. + Find in page… + Access password settings +@@ -769,7 +769,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across + This clears synced data from all devices. Saved site settings will not be deleted and may reflect your browsing habits. Find out more + 3. Select Chrome + Company Name +-No, thanks ++No, Thanks + Forward + 0 selected + To lock your incognito tabs, set up touch ID, face ID or a passcode. +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0017-Sheriff-Disable-BluetoothTest.ConstructDefaultAdapte.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0017-Sheriff-Disable-BluetoothTest.ConstructDefaultAdapte.patch new file mode 100644 index 000000000000..22615a1df22d --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0017-Sheriff-Disable-BluetoothTest.ConstructDefaultAdapte.patch @@ -0,0 +1,44 @@ +From fb5cfd58e6ffe97dacf99f64b30d6ede4387a82e Mon Sep 17 00:00:00 2001 +From: Ioana Pandele +Date: Wed, 15 Jun 2022 21:35:52 +0000 +Subject: [PATCH 17/59] [Sheriff] Disable BluetoothTest.ConstructDefaultAdapter + on Mac + +(cherry picked from commit 6ab5afb8214f18b886e3b190045ee8a90c3ca5f7) + +Bug: 1334462 +Change-Id: I95f9678936fa652c75949a48cfc53e788fc4b4a2 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3695178 +Auto-Submit: Ioana Pandele +Owners-Override: Ioana Pandele +Commit-Queue: Lan Wei +Reviewed-by: Lan Wei +Owners-Override: Lan Wei +Cr-Original-Commit-Position: refs/heads/main@{#1011954} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3708698 +Commit-Queue: Phillis Tang +Owners-Override: Phillis Tang +Auto-Submit: Steven Holte +Cr-Commit-Position: refs/branch-heads/5005@{#1176} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + device/bluetooth/bluetooth_adapter_unittest.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc +index cfd96a78408b..8719f0f732b2 100644 +--- a/device/bluetooth/bluetooth_adapter_unittest.cc ++++ b/device/bluetooth/bluetooth_adapter_unittest.cc +@@ -708,7 +708,8 @@ TEST_F(BluetoothAdapterTest, StartDiscoverySessionError_Destroy) { + } + + // TODO(scheib): Enable BluetoothTest fixture tests on all platforms. +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) ++// Flaky on Mac. See crbug.com/1334462 ++#if BUILDFLAG(IS_ANDROID) + #define MAYBE_ConstructDefaultAdapter ConstructDefaultAdapter + #else + #define MAYBE_ConstructDefaultAdapter DISABLED_ConstructDefaultAdapter +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0018-Incrementing-VERSION-to-102.0.5005.131.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0018-Incrementing-VERSION-to-102.0.5005.131.patch new file mode 100644 index 000000000000..e2d7244dcbdb --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0018-Incrementing-VERSION-to-102.0.5005.131.patch @@ -0,0 +1,28 @@ +From c93990fa0fcea605d74b8badf15176b64efb36ce Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Thu, 16 Jun 2022 01:00:42 +0000 +Subject: [PATCH 18/59] Incrementing VERSION to 102.0.5005.131 + +Change-Id: Ic40d8b3a54cd65afec40dedd309f3e8010ffb8ae +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3706784 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1177} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 2a835d053cb4..31f19120d007 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=130 ++PATCH=131 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0019-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0019-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..6860f55a1d55 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0019-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,308 @@ +From f7a75a646b7a1ac6bbc83456f7b1d8c0b742a85d Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Thu, 16 Jun 2022 14:44:26 +0000 +Subject: [PATCH 19/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: I81cea9f1e1f44dfe52a89cef4fc26f06f0254a19 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3707982 +Auto-Submit: Ben Mason +Commit-Queue: Rubber Stamper +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1178} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + .../android_chrome_tab_ui_strings_te.xtb | 6 +++--- + .../app/resources/generated_resources_te.xtb | 14 ++++++------- + .../app/resources/generated_resources_vi.xtb | 2 +- + .../strings/accessibility_strings_te.xtb | 4 ++-- + .../android_chrome_strings_te.xtb | 2 +- + chromeos/strings/chromeos_strings_te.xtb | 2 +- + components/strings/components_strings_fa.xtb | 20 +++++++++---------- + components/strings/components_strings_te.xtb | 2 +- + .../strings/resources/ios_strings_zh-TW.xtb | 2 +- + ui/strings/translations/ax_strings_te.xtb | 2 +- + 10 files changed, 28 insertions(+), 28 deletions(-) + +diff --git a/chrome/android/features/tab_ui/java/strings/translations/android_chrome_tab_ui_strings_te.xtb b/chrome/android/features/tab_ui/java/strings/translations/android_chrome_tab_ui_strings_te.xtb +index aa972690a329..08d399accf4e 100644 +--- a/chrome/android/features/tab_ui/java/strings/translations/android_chrome_tab_ui_strings_te.xtb ++++ b/chrome/android/features/tab_ui/java/strings/translations/android_chrome_tab_ui_strings_te.xtb +@@ -19,7 +19,7 @@ + {TABS_COUNT,plural, =1{ ట్యాబ్‌ను కుదించండి.}other{ ట్యాబ్‌లతో ట్యాబ్ గ్రూప్‌ను కుదించండి.}} + సూచన: మీ ట్యాబ్‌లను ఇటీవల ఉపయోగించలేదు. వాటిని మూసివేయాలా? + గ్రూప్‌గా చేయి +-సమూహాన్ని క్రియేట్ చేయండి ++గ్రూప్‌ను క్రియేట్ చేయండి + / రేటింగ్ + సైట్‌కు వెళ్లండి + గ్రూప్‌ను షేర్ చేయండి +@@ -92,7 +92,7 @@ + మూసివేయబడిన ట్యాబ్‌ స్ట్రిప్ + మీ ట్యాబ్‌లలో ధర తగ్గింపు వివరాలను చూడండి + ఈ స్టోర్ గురించిన సమాచారాన్ని చూపించే స్క్రీన్ మూసివేయబడింది +-స్క్రీన్ దిగువ భాగం దగ్గరలో ఉండే మీ ట్యాబ్ సమూహంలో కోరుకునే ట్యాబ్‌లకు మారండి +-సమూహానికి కొత్త ట్యాబ్‌ను జోడించు ++స్క్రీన్ దిగువ భాగం దగ్గరలో ఉండే మీ ట్యాబ్ గ్రూప్‌లో కోరుకునే ట్యాబ్‌లకు మారండి ++గ్రూప్‌నకు కొత్త ట్యాబ్‌ను జోడించు + అన్నింటిని క్రమ పద్దతిలో అమర్చండి + +\ No newline at end of file +diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb +index a92ab6ddabb0..20010cb9bef6 100644 +--- a/chrome/app/resources/generated_resources_te.xtb ++++ b/chrome/app/resources/generated_resources_te.xtb +@@ -829,7 +829,7 @@ + కనిష్ఠం + దయచేసి ""లో ఈ పాస్‌కీని నమోదు చేయండి: + యాప్ () +-సమూహాన్ని మూసివేయి ++గ్రూప్‌ను మూసివేయి + బుక్‌మార్క్‌లను దిగుమతి చేస్తోంది... + మీ చుట్టూ ఉన్న వ్యక్తులతో ఫైళ్లను అందుకోవడానికి, ఇంకా పంపడానికి 'సమీప షేరింగ్'ను సెటప్ చేయండి + ప్రస్తుత పిన్‌ +@@ -2035,7 +2035,7 @@ + మీరు ముఖ్యం అనుకునే విషయాల గురించి మీకు తెలియజేసే కార్డ్‌లను ఎంచుకోండి + ఆటోమేటిక్ బ్రౌజర్ + శోధన, ఇతర Google సేవలను వ్యక్తిగతీకరించడానికి Google మీ చరిత్రను ఉపయోగించే అవకాశం ఉంటుంది +-సమూహంలో కొత్త ట్యాబ్ ++గ్రూప్‌లో కొత్త ట్యాబ్ + కీ ID: + మీరు మీ అన్ని అజ్ఞాత విండోలను మూసివేసినప్పుడు, ఈ అనుకూల సెట్టింగ్ తీసివేయబడుతుంది + మీరు ట్యాబ్‌లను తెరవాలనుకుంటున్నారా? +@@ -2102,7 +2102,7 @@ + స్థానాన్ని ఉపయోగించండి. స్థాన అనుమతిని కలిగిన యాప్‌లు మరియు సేవలు ఈ పరికర స్థానాన్ని ఉపయోగించడానికి అనుమతించండి. Google కాలానుగుణంగా స్థాన డేటాని సేకరించవచ్చు మరియు స్థాన ఖచ్చితత్వం మరియు స్థానం-ఆధారిత సేవలను మెరుగుపరచడం కోసం ఈ డేటాని అనామకంగా ఉపయోగించవచ్చు. మరింత తెలుసుకోండి + నన్ను సైన్ అప్ చేయనివ్వు + మీ ఫోన్‌ను కేబుల్‌తో కనెక్ట్ చేయండి +-విభాగం సమూహంలో ఉంది: ++విభాగం గ్రూప్‌లో ఉంది: + ప్యాక్ ఎక్స్‌టెన్షన్‌ హెచ్చరిక + ఏదో తప్పు జరిగింది. స్కానింగ్ పూర్తి కాలేకపోయింది. దయచేసి మళ్లీ ప్రయత్నించండి. + నిల్వ స్థలం లేని కారణంగా పునరుద్ధరించడం సాధ్యపడలేదు. పరికరంలో స్థలం ఖాళీ చేసి, ఆపై మళ్లీ ప్రయత్నించండి. +@@ -3999,7 +3999,7 @@ + పిన్‌లో చెల్లని అక్షరాలు ఉన్నాయి + బుక్‌మార్క్‌ను జోడించండి + సింక్‌ని ఆఫ్ చేయి +-సమూహాన్ని మూసివేయి ++గ్రూప్‌ను మూసివేయి + మీడియా ఫైల్ చెక్కర్ + క్రాష్ ఎందుకు జరిగిందన్నది తెలుసుకోవడానికి, పరిష్కరించడానికి మా ఇంజినీర్‌లకు సహాయం చేయండి. మీకు సాధ్యమైతే విషయాన్ని క్రమ పద్ధతిలో దశల వారీగా పేర్కొనండి. వివరణ ఏదీ మరీ చిన్నగా ఉండకూడదు! + స్క్రీన్‌ను లాక్ చేయండి మరియు అన్‌లాక్ చేయండి +@@ -7410,7 +7410,7 @@ + మౌస్ + ఈ ఎక్స్‌టెన్షన్‌ లో లిస్ట్‌ చేయబడలేదు మరియు మీకు తెలియకుండానే జోడించబడి ఉండవచ్చు. + తొలగించు +-ఈ సమూహానికి పేరు పెట్టండి ++ఈ గ్రూప్‌నకు పేరు పెట్టండి + మీ మౌస్ కర్సర్‌ను నిలిపివేసింది. + ఈ సెట్టింగ్ మీ నిర్వాహకుడి ద్వారా నిర్వహించబడుతుంది. + ఫుల్-స్క్రీన్‌ను ప్రారంభించింది. +@@ -7913,7 +7913,7 @@ + సైట్‌లు తమ సొంత సైట్‌లో మీ బ్రౌజింగ్ యాక్టివిటీని చూడటానికి మాత్రమే కుక్కీలను ఉపయోగించగలవు + Google నుండి చిత్ర వివరణలను పొందండి + వాయిస్ శోధన ఆపివేయబడింది. +-సమూహంలో కొత్త ట్యాబ్ ++గ్రూప్‌లో కొత్త ట్యాబ్ + కియోస్క్ యాప్ అమలు రద్దు చేయబడింది. + మెసేజింగ్ యాప్‌లు + బ్లూటూత్ పెయిరింగ్ కోడ్‌ను టైప్ చేసి, ఆపై Return లేదా Enter నొక్కండి. +@@ -8363,7 +8363,7 @@ + {NUM_FILES,plural, =1{భద్రతా తనిఖీ చేయడానికి వీల్లేనంతగా ఈ ఫైల్ చాలా పెద్దగా ఉంది. మీరు గరిష్ఠంగా 50 MB వరకు ఉండే ఫైల్స్‌ను అప్‌లోడ్ చేయగలరు.}other{ఈ ఫైల్స్‌లో కొన్ని, భద్రతా తనిఖీ చేయడానికి వీల్లేనంత పెద్దగా ఉన్నాయి. మీరు గరిష్ఠంగా 50 MB వరకు ఉండే ఫైల్స్‌ను అప్‌లోడ్ చేయగలరు.}} + చట్టపరమైన కారణాలతో కంటెంట్ మార్పులను అభ్యర్ధించడానికి చట్టపరమైన అంశాల సహాయ పేజీకు వెళ్లండి. కొంత ఖాతా మరియు సిస్టమ్ సమాచారం Googleకి పంపబడవచ్చు. సాంకేతిక సమస్యల పరిష్కారానికి మరియు మా సేవలను మెరుగుపరచడానికి మీరు మాకు ఇచ్చిన సమాచారాన్ని మా గోప్యతా విధానం మరియు సేవా నిబంధనలుకు లోబడి మేము ఉపయోగిస్తాము. + పాస్‌వర్డ్ మాత్రమే +-ఈ సమూహానికి పేరు పెట్టండి ++ఈ గ్రూప్‌నకు పేరు పెట్టండి + అవసరమైతే ఇక్కడ లిస్ట్‌ చేయబడని అంశాలను కూడా తీసివేయవచ్చు. Chrome గోప్యత విధాన డాక్యుమెంట్‌లో <a href="">అవాంఛిత సాఫ్ట్‌వేర్ రక్షణ</a> గురించి మరింత తెలుసుకోండి. + బగ్ లేదా ఎర్రర్ + Smart Lock ఫోన్ మారింది. Smart Lockను అప్‌డేట్ చేయడానికి మీ పాస్‌వర్డ్‌ను నమోదు చేయండి. తదుపరిసారి, మీ ఫోన్ మీ ‌ను అన్‌లాక్ చేస్తుంది. మీరు సెట్టింగ్‌లలో Smart Lockను ఆఫ్ చేయవచ్చు +diff --git a/chrome/app/resources/generated_resources_vi.xtb b/chrome/app/resources/generated_resources_vi.xtb +index c840b5de3ccf..7bf91bfe95da 100644 +--- a/chrome/app/resources/generated_resources_vi.xtb ++++ b/chrome/app/resources/generated_resources_vi.xtb +@@ -5837,7 +5837,7 @@ Bạn có thể gán nhiều công tắc cho thao tác này. + Thao tác này sẽ xóa dữ liệu lưu trữ trong các trang web + Đã mất kết nối mạng. Hãy kiểm tra kết nối mạng của bạn hoặc thử một mạng Wi-Fi khác. + Khóa màn hình +-Có thể chúng tôi sẽ gửi email cho bạn khi có thông tin khác hoặc nội dung cập nhật ++Chúng tôi có thể gửi email cho bạn để hỏi thêm thông tin hoặc để cập nhật thông tin cho bạn + &Tệp + Trang web này sẽ hỏi lại vào lần tới. + Nhập dấu trang và các mục cài đặt... +diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb +index ec08aaeefe97..ff870ab0ced5 100644 +--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb ++++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb +@@ -215,7 +215,7 @@ Chrome బ్రౌజర్ మెనూను తెరవడానికి, + సూచించండి + చెక్‌ బాక్స్ + ప్రస్తుత +-రేడియో బటన్ సమూహం ++రేడియో బటన్ గ్రూప్‌ + ఎంపిక చేసిన దానిని రద్దు చేయండి + శీర్షిక 6 + {COUNT,plural, =1{నక్షత్రం గుర్తు}other{# నక్షత్రం గుర్తులు}} +@@ -290,7 +290,7 @@ Chrome బ్రౌజర్ మెనూను తెరవడానికి, + తర్వాత స్థాయి 3 శీర్షిక లేదు + ముదురు మేఘ వర్ణపు నీలం రంగు + ముదురు బంగారు కడ్డీ రంగు +-శీర్షిక సమూహం ++శీర్షిక గ్రూప్‌ + సముద్రపు ఆకుపచ్చ రంగు + {COUNT,plural, =1{ట్యాబ్}other{# ట్యాబ్‌లు}} + సాధన చిట్కా +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb +index 061ad6df72d7..657f92070e7e 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb +@@ -14,7 +14,7 @@ + మీరు ఫైల్ ఎక్స్‌టెన్షన్‌ను మార్చితే, ఫైల్ వేరే అప్లికేషన్‌లో తెరవబడవచ్చు. అది మీ పరికరానికి హానికరంగా పరిణమించే అవకాశం ఉంటుంది. + రివ్యూ పూర్తయింది! + మీ సింక్ డేటాను మీరు ఎల్లప్పుడూ యాక్సెస్ చేయగలరని నిర్ధారించుకోండి +-సమూహంలో కొత్త ట్యాబ్‌లో తెరువు ++గ్రూప్‌లో కొత్త ట్యాబ్‌లో తెరువు + Chromeను మెరుగుపరచుకోవడంలో సహాయపడతారా? + స్క్రీన్ క్యాప్చర్ + హిస్టరీ సింక్ +diff --git a/chromeos/strings/chromeos_strings_te.xtb b/chromeos/strings/chromeos_strings_te.xtb +index 55063e9f7f4f..590de1511a1c 100644 +--- a/chromeos/strings/chromeos_strings_te.xtb ++++ b/chromeos/strings/chromeos_strings_te.xtb +@@ -362,7 +362,7 @@ + మీ స్క్రీన్ ఇన్‌యాక్టివ్‌గా ఉన్నప్పుడు, ఫోటోలు, సమయం, వాతావరణం, మీడియా సమాచారాన్ని చూపిస్తుంది. + అనుమతించు + SIM లాక్ చేయబడింది () +-సమూహం పేరు ++గ్రూప్‌ పేరు + ఈ పేజీ మాత్రమే ఉంది. ఇది మిమ్మల్ని స్కానింగ్ ప్రారంభ స్క్రీన్‌కు తీసుకువెళ్తుంది. + సర్వర్ హోస్ట్ పేరు + రాష్ట్రం +diff --git a/components/strings/components_strings_fa.xtb b/components/strings/components_strings_fa.xtb +index e9d671b9971b..6e5c5880f302 100644 +--- a/components/strings/components_strings_fa.xtb ++++ b/components/strings/components_strings_fa.xtb +@@ -147,7 +147,7 @@ + + هم‌رسانی این برگه + دامنه ثبت‌نام: +-نشانی تحویل گرفتن کالا ++نشانی تحویل گرفتن + راست + سایت پیش‌رو حاوی برنامه‌های خطرناک است + تأیید نام +@@ -207,7 +207,7 @@ + گذرواژه‌تان را تغییر دهید + دوچرخه‌سواری + ارسال +-انتخاب نشانی تحویل کالا ++انتخاب نشانی ارسال کالا + اعمال خط‌مشی‌ها: + ‏وقتی همه برگه‌های ناشناس Chrome را ببندید، فعالیتتان در این برگه‌ها از دستگاهتان پاک می‌شود: + +@@ -236,7 +236,7 @@ + درحال‌حاضر مورد دیگری وجود ندارد + ترجمه صفحه + گزارش ارسال شد: +-انتخاب نشانی ارسال ++انتخاب نشانی تحویل کالا + برای استفاده از این قابلیت، جاوا اسکریپت باید فعال باشد. + Engineering-D + نرم‌افزار رایگان و اشتراکی +@@ -674,7 +674,7 @@ + گواهی سرور با استفاده از یک الگوریتم امضای ضعیف امضا شده است. + در حال اجرای عیب‌یابی اتصال + موسیقی کلاسیک +-انتخاب نشانی تحویل گرفتن ++انتخاب نشانی تحویل کالا + تأیید + تنیس روی میز + حذف موارد انتخابی +@@ -894,10 +894,10 @@ + به تأیید رساندن خرید + ترتیب اولویت کنونی + روش‌های پرداخت +-نشانی ارسال ++نشانی تحویل کالا + ویرایش فایل + روش تحویل گرفتن +-نشانی ارسال ++نشانی تحویل کالا + اتصال استفاده‌شده برای بار کردن این سایت از «امنیت لایه انتقال» نسخه ۱.۰ یا ۱.۱ استفاده می‌کرد که منسوخ شده است و در آینده غیرفعال خواهد شد. بعد از غیرفعال شدن، کاربران نمی‌توانند این سایت را بار کنند. سرور باید «امنیت لایه انتقال» نسخه ۱.۲ یا بالاتر را فعال کند. + سفارشی کردن قلم‌ها + مدیریت تنظیمات امنیتی +@@ -1566,7 +1566,7 @@ + ایمیل ضروری است + لوازم مهمانی و تعطیلات + بازی چندنفره گسترده +-نشانی تحویل کالا ++نشانی ارسال کالا + B8 + 12x19 + رد کردن +@@ -1727,7 +1727,7 @@ + ‏موقعیت X تصویر + فهرست + متأسفیم. این صفحه ترجمه نشد. +-افزودن نشانی تحویل کالا ++افزودن نشانی ارسال کالا + ‏صادر کردن به JSON + مکان + ‏مقدار DnsOverHttpsTemplates مرتبط نیست و استفاده نخواهد شد، مگراینکه خط‌مشی DnsOverHttpsMode روی یا تنظیم شده باشد. +@@ -2860,7 +2860,7 @@ + پیشنهادات:مطمئن شوید اتصال داده داریدبعداً این صفحه وب را تازه‌سازی کنیدآدرسی را که وارد کرده‌اید، بررسی کنید + ذخیره کارت + گواهی سرور منقضی شده است. +-شامل اطلاعاتی مانند شماره تلفن، نشانی ایمیل و نشانی تحویل کالا می‌شود ++شامل اطلاعاتی مانند شماره تلفن، نشانی ایمیل، و نشانی تحویل کالا می‌شود + نام فایل‌هایی که چاپ می‌کنید + ‏Google Safe Browsing اخیراً در ، رمزگیری شناسایی کرده است. سایت‌های رمزگیری وانمود می‌کنند وب‌سایت‌های دیگری هستند تا شما را فریب دهند. + اکنون می‌توانید برنامه را تغییر اندازه دهید +@@ -2977,7 +2977,7 @@ + این محتوا ممکن است برنامه‌های فریب‌دهنده‌ای نصب کند که وانمود می‌کنند برنامه دیگری هستند یا اینکه داده‌هایی برای ردیابی شما جمع‌آوری می‌کنند. درهرصورت نشان داده شود + خودرو و وسیله نقلیه + ساخت رسمی +-افزودن نشانی ارسال ++افزودن نشانی تحویل کالا + {COUNT,plural, =0{هیچ‌کدام}=1{۱ مورد}one{# مورد}other{# مورد}} + مراسم ازدواج + آفلاین +diff --git a/components/strings/components_strings_te.xtb b/components/strings/components_strings_te.xtb +index a7175812f17b..4c6638f9b39e 100644 +--- a/components/strings/components_strings_te.xtb ++++ b/components/strings/components_strings_te.xtb +@@ -939,7 +939,7 @@ + + ఫైల్ పేరు: + మీ పరిసరాల 3D మ్యాప్‌ను రూపొందించడం, అలాగే కెమెరా పొజిషన్‌ను ట్రాక్ చేయడం +-ఈ విధానం విస్మరించబడుతుంది, ఎందుకంటే ఒకే విధాన సమూహం నుండి మరొక విధానం అధిక ప్రాధాన్యతను కలిగి ఉంది. ++ఈ విధానం విస్మరించబడుతుంది, ఎందుకంటే ఒకే విధాన గ్రూప్‌ నుండి మరొక విధానం అధిక ప్రాధాన్యతను కలిగి ఉంది. + 'అడ్రస్‌లను మేనేజ్ చేయి' బటన్, Chrome సెట్టింగ్‌లలో అడ్రస్‌లను జోడించడానికి, మేనేజ్ చేయడానికి 'Enter'ను నొక్కండి + అనేక వస్తువులను హ్యాండిల్ చేయడం + సర్వర్ ప్రమాణపత్రం విశ్వసనీయమైనది కాదు. +diff --git a/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb b/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb +index e0509bfd580b..6b5724474994 100644 +--- a/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb ++++ b/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb +@@ -810,7 +810,7 @@ + 在歷史記錄中搜尋 (找到 項結果) + 為保護個人隱私，Chrome 不會自動填入這個欄位。 + 貴機構不允許你同步處理任何內容。 +-隱私權與安全性 ++隱私權和安全性 + 可在密碼因資料侵害事件遭到外洩時顯示警告訊息。 + FaceTime + 匯出密碼... +diff --git a/ui/strings/translations/ax_strings_te.xtb b/ui/strings/translations/ax_strings_te.xtb +index 47c420b52d37..7437716cbb08 100644 +--- a/ui/strings/translations/ax_strings_te.xtb ++++ b/ui/strings/translations/ax_strings_te.xtb +@@ -30,7 +30,7 @@ + ఆడియో + పాప్ అప్ బటన్ + వివరాలు +-రేడియో సమూహం ++రేడియో గ్రూప్‌ + క్లిక్ చేయి + ఆబ్జెక్ట్ + లింక్ +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0020-Incrementing-VERSION-to-102.0.5005.132.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0020-Incrementing-VERSION-to-102.0.5005.132.patch new file mode 100644 index 000000000000..cd8cb86a7339 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0020-Incrementing-VERSION-to-102.0.5005.132.patch @@ -0,0 +1,28 @@ +From e880c117e7d30009b1af32aa904a97a53a024580 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Fri, 17 Jun 2022 01:00:31 +0000 +Subject: [PATCH 20/59] Incrementing VERSION to 102.0.5005.132 + +Change-Id: I305193c6abec7d1b6ad767f428e8ce1b232eef29 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3707777 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1179} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 31f19120d007..5fded03cba08 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=131 ++PATCH=132 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0021-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0021-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..ed16f2a16e90 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0021-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,212 @@ +From cbe831f390de4ea05fcc3ec65a0716a7fe0a8883 Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Fri, 17 Jun 2022 18:09:59 +0000 +Subject: [PATCH 21/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: Ia1e4b034fbf40ae02d641e01ec1393a58b68a20a +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3710835 +Commit-Queue: Rubber Stamper +Bot-Commit: Rubber Stamper +Auto-Submit: Ben Mason +Cr-Commit-Position: refs/branch-heads/5005@{#1180} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/app/resources/generated_resources_bs.xtb | 8 ++++---- + chrome/app/resources/generated_resources_te.xtb | 4 ++-- + chrome/app/resources/generated_resources_vi.xtb | 2 +- + chrome/app/resources/google_chrome_strings_gl.xtb | 2 +- + chrome/app/resources/google_chrome_strings_vi.xtb | 4 ++-- + components/strings/components_strings_da.xtb | 2 +- + .../strings/resources/ios_share_extension_strings_hi.xtb | 2 +- + .../resources/ios_widget_kit_extension_strings_te.xtb | 2 +- + remoting/resources/remoting_strings_te.xtb | 2 +- + ui/chromeos/translations/ui_chromeos_strings_fi.xtb | 4 ++-- + 10 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/chrome/app/resources/generated_resources_bs.xtb b/chrome/app/resources/generated_resources_bs.xtb +index 7234e04492b8..fe27694bd420 100644 +--- a/chrome/app/resources/generated_resources_bs.xtb ++++ b/chrome/app/resources/generated_resources_bs.xtb +@@ -517,7 +517,7 @@ Odobrenja koja ste već dali aplikacijama se mogu primjenjivati na ovaj račun. + Pretraživač + Ovoj stranici je blokiran pristup vašoj kameri. + &Odbaci +-Prenosite aplikacije za slanje poruka ++Prenosite aplikacije za razmjenu poruka + &Vrati grupu + Pristupiti bilo kojem uređaju putem USB-a + Pokretač +@@ -724,7 +724,7 @@ da li proksi server funkcionira. Ako smatrate da ne trebate koristiti + &Novi anoniman prozor + Uključiti navigaciju kursorom? + Boja za isticanje +-Nedavne fotografije i aplikacije za slanje poruka ++Nedavne fotografije i aplikacije za razmjenu poruka + Omogući pisanje klizanjem prstom + Da biste imali svoje oznake na svim svojim uređajima, uključite sinhronizaciju. + Obrisati podatke web lokacije? +@@ -6276,7 +6276,7 @@ Domena zahtijeva da pametna kartica ostane umetnuta.Za ovu ekstenziju nisu potrebna posebna odobrenja + Promijenite početnu stranicu na: + Postojeća fotografija sa kamere ili fajl +-Obavještenja i aplikacije za slanje poruka ++Obavještenja i aplikacije za razmjenu poruka + Potvrđivanje koda za aktivaciju... + Ekstenzija "" može čitati fajlove za slike, videozapise i zvuk u označenim lokacijama. + &Uvijek otvori ovu vrstu datoteka +@@ -7585,7 +7585,7 @@ Fajl ključa: + Ponudi prijevod stranica na ovom jeziku + Linux aplikacije + Provjerite je li uređaj ažuriran i pokušajte ponovo +-Nedavne fotografije, obavještenja i aplikacije za slanje poruka ++Nedavne fotografije, obavještenja i aplikacije za razmjenu poruka + Saznajte više + Uključite Ctrl ili Alt + Nisu pronađene komande +diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb +index 20010cb9bef6..8e1f07c5d7d1 100644 +--- a/chrome/app/resources/generated_resources_te.xtb ++++ b/chrome/app/resources/generated_resources_te.xtb +@@ -5950,7 +5950,7 @@ + మీ డేటాను సింక్ చేయడానికి మీ రహస్య పదబంధాన్ని నమోదు చేయండి + QuickFix + వినియోగదారులందరి కోసం ఆటోమేటిక్ అప్‌డేట్‌లను సెటప్ చేయడం విఫలమైంది (ప్రీఫ్లయిట్ అమలు ఎర్రర్: ) +-Google గోప్యతా విధానం ++Google గోప్యతా పాలసీ + అనువదించు + గ్రూప్ నుండి ట్యాబ్ తొలగించబడింది - + స్మార్ట్ మరియు సురక్షిత బ్రౌజర్‌కు మారండి +@@ -8361,7 +8361,7 @@ + హోమ్ + ముద్రించడాన్ని ప్రారంభించడం సాధ్యం కాలేదు. + {NUM_FILES,plural, =1{భద్రతా తనిఖీ చేయడానికి వీల్లేనంతగా ఈ ఫైల్ చాలా పెద్దగా ఉంది. మీరు గరిష్ఠంగా 50 MB వరకు ఉండే ఫైల్స్‌ను అప్‌లోడ్ చేయగలరు.}other{ఈ ఫైల్స్‌లో కొన్ని, భద్రతా తనిఖీ చేయడానికి వీల్లేనంత పెద్దగా ఉన్నాయి. మీరు గరిష్ఠంగా 50 MB వరకు ఉండే ఫైల్స్‌ను అప్‌లోడ్ చేయగలరు.}} +-చట్టపరమైన కారణాలతో కంటెంట్ మార్పులను అభ్యర్ధించడానికి చట్టపరమైన అంశాల సహాయ పేజీకు వెళ్లండి. కొంత ఖాతా మరియు సిస్టమ్ సమాచారం Googleకి పంపబడవచ్చు. సాంకేతిక సమస్యల పరిష్కారానికి మరియు మా సేవలను మెరుగుపరచడానికి మీరు మాకు ఇచ్చిన సమాచారాన్ని మా గోప్యతా విధానం మరియు సేవా నిబంధనలుకు లోబడి మేము ఉపయోగిస్తాము. ++చట్టపరమైన కారణాలతో కంటెంట్ మార్పులను అభ్యర్ధించడానికి చట్టపరమైన అంశాల సహాయ పేజీకు వెళ్లండి. కొంత ఖాతా మరియు సిస్టమ్ సమాచారం Googleకి పంపబడవచ్చు. సాంకేతిక సమస్యల పరిష్కారానికి మరియు మా సేవలను మెరుగుపరచడానికి మీరు మాకు ఇచ్చిన సమాచారాన్ని మా గోప్యతా పాలసీ మరియు సేవా నిబంధనలుకు లోబడి మేము ఉపయోగిస్తాము. + పాస్‌వర్డ్ మాత్రమే + ఈ గ్రూప్‌నకు పేరు పెట్టండి + అవసరమైతే ఇక్కడ లిస్ట్‌ చేయబడని అంశాలను కూడా తీసివేయవచ్చు. Chrome గోప్యత విధాన డాక్యుమెంట్‌లో <a href="">అవాంఛిత సాఫ్ట్‌వేర్ రక్షణ</a> గురించి మరింత తెలుసుకోండి. +diff --git a/chrome/app/resources/generated_resources_vi.xtb b/chrome/app/resources/generated_resources_vi.xtb +index 7bf91bfe95da..fa4aee89f515 100644 +--- a/chrome/app/resources/generated_resources_vi.xtb ++++ b/chrome/app/resources/generated_resources_vi.xtb +@@ -6840,7 +6840,7 @@ Bạn có thể gán nhiều công tắc cho thao tác này. + URL chính sách của tổ chức phát hành chứng chỉ Netscape + Đang tải xuống: + Thao tác này sẽ xóa vĩnh viễn dữ liệu duyệt web của bạn khỏi thiết bị này. Để khôi phục dữ liệu, hãy bật tùy chọn đồng bộ hóa cho địa chỉ email +-Kiểm tra bản cập nhật ++Kiểm tra để tìm bản cập nhật + Thu phóng trang + Tên thiết bị quá dài + Đọc thông tin thiết bị và dữ liệu thiết bị ChromeOS. +diff --git a/chrome/app/resources/google_chrome_strings_gl.xtb b/chrome/app/resources/google_chrome_strings_gl.xtb +index 692445beff89..c6a9a7939c31 100644 +--- a/chrome/app/resources/google_chrome_strings_gl.xtb ++++ b/chrome/app/resources/google_chrome_strings_gl.xtb +@@ -22,7 +22,7 @@ + Google Chrome Beta + Este ordenador ten instalada unha versión máis recente de Google Chrome. Se o software non funciona, desinstala Google Chrome e téntao de novo. + Se cambias de idea, podes modificar a configuración de Chrome en calquera momento. Con todo, as probas inscríbense na experiencia actual de publicación de anuncios, polo que non verás cambios de inmediato. +-Aplicacións de valores controlados de Chrome ++Aplicacións de Chrome Canary + Personaliza o teu novo perfil de Chrome + Google Chrome precisa acceso mediante Bluetooth para continuar coa vinculación. + Chrome OS é posible grazas a software de código aberto adicional. +diff --git a/chrome/app/resources/google_chrome_strings_vi.xtb b/chrome/app/resources/google_chrome_strings_vi.xtb +index 2fcf6338de07..5b286f0d9831 100644 +--- a/chrome/app/resources/google_chrome_strings_vi.xtb ++++ b/chrome/app/resources/google_chrome_strings_vi.xtb +@@ -9,7 +9,7 @@ + Đây là Chrome của bạn + Ai đang sử dụng Chrome? + Không thể cập nhật Chrome +-Giới thiệu về Chrome OS ++Giới thiệu về ChromeOS + &Mở trong Chrome + Nếu bạn không thấy một chế độ cài đặt nào đó trên trang này, hãy xem phần Cài đặt ChromeOS Flex + Chrome khuyên bạn không nên mở hoặc tải tệp này xuống +@@ -141,7 +141,7 @@ + Nhận trợ giúp về ChromeOS + Chrome - + ChromeOS Flex không đồng bộ hoá được dữ liệu của bạn do xảy ra lỗi khi đăng nhập. +-Google ChromeOS ++Google Chrome OS + Thao tác này sẽ tạo một hồ sơ mới trên Chrome cho + Vui lòng đóng tất cả cửa sổ của Google Chrome và thử lại. + Bạn đã cài đặt Chrome phiên bản +diff --git a/components/strings/components_strings_da.xtb b/components/strings/components_strings_da.xtb +index ba52e56898db..9756551c5981 100644 +--- a/components/strings/components_strings_da.xtb ++++ b/components/strings/components_strings_da.xtb +@@ -2064,7 +2064,7 @@ Ellers vil det blive blokeret af dine privatlivsindstillinger. Det giver det ind + – tryk på Tab-tasten og derefter Enter for at finde din enhed på Google-kontoen + Knappen "Del denne fane" – tryk på Enter for at dele denne fane ved at dele linket, oprette en QR-kode, caste m.m. + Oprettet: +-Nutid ++Præsenter + Nyheder + Musikinstrumenter + Forrige +diff --git a/ios/chrome/share_extension/strings/resources/ios_share_extension_strings_hi.xtb b/ios/chrome/share_extension/strings/resources/ios_share_extension_strings_hi.xtb +index afcb2bc08a1a..d6928a5f14e1 100644 +--- a/ios/chrome/share_extension/strings/resources/ios_share_extension_strings_hi.xtb ++++ b/ios/chrome/share_extension/strings/resources/ios_share_extension_strings_hi.xtb +@@ -3,7 +3,7 @@ + + APPLICATION_NAME यह लिंक संसाधित नहीं कर सकता. + Chrome में खोलें +-पठन सूची में जोड़ें ++रीडिंग लिस्ट में जोड़ें + बुकमार्क में जोड़ें + ठीक है + जोड़ा गया +diff --git a/ios/chrome/widget_kit_extension/strings/resources/ios_widget_kit_extension_strings_te.xtb b/ios/chrome/widget_kit_extension/strings/resources/ios_widget_kit_extension_strings_te.xtb +index ab3f5b7da36e..ec5e2ffc324a 100644 +--- a/ios/chrome/widget_kit_extension/strings/resources/ios_widget_kit_extension_strings_te.xtb ++++ b/ios/chrome/widget_kit_extension/strings/resources/ios_widget_kit_extension_strings_te.xtb +@@ -11,7 +11,7 @@ + Chrome డినో + వాయిస్ సెర్చ్ + త్వరిత చర్యలు +-సెర్చ్ ++Search + సెర్చ్ చేయండి లేదా + URLను టైప్ చేయండి + QR కోడ్‌ను స్కాన్ చేయండి +diff --git a/remoting/resources/remoting_strings_te.xtb b/remoting/resources/remoting_strings_te.xtb +index a0b9bb7529fd..e7a20200384d 100644 +--- a/remoting/resources/remoting_strings_te.xtb ++++ b/remoting/resources/remoting_strings_te.xtb +@@ -183,7 +183,7 @@ + కామెంట్ చేయండి + మీరు మీ కంప్యూటర్‌ను చూడటానికి, నియంత్రించడానికి ను అనుమతించదలిచారా? + సెషన్ క్రాష్ అయింది లేదా ప్రారంభించడంలో విఫలమైంది. రిమోట్ కంప్యూటర్‍‌లో ~/.chrome-remote-desktop-session ఉన్నట్లయితే, ఇది ముందుభాగంలో దీర్ఘకాలం అమలయ్యే డెస్క్‌టాప్ ఎన్విరాన్మెంట్ లేదా విండో మేనేజర్ వంటి ప్రక్రియలను ప్రారంభిస్తుందని నిర్ధారించుకోండి. +-గోప్యతా విధానం ++గోప్యతా పాలసీ + ఆడియోను క్యాప్చర్ చేసి, Chrome రిమోట్ డెస్క్‌టాప్ క్లయింట్‌లో స్ట్రీమ్ చేయడానికి మైక్రోఫోన్ యాక్సెస్ అవసరం. + మీరు మీ రిమోట్ పరికరానికి కనెక్ట్ అయ్యారు. మెనూను తెరవడానికి, దయచేసి నాలుగు వేళ్లతో స్క్రీన్‌పై నొక్కండి. + మరోసారి ఈ పరికరం నుండి ఈ హోస్ట్‌కు కనెక్ట్ చేస్తున్నప్పుడు PINను అడగవద్దు. +diff --git a/ui/chromeos/translations/ui_chromeos_strings_fi.xtb b/ui/chromeos/translations/ui_chromeos_strings_fi.xtb +index 6254446547d3..364331d04f8d 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_fi.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_fi.xtb +@@ -347,7 +347,7 @@ + Kiivi + Äänisoitin + Lataa mobiiliprofiili, verkko /, , +-englanti (Iso-Britannia) ++englanti (Yhdistynyt kuningaskunta) + foneettinen bangla + Nimi + englanti (Yhdysvallat), Workman-näppäimistö +@@ -838,7 +838,7 @@ + Lataa, + Jaettu minulle + Jäävesi +-englanti (Iso-Britannia), Dvorak-näppäimistö ++englanti (Yhdistynyt kuningaskunta), Dvorak-näppäimistö + on jaettu sinulle. Et voi poistaa sitä, koska et ole tiedoston omistaja. + Käynnistetään… + Määritä +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0022-Incrementing-VERSION-to-102.0.5005.133.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0022-Incrementing-VERSION-to-102.0.5005.133.patch new file mode 100644 index 000000000000..743d8d570034 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0022-Incrementing-VERSION-to-102.0.5005.133.patch @@ -0,0 +1,28 @@ +From e669776aaff0500402deff6cc913bd9da8c625f9 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Sat, 18 Jun 2022 01:00:34 +0000 +Subject: [PATCH 22/59] Incrementing VERSION to 102.0.5005.133 + +Change-Id: Ie8378adafa00bb27c17be361f3d0874d0e14781a +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3708486 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1181} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 5fded03cba08..a5342e3d2eec 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=132 ++PATCH=133 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0023-Incrementing-VERSION-to-102.0.5005.134.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0023-Incrementing-VERSION-to-102.0.5005.134.patch new file mode 100644 index 000000000000..944c9f181d7b --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0023-Incrementing-VERSION-to-102.0.5005.134.patch @@ -0,0 +1,28 @@ +From ed5754b4c3d57efb6431210105b09243c39873a5 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Sun, 19 Jun 2022 01:00:33 +0000 +Subject: [PATCH 23/59] Incrementing VERSION to 102.0.5005.134 + +Change-Id: I084efc295ca7a75c3a03e7095b0740e89d55018f +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3708489 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1182} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index a5342e3d2eec..fbc5358205d1 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=133 ++PATCH=134 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0024-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0024-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..e982a6a92086 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0024-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,41 @@ +From 2f6ab4ecaef3d22e0f7c821d6b17991c7cf45ab8 Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Sun, 19 Jun 2022 14:31:30 +0000 +Subject: [PATCH 24/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: I7ae4bba78ca7e8c92621ed59d5f577e62d2c3e8f +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3710701 +Auto-Submit: Ben Mason +Bot-Commit: Rubber Stamper +Commit-Queue: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1183} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + components/strings/components_strings_ky.xtb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/components/strings/components_strings_ky.xtb b/components/strings/components_strings_ky.xtb +index a82d704e80b6..7f2feae5c2fe 100644 +--- a/components/strings/components_strings_ky.xtb ++++ b/components/strings/components_strings_ky.xtb +@@ -1245,7 +1245,7 @@ + Купуя мазмун бөлүшүлбөй жатат + Көп функционалдуу түпкүч + сайты жакын жердеги Bluetooth түзмөктөрүн скандаганы жатат. Төмөнкү түзмөктөр табылды: +-Текшерүү кодун киргизиңиз ++Ырастоо кодун киргизиңиз + Бул сайттагы бүлдүргүчтөр түзмөгүңүздөгү маалыматыңызды (мисалы, сүрөттөр, сырсөздөр, билдирүүлөр жана насыя карталары) уурдап же жок кыла турган коркунучтуу программаларды орнотууга аракет кылышы мүмкүн. + Сиз көрсөткөн үлгүлөрдү колдонууга болбойт, анткени DnsOverHttpsMode саясатында ката кетти. + Төлөм ыкмаларын башкаруу... +@@ -2778,7 +2778,7 @@ + Төлөм аягына чыккан жок + , , издөө сунушу + Муштум менен өйдө жакка эки жолу уруу +-Текшерүү кодун киргизиңиз ++Ырастоо кодун киргизиңиз + Кайра аракет кылып көрүү + Барактын өлчөмү: + Бүттү +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0025-Incrementing-VERSION-to-102.0.5005.135.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0025-Incrementing-VERSION-to-102.0.5005.135.patch new file mode 100644 index 000000000000..62c6532d7471 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0025-Incrementing-VERSION-to-102.0.5005.135.patch @@ -0,0 +1,28 @@ +From 57fb37eeee77178901e6c5b2377234785f586dbf Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Mon, 20 Jun 2022 01:00:49 +0000 +Subject: [PATCH 25/59] Incrementing VERSION to 102.0.5005.135 + +Change-Id: Ifd8eb9c59904953d7b533ff4fd6d9a17789ca5dd +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3707948 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1184} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index fbc5358205d1..308402a8004d 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=134 ++PATCH=135 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0026-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0026-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..5179df84300a --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0026-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,262 @@ +From b0cf7f5fab707c0208ad880dfdbee932dac4b335 Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Mon, 20 Jun 2022 14:24:51 +0000 +Subject: [PATCH 26/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: I41d7abb1adc3a2eaa1066f814b8899076a14f1ea +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3714549 +Commit-Queue: Rubber Stamper +Auto-Submit: Ben Mason +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1185} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + .../strings/shortcut_viewer_strings_no.xtb | 2 +- + chrome/app/resources/chromium_strings_no.xtb | 2 +- + chrome/app/resources/generated_resources_it.xtb | 2 +- + chrome/app/resources/generated_resources_iw.xtb | 4 ++-- + chrome/app/resources/generated_resources_no.xtb | 10 +++++----- + chrome/app/resources/google_chrome_strings_no.xtb | 2 +- + .../accessibility/strings/accessibility_strings_fa.xtb | 2 +- + .../strings/translations/android_chrome_strings_no.xtb | 4 ++-- + components/strings/components_strings_no.xtb | 10 +++++----- + ios/chrome/app/strings/resources/ios_strings_no.xtb | 2 +- + ui/strings/translations/ui_strings_fa.xtb | 2 +- + 11 files changed, 21 insertions(+), 21 deletions(-) + +diff --git a/ash/shortcut_viewer/strings/shortcut_viewer_strings_no.xtb b/ash/shortcut_viewer/strings/shortcut_viewer_strings_no.xtb +index 60814b0c8b29..bee3a3cdbcf7 100644 +--- a/ash/shortcut_viewer/strings/shortcut_viewer_strings_no.xtb ++++ b/ash/shortcut_viewer/strings/shortcut_viewer_strings_no.xtb +@@ -191,7 +191,7 @@ + og så eller + Åpne en fil i nettleseren + Gå til fane 1–8 +-Slett nettleserdata ++Slett nettlesingsdata + Gå til begynnelsen av dokumentet + eller + Rotér skjermen 90 grader +diff --git a/chrome/app/resources/chromium_strings_no.xtb b/chrome/app/resources/chromium_strings_no.xtb +index 54159b6cb38b..2c87eb737f7d 100644 +--- a/chrome/app/resources/chromium_strings_no.xtb ++++ b/chrome/app/resources/chromium_strings_no.xtb +@@ -328,7 +328,7 @@ Chromium kan ikke gjenopprette innstillingen dine. + Chromium er utdatert + {0,plural, =1{Chromium startes på nytt om en time}other{Chromium startes på nytt om # timer}} + Åpne linken i en ny &fane i Chromium +-Vil du slette all nettleserdata også? ++Vil du slette all nettlesingsdata også? + Underveis i prøveprosjektene kan du se og fjerne interesseemnene som nettsteder bruker for å vise deg annonser. Chromium anslår interessene dine basert på den nylige nettleserloggen din. + Systemadministratoren din har konfigurert Chromium til å åpne en annen nettleser når du går til . + Start på nytt for å oppdatere &Chromium +diff --git a/chrome/app/resources/generated_resources_it.xtb b/chrome/app/resources/generated_resources_it.xtb +index 91b21778fa2a..9303b12179b5 100644 +--- a/chrome/app/resources/generated_resources_it.xtb ++++ b/chrome/app/resources/generated_resources_it.xtb +@@ -4491,7 +4491,7 @@ e Ctrl + Alt + Riduzione luminosità per diminuire lo zoom. + Possono inviare notifiche + {COUNT,plural, =1{Link}other{# link}} + Accedi automaticamente ai siti e alle app usando le credenziali memorizzate. Se la funzionalità è disattivata, ti verrà chiesta una conferma ogni volta che vuoi accedere a un sito o a un'app. +-Registra dispositivi kiosk o insegna ++Registra dispositivi kiosk o segnaletica + Tu + Preferiti nascosti + Riferimento pagina oltre i limiti. Il limite è +diff --git a/chrome/app/resources/generated_resources_iw.xtb b/chrome/app/resources/generated_resources_iw.xtb +index 68a5ad9bb773..5a57465d9121 100644 +--- a/chrome/app/resources/generated_resources_iw.xtb ++++ b/chrome/app/resources/generated_resources_iw.xtb +@@ -1058,7 +1058,7 @@ + כתובת אתר + בדף הזה אפשר לשלוט על המידע שאתרים יכולים להשתמש בו ולהציג אותו (מיקום, מצלמה, חלונות קופצים ועוד) + האישורים שלך +-בעת ההפעלה ++כשפותחים את הדפדפן + ‏שליחה של חלק מקובצי ה-Cookie והחיפושים משורת כתובת האתר ומתיבת החיפוש אל מנוע החיפוש שהוגדר כברירת מחדל + זמן אמת + ‏כדי להפעיל נתונים של '', יש להתחבר תחילה לרשת Wi-Fi +@@ -2312,7 +2312,7 @@ + המערכת משתפת את הכרטיסייה הזו עם + ייתכן שספקים מסוימים חוסמים את התכונה הזו. + ניתן גם לדלג על הכניסה ולגלוש כאורח. +-כרטיסייה חדשה מצד ימין ++כרטיסייה חדשה מצד שמאל + שפת הדף: + גופן הטקסט + גלישה בטוחה (מגנה עליך ועל המכשיר מפני אתרים מסוכנים) +diff --git a/chrome/app/resources/generated_resources_no.xtb b/chrome/app/resources/generated_resources_no.xtb +index 0d10527fa225..5315653a9912 100644 +--- a/chrome/app/resources/generated_resources_no.xtb ++++ b/chrome/app/resources/generated_resources_no.xtb +@@ -187,7 +187,7 @@ + Gi nytt navn + Snarveien er lagt til + Tilkoblingen din er alltid sikker så lenge Chrome ikke forteller deg noe annet +-For å slette nettleserdata på alle synkroniserte enheter og Google-kontoen din går du til innstillingene for synkronisering. ++For å slette nettlesingsdata på alle synkroniserte enheter og Google-kontoen din går du til innstillingene for synkronisering. + &Skriv ut... + Nettsteder som ikke har lov til å redigere filer eller mapper på enheten + Tilpasset +@@ -200,7 +200,7 @@ + Inaktive oppvåkninger + Loggen er ikke lastet opp. + {NUM_FILES,plural, =1{Tilgang til en fil som er lagret på datamaskinen din}other{Tilgang til # filer som er lagret på datamaskinen din}} +-For å slette nettleserdata på kun denne enheten, men beholde dataene på Google-kontoen, må du logge ut. ++For å slette nettlesingsdata på kun denne enheten, men beholde dataene på Google-kontoen, må du logge ut. + {0,plural, =1{Du blir logget av automatisk om # sekund. + krever at smartkortet blir stående i.}other{Du blir logget av automatisk om # sekunder. + krever at smartkortet blir stående i.}} +@@ -1599,7 +1599,7 @@ Du kan administrere innstillingene for denne kontoen ved å installere Family Li + endre data du kopierer og limer inn + Varsler + Fanen er flyttet til gruppen – +-For å slette nettleserdata på alle synkroniserte enheter og Google-kontoen din må du skrive inn passordfrasen din. ++For å slette nettlesingsdata på alle synkroniserte enheter og Google-kontoen din må du skrive inn passordfrasen din. + Toppvalg for deg + Avinstaller + Vilkår for bruk av Google Play +@@ -4101,7 +4101,7 @@ og Ctrl + Alt + lysstyrke ned for å zoome ut. + / + Bekreft tilgangen + Denne utvidelsen inneholder skadelig programvare. +-For å slette nettleserdata på alle synkroniserte enheter og Google-kontoen din må du logge på. ++For å slette nettlesingsdata på alle synkroniserte enheter og Google-kontoen din må du logge på. + Enhetsprogramvare + Om personlig tilpasning av annonser + Dette fører til at alle dataene på sikkerhetsnøkkelen, inkludert PIN-koden, blir slettet +@@ -7152,7 +7152,7 @@ Oppbevar nøkkelfilen på et trygt sted. Du får bruk for den når du skal oppre + Administrer språk i ChromeOS Flex-innstillingene + Oppdater utvidelser nå + Låseskjerm og pålogging +-Slett nettleserdata ++Slett nettlesingsdata + Microsoft nøkkelgjenoppretting + Laster ned , + Størrelse +diff --git a/chrome/app/resources/google_chrome_strings_no.xtb b/chrome/app/resources/google_chrome_strings_no.xtb +index c061b599aa86..ae7f2483a61f 100644 +--- a/chrome/app/resources/google_chrome_strings_no.xtb ++++ b/chrome/app/resources/google_chrome_strings_no.xtb +@@ -362,7 +362,7 @@ Tillatelser du allerede har gitt nettsteder og apper, kan gjelde for denne konto + {0,plural, =0{En Chrome-oppdatering er tilgjengelig}=1{En Chrome-oppdatering er tilgjengelig}other{En Chrome-oppdatering har vært tilgjengelig i # dager}} + ChromeOS Flex-system + Google Chrome krever Windows 7 eller nyere. +-Vil du slette all nettleserdata også? ++Vil du slette all nettlesingsdata også? + For å bruke endringene dine må du starte Chrome på nytt + Chrome kan anslå interessene dine basert på nettleserloggen din fra de siste ukene. Denne informasjonen blir værende på enheten din. + Oppdater Chrome for å starte synkroniseringen +diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_fa.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_fa.xtb +index 8b75a0e734f4..38e6ff918c4b 100644 +--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_fa.xtb ++++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_fa.xtb +@@ -10,7 +10,7 @@ + حالت چسبان غیرفعال شد + سپس + خطوط: +-برای جلو رفتن بین موارد موجود در صفحه، «جستجو» + پیکان راست یا برای پرش به عقب «جستجو» + پیکان چپ را فشار دهید. برای رفتن به خط بعدی، «جستجو» + پیکان پایین را فشار دهید. برای رفتن به خط قبلی، از «جستجو» + پیکان بالا استفاده کنید. اگر به موردی رسیدید که می‌خواهید روی آن کلیک کنید، روی «جستجو» + فاصله فشار دهید. ++برای جلو رفتن بین موارد موجود در صفحه، «جستجو» + کلید «راست‌بر» یا برای پرش به عقب «جستجو» + کلید «چپ‌بر» را فشار دهید. برای رفتن به خط بعدی، «جستجو» + کلید «پایین‌بر» را فشار دهید. برای رفتن به خط قبلی، از «جستجو» + کلید «بالابر» استفاده کنید. اگر به موردی رسیدید که می‌خواهید روی آن کلیک کنید، روی «جستجو» + کلید «فاصله» فشار دهید. + rwhdr + ورودی نامعتبر + سبز جنگلی +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb +index afb4e74aa488..418884acaf3f 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb +@@ -1203,7 +1203,7 @@ Tillitstokener gir bedre personvern på nettet og kan ikke brukes til å finne u + Leverandørens nettadresse + Reduksjon i nettsøppel og svindel + Feil passordfrase +-Slett nettleserdata ++Slett nettlesingsdata + Passordsynkronisering fungerer ikke + Slår på Bluetooth … + Avbryt +@@ -1274,7 +1274,7 @@ Tillitstokener gir bedre personvern på nettet og kan ikke brukes til å finne u + Blokkér mens du er inkognito + Fjern også Chrome-dataene dine fra denne enheten + Tilbakestill alt på siden til standardstørrelsen +-Slett nettleserdata ++Slett nettlesingsdata + Velg hvor du vil laste ned til + Følger + Ny mappe +diff --git a/components/strings/components_strings_no.xtb b/components/strings/components_strings_no.xtb +index 8786400bdfc9..c45f1e99d37e 100644 +--- a/components/strings/components_strings_no.xtb ++++ b/components/strings/components_strings_no.xtb +@@ -347,7 +347,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i + Lys + Startark + liggende +-Slett nettleserdata ++Slett nettlesingsdata + automatiske nedlastinger + Ugyldig forespørsel eller forespørselsparametere + Nettsteder du besøker, og hvor mye tid du bruker på dem +@@ -973,7 +973,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i + Listeoppføringen «»: Språket er ukjent eller støttes ikke. + – trykk på Tab og deretter på Enter for å kjøre en sikkerhetssjekk i Chrome-innstillingene + Angi en gyldig utløpsdato +-Slett nettleserdata ++Slett alle nettlesingsdata + Vis fullstendig logg + Hvis programmet allerede har fått tillatelse til å bruke nettverket, kan du prøve + å fjerne det fra listen og så legge det til på nytt. +@@ -1637,7 +1637,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i + Denne tjeneren kunne ikke bevise at den er . Sikkerhetssertifikatet til tjeneren er ikke gyldig for øyeblikket. Dette kan være forårsaket av en feilkonfigurasjon eller en angriper som lytter på tilkoblingen din. + Dette nettstedet mottar interessene dine fra Chrome for å kunne vise deg mer relevante annonser + Hylle 4 +-Slett nettleserdata ++Slett nettlesingsdata + vil sende deg varsler + Spansk + Fjern bokmerke +@@ -1674,7 +1674,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i + Smarthus + Kantstifting + Prc6 (konvolutt) +-Knappen «Slett nettleserdata» – trykk på Enter for å tømme nettleserloggen, slette informasjonskapsler, tømme bufferen med mer i Chrome-innstillingene ++Knappen «Slett nettlesingsdata» – trykk på Enter for å tømme nettleserloggen, slette informasjonskapsler, tømme bufferen med mer i Chrome-innstillingene + Vis «»-delen + Flåte + Den forespurte artikkelen ble ikke funnet. +@@ -2549,7 +2549,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i + Administrer passord + {NUM_CARDS,plural, =1{Dette kortet og den tilknyttede faktureringsadressen lagres. Du kan bruke det når du er logget på .}other{Disse kortene og de tilknyttede faktureringsadressene lagres. Du kan bruke dem når du er logget på .}} + Angripere på dette nettstedet prøver kanskje å lure deg til å gjøre farlige ting som å installere programvare eller avsløre personopplysningene dine (for eksempel passord, telefonnumre eller kredittkortinformasjon). +-Slett nettleserdata ++Slett nettlesingsdata + Skuff 15 + – trykk på Tab og deretter på Enter for å opprette et nytt skjema i Google Skjemaer raskt + Beskjær etter jobben +diff --git a/ios/chrome/app/strings/resources/ios_strings_no.xtb b/ios/chrome/app/strings/resources/ios_strings_no.xtb +index a3c0edf9089f..aab590e9581f 100644 +--- a/ios/chrome/app/strings/resources/ios_strings_no.xtb ++++ b/ios/chrome/app/strings/resources/ios_strings_no.xtb +@@ -106,7 +106,7 @@ Søkemotoren din er . Se eventuelt instruksjonene deres om + Mest besøkt + Kortinnehaverens navn + Slett mappen +-Slett nettleserdata ++Slett nettlesingsdata + Sikkerhetskode + Lagt til i leselisten + For å sikre at du alltid har tilgang til de synkroniserte dataene dine, må du bekrefte at det er deg +diff --git a/ui/strings/translations/ui_strings_fa.xtb b/ui/strings/translations/ui_strings_fa.xtb +index cd0ff067ffc5..e0075ad5bd34 100644 +--- a/ui/strings/translations/ui_strings_fa.xtb ++++ b/ui/strings/translations/ui_strings_fa.xtb +@@ -73,7 +73,7 @@ + Ctrl + بازیابی + پیمایش به اینجا +-پیکان پایین ++کلید پایین‌بر + {DAYS,plural, =1{۱ روز}one{# روز}other{# روز}} + برقراری تماس از + نمایشگر داخلی +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0027-Incrementing-VERSION-to-102.0.5005.136.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0027-Incrementing-VERSION-to-102.0.5005.136.patch new file mode 100644 index 000000000000..401ade5d8b85 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0027-Incrementing-VERSION-to-102.0.5005.136.patch @@ -0,0 +1,28 @@ +From 6c7428424278ac118e85629322ec5a95e2599c55 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Tue, 21 Jun 2022 01:00:33 +0000 +Subject: [PATCH 27/59] Incrementing VERSION to 102.0.5005.136 + +Change-Id: Ie4d1e8587dfee142a28feeca12d5bec472864d23 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3715930 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1186} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 308402a8004d..ef7c482c8d42 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=135 ++PATCH=136 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0028-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0028-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..73625cba63a9 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0028-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,256 @@ +From 3b1594ca494c25b4239ab6267e6bfa9b0e70e5ae Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Tue, 21 Jun 2022 14:41:48 +0000 +Subject: [PATCH 28/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: I69c09a61449fcfa7f00f44ffd4ea1be8977654e7 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3715113 +Commit-Queue: Rubber Stamper +Auto-Submit: Ben Mason +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1187} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + ash/strings/ash_strings_es-419.xtb | 2 +- + ash/strings/ash_strings_nl.xtb | 4 ++-- + .../camera_app_ui/resources/strings/camera_strings_eu.xtb | 4 ++-- + chrome/app/resources/generated_resources_ar.xtb | 4 ++-- + chrome/app/resources/generated_resources_es-419.xtb | 4 ++-- + chrome/app/resources/generated_resources_it.xtb | 2 +- + chrome/app/resources/generated_resources_vi.xtb | 2 +- + chrome/app/resources/google_chrome_strings_ar.xtb | 2 +- + .../strings/translations/android_chrome_strings_ar.xtb | 5 +++-- + .../strings/translations/android_chrome_strings_es-419.xtb | 2 +- + .../strings/translations/android_chrome_strings_vi.xtb | 2 +- + components/strings/components_strings_ar.xtb | 3 ++- + components/strings/components_strings_vi.xtb | 4 ++-- + 13 files changed, 21 insertions(+), 19 deletions(-) + +diff --git a/ash/strings/ash_strings_es-419.xtb b/ash/strings/ash_strings_es-419.xtb +index 6d3ed2bac68e..450b9ac09bea 100644 +--- a/ash/strings/ash_strings_es-419.xtb ++++ b/ash/strings/ash_strings_es-419.xtb +@@ -98,7 +98,7 @@ Estas son algunas de las cosas que puedes probar para comenzar. + Activar o desactivar la Luz nocturna. + Ve las fotos y el contenido multimedia recientes del teléfono en tu + Sí +-Se configuró la transmisión de app. Una vez que comiences, aparecerán aquí las apps iniciadas recientemente. ++Se configuró la transmisión de app. Una vez que comiences, aparecerán aquí las apps utilizadas recientemente. + Mostrar la configuración de idioma + El volumen está silenciado. + Izquierda +diff --git a/ash/strings/ash_strings_nl.xtb b/ash/strings/ash_strings_nl.xtb +index c87186593fdb..182e3161c8f4 100644 +--- a/ash/strings/ash_strings_nl.xtb ++++ b/ash/strings/ash_strings_nl.xtb +@@ -95,7 +95,7 @@ Hier zijn wat voorbeelden van wat je kunt proberen om aan de slag te gaan.Nachtverlichting aan- of uitzetten. + Recente foto's en media van je telefoon bekijken op je + Ja +-App-streaming is nu ingesteld. Als je aan de slag gaat, zie je hier recent gelanceerde apps. ++App-streaming is nu ingesteld. Als je aan de slag gaat, zie je hier recent gebruikte apps. + Taalinstellingen bekijken + Volume staat uit. + Links +@@ -1328,7 +1328,7 @@ Nieuwe installatie + Positie van menu wijzigen + Invoermethoden + Scherm is verwijderd +-Geluid van telefoon uitzetten ++Telefoon dempen + Lacros-update beschikbaar + Profiel toevoegen. Wacht een paar minuten. + Een tweede gebruiker inloggen wordt niet ondersteund als de Lacros-browser actief is. Gebruik in plaats daarvan een tweede browserprofiel in Lacros of sluit Lacros en probeer het opnieuw. +diff --git a/ash/webui/camera_app_ui/resources/strings/camera_strings_eu.xtb b/ash/webui/camera_app_ui/resources/strings/camera_strings_eu.xtb +index 974898761fe5..b6c3fd8ed3b8 100644 +--- a/ash/webui/camera_app_ui/resources/strings/camera_strings_eu.xtb ++++ b/ash/webui/camera_app_ui/resources/strings/camera_strings_eu.xtb +@@ -46,7 +46,7 @@ + Memoria atzitzeko baimena duten aplikazioek atzi ditzakete argazkiak eta bideoak. + Mugitu eskuinera + Aldatu bideoak grabatzeko modura +-30 f/s ++30 fps + Sareta mota + Mikrofonoa + Esteka kopiatu da +@@ -123,7 +123,7 @@ Irudi edo bideoaren kalitateari buruzko iritzia eman nahi baduzu, erantsi argazk + Behera eta ezkerrera mugitzen ari da + Laguntza + Utzi +-60 f/s ++60 fps + Dokumentuaren beheko eskuinaldeko ertza + Grabatu bideo normal bat + Dokumentuaren goiko eskuinaldeko ertza +diff --git a/chrome/app/resources/generated_resources_ar.xtb b/chrome/app/resources/generated_resources_ar.xtb +index 62cc88d48a2e..4eec1516e8e1 100644 +--- a/chrome/app/resources/generated_resources_ar.xtb ++++ b/chrome/app/resources/generated_resources_ar.xtb +@@ -2835,7 +2835,7 @@ + وُضِعَ هذا الجهاز التجريبي في الحالة "غير متوفِّر". + الصفحة الرئيسية + ‏إعدادات طابعات CUPS +-‏علاقتك مع Google ++‏أنت وGoogle + حدث خطأ أثناء بدء تشغيل خدمة الآلة الافتراضية. يُرجى إعادة المحاولة. + ‏شبكات Wi-Fi المتاحة + فحص النوافذ المنبثقة +@@ -4157,7 +4157,7 @@ + لا تتوفر ميزة التدقيق الإملائي للغات التي اخترتها. + تعديل موقع إلكتروني + مجموعة لم تتم تسميتها - +-‏ابحث في الصور عبر "عدسة Google" ++‏البحث باستخدام الصورة بواسطة "عدسة Google" + ‏الاطّلاع على كل خيارات البطاقة في القسم تخصيص Chrome + جارٍ الاتصال بالحاوية + عند النقر على "الإضافة" +diff --git a/chrome/app/resources/generated_resources_es-419.xtb b/chrome/app/resources/generated_resources_es-419.xtb +index feff984e5988..dd4a406234dd 100644 +--- a/chrome/app/resources/generated_resources_es-419.xtb ++++ b/chrome/app/resources/generated_resources_es-419.xtb +@@ -3860,7 +3860,7 @@ y Ctrl + Alt + Disminuir brillo para alejar. + Seleccionado, contenido adicional: de + Tickets + No puede mostrar imágenes +-Quitar el texto destacado ++Dejar de destacar + Obtener información sobre cómo actualizar las aplicaciones + {NUM_TABS,plural, =1{Activar el sonido del sitio}other{Activar el sonido de los sitios}} + Accede a tu Asistente con "Hey Google" +@@ -6134,7 +6134,7 @@ Puedes asignar varios interruptores a esta acción. + está utilizando la cámara + Ver código fuente + Error de instalación +-Quitar el texto destacado ++Dejar de destacar + Di "OK Google" otra vez. + Agregar nueva página + No es posible configurar el modo después de que se ha configurado la ventana. +diff --git a/chrome/app/resources/generated_resources_it.xtb b/chrome/app/resources/generated_resources_it.xtb +index 9303b12179b5..f02f15ad7396 100644 +--- a/chrome/app/resources/generated_resources_it.xtb ++++ b/chrome/app/resources/generated_resources_it.xtb +@@ -5569,7 +5569,7 @@ Puoi assegnare più sensori a questa azione. + I siti non possono interromperti quando chiedono di poter inviare notifiche + &Apri tutti i Preferiti + Ottimizza video a schermo intero +- potrà poi: ++Su : + Caratteri + file + Attiva rete mobile +diff --git a/chrome/app/resources/generated_resources_vi.xtb b/chrome/app/resources/generated_resources_vi.xtb +index fa4aee89f515..20f391850ad6 100644 +--- a/chrome/app/resources/generated_resources_vi.xtb ++++ b/chrome/app/resources/generated_resources_vi.xtb +@@ -7618,7 +7618,7 @@ Giữ tệp khóa của bạn ở nơi an toàn. Bạn sẽ cần tệp khóa đ + Các trang web thường kết nối với thiết bị USB để áp dụng những tính năng như in tài liệu hoặc lưu vào thiết bị lưu trữ + Tính năng nhận chiết khấu đang tắt. Bạn có thể bật tính năng này trong trình đơn tùy chỉnh + được hỗ trợ bằng phần cứng +-Địa chỉ và các tùy chọn khác ++Địa chỉ và các lựa chọn khác + Một chương trình khác trên máy tính của bạn đã thêm một tiện ích có thể thay đổi cách Chrome hoạt động. + Đã thay thế + &Chung +diff --git a/chrome/app/resources/google_chrome_strings_ar.xtb b/chrome/app/resources/google_chrome_strings_ar.xtb +index 334de19ffada..88a11e1504fe 100644 +--- a/chrome/app/resources/google_chrome_strings_ar.xtb ++++ b/chrome/app/resources/google_chrome_strings_ar.xtb +@@ -9,7 +9,7 @@ + ‏هذا Chrome الخاص بك + ‏مَن يستخدم متصفِّح Chrome؟ + ‏تعذّرت إعادة التحميل Chrome +-‏لمحة عن نظام التشغيل Chrome ++‏لمحة عن ChromeOS + ‏&فتح في Chrome + ‏في حال عدم عرض أحد الإعدادات على هذه الصفحة، انتقِل إلى + إعدادات نظام التشغيل ChromeOS Flex +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb +index f1e93ecf3279..d6c7f88702f7 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb +@@ -285,7 +285,8 @@ + تم حذف من العناصر + ‏يتم إرسال عناوين URL التي تزورها إلى Google + عرض نسخة بلا اتصال من هذه الصفحة +-ملفات تعريف الارتباط وبيانات المواقع ++ملفات تعريف الارتباط وبيانات المواقع الإلكترونية ++ + ‏يمكنك استخدام هذا الجهاز اللوحي لتسجيل الدخول إلى حساب Google على جهاز الكمبيوتر الذي يعرض رمز الاستجابة السريعة هذا. + يؤثر سجلّ تصفّحك في الإعلانات التي تظهر لك. + معاينات الفيديوهات +@@ -499,7 +500,7 @@ + توقّع الأحداث الخطيرة قبل حدوثها والتحذير منها + فتح شريط البحث + ‏تستهلك هذه الصفحة مساحة كبيرة من الذاكرة، لذلك أوقفها Chrome مؤقتًا. +-‏علاقتك مع Google ++‏أنت وGoogle + إعدادات الترجمة + عليك ضبط قفل الشاشة لاستخدام هذا الجهاز كمفتاح أمان. + المس للبحث +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb +index 09044681e203..e3a1afabb6c2 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb +@@ -667,7 +667,7 @@ Es posible que tu cuenta de Google tenga otros formularios de historial de naveg + Tarjeta virtual + Última sincronización: + Recibirás mejores sugerencias en la barra de direcciones. +-Quitar el texto destacado ++Dejar de destacar + Abrir una pestaña nueva + Compartir solo la imagen + Descargas +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb +index 6a066d11e660..21185014952d 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb +@@ -1361,7 +1361,7 @@ Mã thông báo tin cậy giúp cải thiện quyền riêng tư trên web và + Bắt đầu Trò chơi Khủng long + Mã hóa dữ liệu đã đồng bộ hóa bằng cụm mật khẩu đồng bộ hóa của riêng bạn + Hãy đảm bảo có kết nối Internet +-Địa chỉ và các tùy chọn khác ++Địa chỉ và các lựa chọn khác + Khi bạn bật Hộp cát về quyền riêng tư, các trang web có thể dùng kỹ thuật bảo vệ quyền riêng tư theo mô tả ở đây để cung cấp nội dung và dịch vụ của mình. Các kỹ thuật này gồm có những biện pháp thay thế cho hoạt động theo dõi trên nhiều trang web. Theo thời gian, chúng tôi có thể bổ sung nhiều chế độ dùng thử khác. + + Các nhà quảng cáo và nhà xuất bản có thể dùng kỹ thuật FLoC. +diff --git a/components/strings/components_strings_ar.xtb b/components/strings/components_strings_ar.xtb +index 9f063901bfe7..1fe4b2bf4b35 100644 +--- a/components/strings/components_strings_ar.xtb ++++ b/components/strings/components_strings_ar.xtb +@@ -595,7 +595,8 @@ + المشرف أعاد تشغيل الجهاز + مستند واحد + ‏تعيين Chrome كمتصفح تلقائي +-ملفات تعريف الارتباط وبيانات المواقع ++ملفات تعريف الارتباط وبيانات المواقع الإلكترونية ++ + تصميم وتطوير مواقع إلكترونية + قيمة السياسة غير صحيحة. + أرسل استجابة غير صالحة. +diff --git a/components/strings/components_strings_vi.xtb b/components/strings/components_strings_vi.xtb +index 737992fdba54..efc072d84b36 100644 +--- a/components/strings/components_strings_vi.xtb ++++ b/components/strings/components_strings_vi.xtb +@@ -1658,7 +1658,7 @@ Nếu bạn từ chối, chế độ cài đặt quyền riêng tư của bạn + Thêm địa chỉ hợp lệ + Thiết bị trên đám mây + Thực phẩm và đồ uống +-Địa chỉ và các tùy chọn khác ++Địa chỉ và các lựa chọn khác + Trang web trên mạng nội bộ của công ty, tổ chức hoặc trường học này có URL tương tự như trang web bên ngoài. + + Hãy thử liên hệ với quản trị viên hệ thống của bạn. +@@ -2708,7 +2708,7 @@ Thông tin chi tiết bổ sung: + Vô thời hạn + Mã hóa dữ liệu đã đồng bộ hóa bằng cụm mật khẩu đồng bộ hóa của riêng bạn + {COUNT,plural, =1{1 thẻ tín dụng}other{# thẻ tín dụng}} +-Địa chỉ và các tùy chọn khác ++Địa chỉ và các lựa chọn khác + Hiển thị thông tin chi tiết của nhà phát triển + Dập ghim dưới cùng bên trái + Để sử dụng thẻ từ Tài khoản Google, hãy đăng nhập vào Chrome +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0029-M102-infra-add-free_space-dimension-to-Chromium.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0029-M102-infra-add-free_space-dimension-to-Chromium.patch new file mode 100644 index 000000000000..5dcbfc8c4e8c --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0029-M102-infra-add-free_space-dimension-to-Chromium.patch @@ -0,0 +1,842 @@ +From 2b4864af666871315c7eb8e7a5bf2c59968f62d0 Mon Sep 17 00:00:00 2001 +From: Keybo Qian +Date: Tue, 21 Jun 2022 16:43:59 +0000 +Subject: [PATCH 29/59] [M102][infra] add "free_space" dimension to Chromium + builderless CI builders. + +This dimension is currently only used by these builders, and is +"standard" by default. + +(cherry picked from commit 2dfe967762507d2d6757b8e776e4efaea27d46ed) + +Bug: 1311317 +Change-Id: Id73fb6b2d4af9e072bf3f8b85498191ce5a00718 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3703737 +Reviewed-by: Garrett Beaty +Commit-Queue: Keybo Qian +Cr-Original-Commit-Position: refs/heads/main@{#1015340} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3714800 +Cr-Commit-Position: refs/branch-heads/5005@{#1188} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + .../config/generated/luci/cr-buildbucket.cfg | 82 +++++++++++++++++++ + infra/config/lib/builders.star | 22 +++++ + infra/config/subprojects/chromium/ci.star | 3 +- + .../subprojects/flakiness/flakiness.star | 3 +- + infra/config/subprojects/goma/goma.star | 3 +- + .../config/subprojects/reclient/reclient.star | 3 +- + 6 files changed, 112 insertions(+), 4 deletions(-) + +diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg +index e784735e10fc..3e6522e93ca2 100644 +--- a/infra/config/generated/luci/cr-buildbucket.cfg ++++ b/infra/config/generated/luci/cr-buildbucket.cfg +@@ -28,6 +28,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -110,6 +111,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -192,6 +194,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -274,6 +277,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -356,6 +360,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -438,6 +443,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -520,6 +526,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -602,6 +609,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -684,6 +692,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -766,6 +775,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -848,6 +858,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -930,6 +941,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -1012,6 +1024,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -1094,6 +1107,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:2" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -1176,6 +1190,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:2" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -1257,6 +1272,7 @@ buckets { + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Mac" + dimensions: "pool:luci.chromium.gpu.ci" + exe { +@@ -1338,6 +1354,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:2" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -1420,6 +1437,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:2" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -1502,6 +1520,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Windows" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -1584,6 +1603,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:2" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -1666,6 +1686,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:2" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -1748,6 +1769,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Windows" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -1830,6 +1852,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:2" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -1912,6 +1935,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:2" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -1994,6 +2018,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -2076,6 +2101,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -2158,6 +2184,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -2239,6 +2266,7 @@ buckets { + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Mac" + dimensions: "pool:luci.chromium.gpu.ci" + exe { +@@ -2320,6 +2348,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Windows" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -2402,6 +2431,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:1" +@@ -2484,6 +2514,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -2566,6 +2597,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -2648,6 +2680,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -2730,6 +2763,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -2812,6 +2846,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -2894,6 +2929,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:2" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -2976,6 +3012,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -3058,6 +3095,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -3140,6 +3178,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -3232,6 +3271,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -3314,6 +3354,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -3556,6 +3597,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:2" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -3638,6 +3680,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:2" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -3720,6 +3763,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -3802,6 +3846,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -3884,6 +3929,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -3966,6 +4012,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -4048,6 +4095,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -4130,6 +4178,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -4212,6 +4261,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -4294,6 +4344,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -4376,6 +4427,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -4458,6 +4510,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -4540,6 +4593,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -4622,6 +4676,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Windows-10" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -5028,6 +5083,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:2" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" +@@ -5110,6 +5166,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Windows-10" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -5192,6 +5249,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -5274,6 +5332,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -5356,6 +5415,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -5438,6 +5498,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -5520,6 +5581,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -5602,6 +5664,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -5765,6 +5828,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -5847,6 +5911,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -5929,6 +5994,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -6011,6 +6077,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -6093,6 +6160,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -6175,6 +6243,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -6257,6 +6326,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -6339,6 +6409,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -6421,6 +6492,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -6584,6 +6656,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -6918,6 +6991,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -7000,6 +7074,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -7082,6 +7157,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -7164,6 +7240,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -7246,6 +7323,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -7328,6 +7406,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -7410,6 +7489,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -7492,6 +7572,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +@@ -7815,6 +7896,7 @@ buckets { + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" ++ dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" +diff --git a/infra/config/lib/builders.star b/infra/config/lib/builders.star +index d52370a10a90..226ed51648ba 100644 +--- a/infra/config/lib/builders.star ++++ b/infra/config/lib/builders.star +@@ -171,6 +171,15 @@ xcode = struct( + x13wk = xcode_enum("13a1030dwk"), + ) + ++# Free disk space in a machine reserved for build tasks. ++# The values in this enum will be used to populate bot dimension "free_space", ++# and each bot will allocate a corresponding amount of free disk space based on ++# the value of the dimension through "bot_config.py". ++free_space = struct( ++ standard = "standard", ++ high = "high", ++) ++ + ################################################################################ + # Implementation details # + ################################################################################ +@@ -297,6 +306,7 @@ defaults = args.defaults( + auto_builder_dimension = args.COMPUTE, + builder_group = None, + builderless = args.COMPUTE, ++ free_space = None, + cores = None, + cpu = None, + fully_qualified_builder_dimension = False, +@@ -345,6 +355,7 @@ def builder( + triggered_by = args.DEFAULT, + os = args.DEFAULT, + builderless = args.DEFAULT, ++ free_space = args.DEFAULT, + builder_cache_name = None, + override_builder_dimension = None, + auto_builder_dimension = args.DEFAULT, +@@ -425,6 +436,10 @@ def builder( + builderless: a boolean indicating whether the builder runs on + builderless machines. If True, emits a 'builderless:1' dimension. By + default, considered True iff `os` refers to a linux OS. ++ free_space: an enum that indicates the amount of free disk space reserved ++ in a machine for incoming build tasks. This value is used to create ++ a "free_space" dimension, and this dimension is appended to only ++ builderless builders. + override_builder_dimension: a string to assign to the "builder" + dimension. Ignores any other "builder" and "builderless" dimensions + that would have been assigned. +@@ -600,6 +615,12 @@ def builder( + if builderless: + dimensions["builderless"] = "1" + ++ free_space = defaults.get_value("free_space", free_space) ++ if free_space: ++ dimensions["free_space"] = free_space ++ elif free_space and free_space != args.DEFAULT: ++ fail("\'free_space\' dimension can only be specified for builderless builders") ++ + auto_builder_dimension = defaults.get_value( + "auto_builder_dimension", + auto_builder_dimension, +@@ -808,4 +829,5 @@ builders = struct( + os = os, + sheriff_rotations = sheriff_rotations, + xcode = xcode, ++ free_space = free_space, + ) +diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star +index e11b770d24e7..d19117eff5f4 100644 +--- a/infra/config/subprojects/chromium/ci.star ++++ b/infra/config/subprojects/chromium/ci.star +@@ -3,7 +3,7 @@ + # found in the LICENSE file. + + load("//lib/branches.star", "branches") +-load("//lib/builders.star", "cpu") ++load("//lib/builders.star", "builders", "cpu") + load("//lib/ci.star", "ci") + load("//lib/consoles.star", "consoles") + load("//project.star", "settings") +@@ -14,6 +14,7 @@ ci.defaults.set( + build_numbers = True, + cpu = cpu.X86_64, + triggered_by = ["chromium-gitiles-trigger"], ++ free_space = builders.free_space.standard, + ) + + luci.bucket( +diff --git a/infra/config/subprojects/flakiness/flakiness.star b/infra/config/subprojects/flakiness/flakiness.star +index ee158bc947d3..c2b4fe86cb00 100644 +--- a/infra/config/subprojects/flakiness/flakiness.star ++++ b/infra/config/subprojects/flakiness/flakiness.star +@@ -2,7 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-load("//lib/builders.star", "os") ++load("//lib/builders.star", "builders", "os") + load("//lib/ci.star", "ci") + load("//lib/consoles.star", "consoles") + +@@ -15,6 +15,7 @@ ci.defaults.set( + # TODO(jeffyoon): replace with smaller scoped service account, and update + # below for bucket ACL + service_account = "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com", ++ free_space = builders.free_space.standard, + ) + + luci.bucket( +diff --git a/infra/config/subprojects/goma/goma.star b/infra/config/subprojects/goma/goma.star +index be425023964f..54a585a691a4 100644 +--- a/infra/config/subprojects/goma/goma.star ++++ b/infra/config/subprojects/goma/goma.star +@@ -3,7 +3,7 @@ + # found in the LICENSE file. + + load("//lib/builder_config.star", "builder_config") +-load("//lib/builders.star", "builder", "cpu", "defaults", "goma", "os", "xcode") ++load("//lib/builders.star", "builder", "builders", "cpu", "defaults", "goma", "os", "xcode") + load("//lib/structs.star", "structs") + + luci.bucket( +@@ -32,6 +32,7 @@ defaults.executable.set("recipe:chromium") + defaults.execution_timeout.set(3 * time.hour) + defaults.os.set(os.LINUX_DEFAULT) + defaults.pool.set("luci.chromium.ci") ++defaults.free_space.set(builders.free_space.standard) + defaults.service_account.set( + "goma-release-testing@chops-service-accounts.iam.gserviceaccount.com", + ) +diff --git a/infra/config/subprojects/reclient/reclient.star b/infra/config/subprojects/reclient/reclient.star +index ad898d6cb6cd..fb789ff4b504 100644 +--- a/infra/config/subprojects/reclient/reclient.star ++++ b/infra/config/subprojects/reclient/reclient.star +@@ -3,7 +3,7 @@ + # found in the LICENSE file. + + load("//lib/builder_config.star", "builder_config") +-load("//lib/builders.star", "cpu", "os") ++load("//lib/builders.star", "builders", "cpu", "os") + load("//lib/ci.star", "ci") + load("//lib/consoles.star", "consoles") + load("//lib/structs.star", "structs") +@@ -41,6 +41,7 @@ ci.defaults.set( + "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + ), + triggered_by = ["chromium-gitiles-trigger"], ++ free_space = builders.free_space.standard, + ) + + consoles.console_view( +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0030-infra-Migrate-configs-for-android_cronet-src-side.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0030-infra-Migrate-configs-for-android_cronet-src-side.patch new file mode 100644 index 000000000000..be69947ac358 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0030-infra-Migrate-configs-for-android_cronet-src-side.patch @@ -0,0 +1,197 @@ +From 5e676bfdc8c9329ee5f749098383586c7ad87bde Mon Sep 17 00:00:00 2001 +From: Gregory Guterman +Date: Wed, 22 Jun 2022 00:21:37 +0000 +Subject: [PATCH 30/59] [infra] Migrate configs for android_cronet src-side. + +(cherry picked from commit cd384a5c8ef5736f97ae34982f8d3e38a1a64e8f) + +Bug: 1317104 +Change-Id: I17c2d9d869ea57125d92d4278a820a6ff87b05ff +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3656312 +Commit-Queue: Garrett Beaty +Auto-Submit: Gregory Guterman +Reviewed-by: Garrett Beaty +Cr-Original-Commit-Position: refs/heads/main@{#1011734} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3717523 +Cr-Commit-Position: refs/branch-heads/5005@{#1189} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + .../ci/android-cronet-arm-rel/properties.json | 53 +++++++++++++++++++ + .../try/android_cronet/properties.json | 48 +++++++++++++++++ + .../chromium/ci/chromium.android.star | 23 ++++++++ + .../try/tryserver.chromium.android.star | 6 +++ + 4 files changed, 130 insertions(+) + +diff --git a/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json b/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json +index d68921bae929..4c1bee9eeb18 100644 +--- a/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json ++++ b/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json +@@ -1,4 +1,57 @@ + { ++ "$build/chromium_tests_builder_config": { ++ "builder_config": { ++ "builder_db": { ++ "entries": [ ++ { ++ "builder_id": { ++ "bucket": "ci", ++ "builder": "android-cronet-arm-rel", ++ "project": "chromium" ++ }, ++ "builder_spec": { ++ "build_gs_bucket": "chromium-android-archive", ++ "builder_group": "chromium.android", ++ "execution_mode": "COMPILE_AND_TEST", ++ "legacy_android_config": { ++ "config": "main_builder" ++ }, ++ "legacy_chromium_config": { ++ "apply_configs": [ ++ "cronet_builder", ++ "mb" ++ ], ++ "build_config": "Release", ++ "config": "android", ++ "target_bits": 32, ++ "target_platform": "android" ++ }, ++ "legacy_gclient_config": { ++ "apply_configs": [ ++ "android", ++ "enable_reclient" ++ ], ++ "config": "chromium" ++ } ++ } ++ } ++ ] ++ }, ++ "builder_ids": [ ++ { ++ "bucket": "ci", ++ "builder": "android-cronet-arm-rel", ++ "project": "chromium" ++ } ++ ], ++ "mirroring_builder_group_and_names": [ ++ { ++ "builder": "android_cronet", ++ "group": "tryserver.chromium.android" ++ } ++ ] ++ } ++ }, + "$build/reclient": { + "instance": "rbe-chromium-trusted", + "jobs": 500, +diff --git a/infra/config/generated/builders/try/android_cronet/properties.json b/infra/config/generated/builders/try/android_cronet/properties.json +index d90599ce7370..160fc425c26a 100644 +--- a/infra/config/generated/builders/try/android_cronet/properties.json ++++ b/infra/config/generated/builders/try/android_cronet/properties.json +@@ -1,4 +1,52 @@ + { ++ "$build/chromium_tests_builder_config": { ++ "builder_config": { ++ "builder_db": { ++ "entries": [ ++ { ++ "builder_id": { ++ "bucket": "ci", ++ "builder": "android-cronet-arm-rel", ++ "project": "chromium" ++ }, ++ "builder_spec": { ++ "build_gs_bucket": "chromium-android-archive", ++ "builder_group": "chromium.android", ++ "execution_mode": "COMPILE_AND_TEST", ++ "legacy_android_config": { ++ "config": "main_builder" ++ }, ++ "legacy_chromium_config": { ++ "apply_configs": [ ++ "cronet_builder", ++ "mb" ++ ], ++ "build_config": "Release", ++ "config": "android", ++ "target_bits": 32, ++ "target_platform": "android" ++ }, ++ "legacy_gclient_config": { ++ "apply_configs": [ ++ "android", ++ "enable_reclient" ++ ], ++ "config": "chromium" ++ } ++ } ++ } ++ ] ++ }, ++ "builder_ids": [ ++ { ++ "bucket": "ci", ++ "builder": "android-cronet-arm-rel", ++ "project": "chromium" ++ } ++ ], ++ "is_compile_only": true ++ } ++ }, + "$build/goma": { + "enable_ats": true, + "rpc_extra_params": "?prod", +diff --git a/infra/config/subprojects/chromium/ci/chromium.android.star b/infra/config/subprojects/chromium/ci/chromium.android.star +index a2e046777d7a..8905963349cd 100644 +--- a/infra/config/subprojects/chromium/ci/chromium.android.star ++++ b/infra/config/subprojects/chromium/ci/chromium.android.star +@@ -632,6 +632,29 @@ ci.builder( + + ci.builder( + name = "android-cronet-arm-rel", ++ builder_spec = builder_config.builder_spec( ++ gclient_config = builder_config.gclient_config( ++ config = "chromium", ++ apply_configs = [ ++ "android", ++ "enable_reclient", ++ ], ++ ), ++ chromium_config = builder_config.chromium_config( ++ config = "android", ++ apply_configs = [ ++ "cronet_builder", ++ "mb", ++ ], ++ build_config = builder_config.build_config.RELEASE, ++ target_bits = 32, ++ target_platform = builder_config.target_platform.ANDROID, ++ ), ++ android_config = builder_config.android_config( ++ config = "main_builder", ++ ), ++ build_gs_bucket = "chromium-android-archive", ++ ), + branch_selector = branches.STANDARD_MILESTONE, + console_view_entry = consoles.console_view_entry( + category = "cronet|arm", +diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.android.star b/infra/config/subprojects/chromium/try/tryserver.chromium.android.star +index 94cd15630829..994a280cb969 100644 +--- a/infra/config/subprojects/chromium/try/tryserver.chromium.android.star ++++ b/infra/config/subprojects/chromium/try/tryserver.chromium.android.star +@@ -555,6 +555,12 @@ try_.builder( + + try_.builder( + name = "android_cronet", ++ mirrors = [ ++ "ci/android-cronet-arm-rel", ++ ], ++ try_settings = builder_config.try_settings( ++ is_compile_only = True, ++ ), + branch_selector = branches.STANDARD_MILESTONE, + builderless = not settings.is_main, + main_list_view = "try", +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0031-M102-Print-Preview-Fix-missing-destinations-in-dialo.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0031-M102-Print-Preview-Fix-missing-destinations-in-dialo.patch new file mode 100644 index 000000000000..e89cbe5a6d1a --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0031-M102-Print-Preview-Fix-missing-destinations-in-dialo.patch @@ -0,0 +1,77 @@ +From b81edbf02a6ab821e51ba5128b3984fc2e8653c2 Mon Sep 17 00:00:00 2001 +From: Rebekah Potter +Date: Wed, 22 Jun 2022 00:39:37 +0000 +Subject: [PATCH 31/59] [M102] Print Preview: Fix missing destinations in + dialog + +Print Preview's dialog fails to display destinations in cases where all +printers have already been loaded into the backing destination store +before the dialog is opened. This can happen if users have all printer +types represented in their recent printers + system default printer, as +such printers are pre-loaded at startup to populate the dropdown. Note +the system default printer is a local/native printer. + +This bug previously did not manifest because users did not have an +extension, privet, and cloud printer all in their recent destinations. +However, with the removal of privet and cloud printer types, this bug +could be triggered by simply having a recent extension printer + having +a system default native printer. + +(cherry picked from commit 76e2dc10bc759469dcaea1604a582fd2c6bd55fa) + +Bug: 1330678 +Change-Id: Ia0684b908690cca6691c9d44ad94296dadfb9536 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3696838 +Reviewed-by: Lei Zhang +Commit-Queue: Rebekah Potter +Reviewed-by: Demetrios Papadopoulos +Cr-Original-Commit-Position: refs/heads/main@{#1012174} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3698743 +Cr-Commit-Position: refs/branch-heads/5005@{#1190} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + .../resources/print_preview/ui/destination_dialog.ts | 7 ++++++- + .../resources/print_preview/ui/destination_dialog_cros.ts | 7 ++++++- + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/chrome/browser/resources/print_preview/ui/destination_dialog.ts b/chrome/browser/resources/print_preview/ui/destination_dialog.ts +index 64ededd87966..2b8ad610c167 100644 +--- a/chrome/browser/resources/print_preview/ui/destination_dialog.ts ++++ b/chrome/browser/resources/print_preview/ui/destination_dialog.ts +@@ -174,8 +174,13 @@ export class PrintPreviewDestinationDialogElement extends + this.metrics_ = MetricsContext.destinationSearch(); + } + this.$.dialog.showModal(); +- this.loadingDestinations_ = this.destinationStore === undefined || ++ const loading = this.destinationStore === undefined || + this.destinationStore.isPrintDestinationSearchInProgress; ++ if (!loading) { ++ // All destinations have already loaded. ++ this.updateDestinations_(); ++ } ++ this.loadingDestinations_ = loading; + this.metrics_.record(DestinationSearchBucket.DESTINATION_SHOWN); + } + +diff --git a/chrome/browser/resources/print_preview/ui/destination_dialog_cros.ts b/chrome/browser/resources/print_preview/ui/destination_dialog_cros.ts +index a164805bde4a..4c7b53daafc0 100644 +--- a/chrome/browser/resources/print_preview/ui/destination_dialog_cros.ts ++++ b/chrome/browser/resources/print_preview/ui/destination_dialog_cros.ts +@@ -293,8 +293,13 @@ export class PrintPreviewDestinationDialogCrosElement extends + this.metrics_ = MetricsContext.destinationSearch(); + } + this.$.dialog.showModal(); +- this.loadingDestinations_ = this.destinationStore === undefined || ++ const loading = this.destinationStore === undefined || + this.destinationStore.isPrintDestinationSearchInProgress; ++ if (!loading) { ++ // All destinations have already loaded. ++ this.updateDestinations_(); ++ } ++ this.loadingDestinations_ = loading; + this.metrics_.record(DestinationSearchBucket.DESTINATION_SHOWN); + } + +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0032-Incrementing-VERSION-to-102.0.5005.137.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0032-Incrementing-VERSION-to-102.0.5005.137.patch new file mode 100644 index 000000000000..56054aa33e82 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0032-Incrementing-VERSION-to-102.0.5005.137.patch @@ -0,0 +1,28 @@ +From d40c1c345c6c905254498a9622b8cd89297dd0f2 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Wed, 22 Jun 2022 01:00:40 +0000 +Subject: [PATCH 32/59] Incrementing VERSION to 102.0.5005.137 + +Change-Id: I6f8a3d5bee97dabe89b4660a3b1593418851091f +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3715133 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1191} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index ef7c482c8d42..96ae4bfab48f 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=136 ++PATCH=137 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0033-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0033-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..69e64d7a7bfb --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0033-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,807 @@ +From 1bca1691d091c6cf48d290bdb6abdf1549a228c2 Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Wed, 22 Jun 2022 14:27:36 +0000 +Subject: [PATCH 33/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: I05ee4132f9aa5149e40cfae97d5aad0f20fe33e4 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3715647 +Auto-Submit: Ben Mason +Bot-Commit: Rubber Stamper +Commit-Queue: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1192} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + ash/strings/ash_strings_fa.xtb | 2 +- + ash/strings/ash_strings_uk.xtb | 2 +- + .../android_webapk_strings_uk.xtb | 2 +- + .../app/resources/generated_resources_eu.xtb | 2 +- + .../app/resources/generated_resources_hu.xtb | 2 +- + .../app/resources/generated_resources_te.xtb | 4 +- + .../app/resources/generated_resources_zu.xtb | 4 +- + .../android_chrome_strings_ml.xtb | 2 +- + .../android_chrome_strings_uk.xtb | 2 +- + chromeos/strings/chromeos_strings_ml.xtb | 2 +- + chromeos/strings/chromeos_strings_te.xtb | 4 +- + .../translations/browser_ui_strings_uk.xtb | 2 +- + components/strings/components_strings_uk.xtb | 2 +- + components/strings/components_strings_zu.xtb | 8 +- + .../translations/ui_chromeos_strings_zu.xtb | 152 +++++++++--------- + 15 files changed, 96 insertions(+), 96 deletions(-) + +diff --git a/ash/strings/ash_strings_fa.xtb b/ash/strings/ash_strings_fa.xtb +index 297fa02a8dcc..c36debe1ef20 100644 +--- a/ash/strings/ash_strings_fa.xtb ++++ b/ash/strings/ash_strings_fa.xtb +@@ -374,7 +374,7 @@ + دکمه میزان صدا فعال است، با تغییر وضعیت صامت می‌شود. + + مورد دیگر + میکروفن +-کاهش صدای محیط ++حذف نوفه زمینه + پنجره از میز به میز منتقل شد + راه‌اندازی + ‏What can you do?‎ (چه کاری می‌توانی انجام دهی؟) +diff --git a/ash/strings/ash_strings_uk.xtb b/ash/strings/ash_strings_uk.xtb +index f6bbbbe31669..9762292db963 100644 +--- a/ash/strings/ash_strings_uk.xtb ++++ b/ash/strings/ash_strings_uk.xtb +@@ -179,7 +179,7 @@ + Ввести текст + Не вдається записати контент + Файли живих субтитрів завантажено +-Докладніше про останнє оновлення додатка ++Докладніше про останнє оновлення + Поточний робочий стіл + Шукайте , файли, додатки тощо. + Введіть повідомлення +diff --git a/chrome/android/webapk/strings/translations/android_webapk_strings_uk.xtb b/chrome/android/webapk/strings/translations/android_webapk_strings_uk.xtb +index 49c8e02806af..f8d0f3f47a65 100644 +--- a/chrome/android/webapk/strings/translations/android_webapk_strings_uk.xtb ++++ b/chrome/android/webapk/strings/translations/android_webapk_strings_uk.xtb +@@ -5,7 +5,7 @@ + Щоб запустити , потрібен такий додаток: + Щоб запустити , потрібен веб-переглядач + Виберіть веб-переглядач, який підтримує цей додаток: +-Налаштування сайту ++Налаштування сайтів + \nНе підтримується + INSTALL + ЗАКРИТИ +diff --git a/chrome/app/resources/generated_resources_eu.xtb b/chrome/app/resources/generated_resources_eu.xtb +index 3bb13d525fef..51abc041b8fc 100644 +--- a/chrome/app/resources/generated_resources_eu.xtb ++++ b/chrome/app/resources/generated_resources_eu.xtb +@@ -7099,7 +7099,7 @@ Esleipen bat kentzeko, berriz, sakatu esleipen bat daukan erabilerraztasun-eteng + Bilatu gainetik + Chrome Education-eko gailu hau G Suite for Education-eko kontu batekin erregistratu behar duzu. Beste kontu bat erregistratzeko, joan g.co/workspace/edusignup helbidera. + Gako pribatua +-Zure Google-ko kontuen saioa amaituko da. Aurrerantzean, ez dira sinkronizatuko laster-markak, historia, pasahitzak eta beste. ++Zure Google-ko kontuetako saioa amaituko da. Aurrerantzean, ez dira sinkronizatuko laster-markak, historia, pasahitzak eta beste. + Erreproduzigai IDa: + Aurrekargatu orriak azkarrago arakatzeko eta bilatzeko + Erantsi iradokizuna bilaketa-koadroan +diff --git a/chrome/app/resources/generated_resources_hu.xtb b/chrome/app/resources/generated_resources_hu.xtb +index e47d89c523d0..b68b291d5234 100644 +--- a/chrome/app/resources/generated_resources_hu.xtb ++++ b/chrome/app/resources/generated_resources_hu.xtb +@@ -3850,7 +3850,7 @@ Elindítja a következőt: ?Tegnap tekintette meg + A rendszergazda letiltotta a bejelentkezést + Mindig, minden webhelyen +-Lezárási képernyő megjelenítése, az alvó módból történő felébresztéskor ++Lezárási képernyő megjelenítése az alvó módból történő felébresztéskor + Kilépés a -ból + A beállítások visszaállítása + Kattintson a csoport nevére a kibontásához vagy összecsukásához +diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb +index 8e1f07c5d7d1..8af2cc506d63 100644 +--- a/chrome/app/resources/generated_resources_te.xtb ++++ b/chrome/app/resources/generated_resources_te.xtb +@@ -3305,7 +3305,7 @@ + క్విక్ కమాండ్స్ + ఎల్లప్పుడూ సిస్టమ్ వ్యూయర్‌తో తెరువు + రీసెట్ చేసి హానికరమైన వాటిని తీసివేయండి +-Google ఫోటోలు ++Google Photos + దయచేసి మళ్లీ ప్రయత్నించండి. మీకు ఈ ఎర్రర్ మళ్లీ కనిపిస్తే, దయచేసి మీ మద్దతు ప్రతినిధిని సంప్రదించండి. + డిస్‌ప్లే + స్క్రీన్ కాంటెక్ట్స్ +@@ -5615,7 +5615,7 @@ + ప్రాక్సీ స్క్రిప్ట్‌లో హోస్ట్‌ను పరిష్కరిస్తోంది... + సమీపంలో పరికరాలు ఏవీ కనుగొనబడలేదు + అన్ని కంటైనర్లు +-ఆల్బమ్‌లను క్రియేట్ చేయడానికి, 'Google ఫోటోలు'కు వెళ్లండి ++ఆల్బమ్‌లను క్రియేట్ చేయడానికి, 'Google Photos'కు వెళ్లండి + ఎక్కువగా సందర్శించేవి + ఎడమవైపు బటన్ + మీ పరికరంలో ఇన్‌స్టాల్ చేయబడిన ఫాంట్‌లను ఉపయోగించడానికి సైట్‌లకు అనుమతి లేదు +diff --git a/chrome/app/resources/generated_resources_zu.xtb b/chrome/app/resources/generated_resources_zu.xtb +index b56ac630b7ab..65e9fa24ccf3 100644 +--- a/chrome/app/resources/generated_resources_zu.xtb ++++ b/chrome/app/resources/generated_resources_zu.xtb +@@ -3700,7 +3700,7 @@ I- idinga ukuba ugcine ikhadi lakho elimsathi lifakiwe.Leli sayithi lifinyelela kuzinzwa zakho zokunyakaza noma zokukhanya. + Azikho izimvume ezishintshwe kamuva + Engeza izigxivizo zeminwe +-Ulimi lokufaka lasekuqaleni isi-Chinese ++Ulimi lokufaka lasekuqaleni Chinese + Umunwe 3 + Qedela ukusetha efonini yakho + Fihla iphasiwedi +@@ -7564,7 +7564,7 @@ Gcina ifayela lakho elingukhiye endaweni evikelekile. Uzolidinga ukuze udale izi + Bonisa njengethebhu + Imiphumela yosesho ye-'' + Hlela okufakwa kusichazamazwi +-Okushuthwe Bukhoma (I-English kuphela) ++Okushuthwe Bukhoma (English kuphela) + Ithreyi alikho + Ivinjwe Ukuvikela Okuthuthukile + Guqula +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb +index 3a8d37507b34..5ae3d51061a1 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb +@@ -904,7 +904,7 @@ + സ്വകാര്യതാ സാൻഡ്‌ബോക്‌സ് ട്രയലുകൾ ഇപ്പോഴും സജീവ വികസന ഘട്ടത്തിലാണ്, തിരഞ്ഞെടുത്ത പ്രദേശങ്ങളിൽ അത് ലഭ്യമാണ്. ഇപ്പോഴത്തേക്ക്, മൂന്നാം കക്ഷി കുക്കികൾ പോലുള്ള നിലവിലെ വെബ് സാങ്കേതിക വിദ്യകൾ ഉപയോഗിക്കുന്നത് തുടരുന്നതിനൊപ്പം സൈറ്റുകൾക്ക് സ്വകാര്യതാ സാൻഡ്‌ബോക്‌സ് പരീക്ഷിക്കാവുന്നതാണ്. + അടുത്ത ടാബിലേക്ക് പോകുക + അടയ്ക്കുക +-സ്വപ്രേരിതം ++സ്വയമേവ + കൂടുതൽ + ഒരു അജ്ഞാതമായ പിശക് കാരണം ഡൗൺലോഡ് ചെയ്യാനായില്ല. + YY +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb +index 0c3702ce921c..29714f8bb56e 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb +@@ -568,7 +568,7 @@ + Поточна мова пристрою + Ознайомтеся з Chrome + Список параметрів спільного доступу відкрито на всю висоту. +-Налаштування сайту ++Налаштування сайтів + Служба не доступна. Повторіть спробу пізніше. + Мови + Відкрити в новій вкладці +diff --git a/chromeos/strings/chromeos_strings_ml.xtb b/chromeos/strings/chromeos_strings_ml.xtb +index 8c796fdfd303..f91c5b11ebb5 100644 +--- a/chromeos/strings/chromeos_strings_ml.xtb ++++ b/chromeos/strings/chromeos_strings_ml.xtb +@@ -449,7 +449,7 @@ + സ്‌കാനറിന്റെ ഡോക്യുമെന്റ് ഫീഡർ ശൂന്യമാണ്. ഡോക്യുമെന്റുകൾ ചേർത്ത് വീണ്ടും ശ്രമിക്കുക. + അടയ്ക്കുക + അജ്ഞാത ഐഡന്‍റിറ്റി +-സ്വപ്രേരിതം ++സ്വയമേവ + പ്രിന്റ് ചെയ്യാനായില്ല - പേപ്പർ ജാമായിരിക്കുന്നു + ഗ്രേസ്‌കെയിൽ + പൂർത്തിയാക്കാൻ നിങ്ങളുടെ പഴയ പാസ്‌വേഡും പുതിയ പാസ്‌വേഡും നൽകുക +diff --git a/chromeos/strings/chromeos_strings_te.xtb b/chromeos/strings/chromeos_strings_te.xtb +index 590de1511a1c..49ee3f34cf34 100644 +--- a/chromeos/strings/chromeos_strings_te.xtb ++++ b/chromeos/strings/chromeos_strings_te.xtb +@@ -263,7 +263,7 @@ + నలుపు మరియు తెలుపు + RMA సర్వర్‌ను అన్‌లాక్ చేయండి + HTTP ఫైర్‌వాల్ +-Google ఫోటోలు ++Google Photos + స్కానర్ ఆన్ చేయబడి ఉందని, అలాగే నెట్‌వర్క్ లేదా ప్రత్యక్ష కనెక్షన్ ద్వారా అందుబాటులో ఉందని నిర్ధారించుకోండి + ఫోటో తీయండి + విఫలమైంది +@@ -498,7 +498,7 @@ + ద్వారా మేనేజ్ చేయబడుతోంది + ఆగిపోయింది - కాగితం జామ్ అయింది + Google Searchలో ఫలితాన్ని చూడండి +-ఆల్బమ్‌లను క్రియేట్ చేయడానికి, 'Google ఫోటోలు'కు వెళ్లండి ++ఆల్బమ్‌లను క్రియేట్ చేయడానికి, 'Google Photos'కు వెళ్లండి + బ్యాటరీ ఛార్జ్ అయ్యే రేట్‌ను పరీక్షించడానికి, కొంత వ్యవధి పాటు మీ బ్యాటరీని తగ్గనివ్వండి + అన్వేషణ + తెలియని WiFi భద్రతా ప్రోటోకాల్ +diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_uk.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_uk.xtb +index 9686c58a9344..602bf901bd4c 100644 +--- a/components/browser_ui/strings/android/translations/browser_ui_strings_uk.xtb ++++ b/components/browser_ui/strings/android/translations/browser_ui_strings_uk.xtb +@@ -126,7 +126,7 @@ + Дозволити файли cookie для конкретного сайту. + Наступна композиція + Спрощений перегляд веб-сторінок +-Налаштування сайту ++Налаштування сайтів + Запитувати, перш ніж дозволяти сайтам переглядати й змінювати інформацію на пристроях NFC (рекомендовано) + Відкрити налаштування доступу до моїх геоданих + Коли надходитимуть сповіщення, пристрій може вібрувати +diff --git a/components/strings/components_strings_uk.xtb b/components/strings/components_strings_uk.xtb +index a619ef148117..7b7f783cf635 100644 +--- a/components/strings/components_strings_uk.xtb ++++ b/components/strings/components_strings_uk.xtb +@@ -1155,7 +1155,7 @@ + {COUNT,plural, =1{Сторінка 1}one{Сторінка {COUNT}}few{Сторінка {COUNT}}many{Сторінка {COUNT}}other{Сторінка {COUNT}}} + Відбитки + Пурпуровий +-Налаштування сайту ++Налаштування сайтів + Недійсний підпис для підтвердження + – , + Завжди показувати +diff --git a/components/strings/components_strings_zu.xtb b/components/strings/components_strings_zu.xtb +index f540914060f7..81baebec6ab4 100644 +--- a/components/strings/components_strings_zu.xtb ++++ b/components/strings/components_strings_zu.xtb +@@ -837,7 +837,7 @@ Lokhu uma kungenjalo kuzovinjelwa izilungiselelo zakho zobumfihlo. Lokhu kuzovum + Izimali mboleko zabafundi kanye nezimali zasekolishi + I-Groovy + Ukukhangisa nokumaketha +-Isi-French ++French + Ukuyeka emsebenzini nepenshini + , cindezela u-Tab bese u-Enter ukuze udale umcimbi omusha ngokushesha ku-Google Calendar + Funda mayelana namakhadi we-virtual +@@ -1636,7 +1636,7 @@ Lokhu uma kungenjalo kuzovinjelwa izilungiselelo zakho zobumfihlo. Lokhu kuzovum + Isitaki esingu-4 + Sula idatha yokudlulisa amehlo... + I- ifuna ukukuthumelela izaziso +-Isi-Spanish ++Spanish + Susa ibhukhimakhi + Iphutha lokuqinisekisa i-schema ku-"": + I-oda elingemuva libheke phezulu +@@ -2655,7 +2655,7 @@ Imininingwane engeziwe: + Umthombo + Izifunda zamaphakhi nezingadi + I-Wi-Fi oyisebenzisayo () ingakudinga ukuthi uvakashele ku-. +-Isi-Japanese ++Japanese + Isigaba se-"" esibonisiwe + Goqa ngohafu + Isithombe esincane +@@ -2752,7 +2752,7 @@ Imininingwane engeziwe: + Londoloza leli khadi kule divayisi + izinzwa zokunyakaza + Isifinyezo se-oda, , Imininingwane eminingi +-I-English ++English + Sebenzisa ulwazi olumayelana nezikrini zakho ukuze uvule futhi ubeke amawindi + Isiginesha + Amabhizinisi nomkhakha +diff --git a/ui/chromeos/translations/ui_chromeos_strings_zu.xtb b/ui/chromeos/translations/ui_chromeos_strings_zu.xtb +index 1f1ddb2eb0b1..474eda5c24ca 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_zu.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_zu.xtb +@@ -10,8 +10,8 @@ + Ingobo yomlando yotiyela wokuminyanisa i-Bzip2 + Iphutha langaphakathi + I-Hangul Romaja +-I-English (US) enekhibhodi yomhleli we-Dvorak +-I-English (US) enekhibhodi enwetshiwe ++English (US) enekhibhodi yomhleli we-Dvorak ++English (US) enekhibhodi enwetshiwe + itholakele. + + Asikho isikhala esanele esitholakalayo kusitoreji sendawo. U- ngaphezulu uyadingeka. +@@ -51,7 +51,7 @@ + Sesha + Funa isilayida + Asikho isitifiketi somsebenzisi +-Isi-Norwegian ++Norwegian + Ukuze udedele amafayela ku-Parallels Desktop, ifayela kufanele lihanjiswe kumafayela e-Windows. + Yabelana ngefolda ne-Parallels Desktop + Umuntu onezimbali +@@ -60,7 +60,7 @@ + Isi-Finnish + I-Swiss + Ayikwazi ukuqamba kabusha i-"". +-I-English (US) enekhibhodi ye-Dvorak ++English (US) enekhibhodi ye-Dvorak + - Umsingathi + Amashidi we-Google + Ivula amafayela e-Linux... +@@ -74,7 +74,7 @@ + Ikhamela + Isi-Portuguese nge-US International keyboard + Isitifiketi somsebenzisi asitholakali ukufakazela ubuqiniso inethiwekhi. +-Isi-Chinese Pinyin ++Chinese Pinyin + Yenza amafayela angu- atholakale ngokungaxhunyiwe kwi-inthanethi + Idivivayisi ye-Chrome + Iphinikhodi ayikho +@@ -88,7 +88,7 @@ + Ingeza Iphrofayela... + Amagama wamasevisi + Isi-German (Germany) +-Isi-Chinese Cangjie ++Chinese Cangjie + izinto ezingu- zikopishiwe. + Bonisa onke amafolda e-Google Play + Ukugugulwa kwamaletha kwesi-Hebrew +@@ -121,7 +121,7 @@ + Iya endaweni yefayela + Phatha kuDrayivu + Ukufometha idrayivu kuzosula yonke idatha elondolozwe kuyo. Lesi senzo asikwazi ukuhlehliswa. +-Isi-Tigrinya ++Tigrinya + Ingobo yomlando ye-RAR + Ingobo yomlando yotiyela eminyanisiwe ye-LZMA + Isi-Russian +@@ -143,7 +143,7 @@ + Isi-Portuguese nge-US International PC keyboard + isi-Sipmlified Chinese + Ingobo yomlando yeziphu +-Isi-Korean ++Korean + Faka nge-Linux + Ingabe ufuna ukususa izinto ze-? + Ayikwazi ukudala ifolda le-"". +@@ -158,7 +158,7 @@ + ikhishiwe. + Lungiselela inethiwekhi + Uhlobo lwefayela alusekelwe. Sicela uvakashele isitolo sewebhu se-Chrome ukuze uthole uhlelo lokusebenza olungavula lolu hlobo lwefayela. +-Isi-Bulgaria ++Bulgarian + Asikho isikhala esanele kusitoreji sendawo. + Landa iphroayela yeselula, Inethiwekhi engu- kwezingu-, + Shintshela ekubukeni kohlu +@@ -203,7 +203,7 @@ + Idlala ku + Faka uhlelo lokusebenza nge-Linux + Inethiwekhi ye-, , , imininingwane +-Isi-Turkish esinekhibhodi ye-F ++Turkish esinekhibhodi ye-F + I-Vietnamese VNI + Nikeza i-Parallels Desktop imvume yokufinyelela amafayela kufolda ye- + Ushizi +@@ -220,22 +220,22 @@ + Azikho izinto ezifana ne-<b>""</b> + Ulwazi + Inwetshwelwe i-US +-Isi-Marathi ++Marathi + Isi-Estonian +-Isi-Mongolian ++Mongolian + Sebenzisa igama elifushane + Ifometha i-... + I-Jellyfish + Namhlanje ngo- + Ibuyisela izinto ezingu-... + Ayikwazanga ukwenza isipele i- +-Isi-French (Canada) ++French (Canada) + Inethiwekhi ye-, , , amandla esignali %, Xhuma + Shintshela ekubukeni kwesithonjana + Isexwayiso: Lamafayela awesikhashana futhi angase asuswe ngokuzenzekelayo ukukhulula isikhala sediski. + Nika amandla i-Google Amadokhumenti angaxhumekile ku-inthanethi ukwenza Amadokhumenti, AmaSpredishithi namaSlayidi kutholakale ngokungaxhunyiwe kwi-inthanethi. + Ukuma komhlaba +-Isi-Chinese Dayi ++Chinese Dayi + Yenza isipele izithombe zakho namavidiyo + Amafayela e-Windows + Yabelana nge- +@@ -254,13 +254,13 @@ + Isi-Portuguese (Brazil) + Izilimi eziningi ze-Canadian + Ubunikazi buzodluliselwa ku-. +-Isi-Irish ++Irish + Umculi ongaziwa + Ilindile +-Isi-French ++French + Ayitholakali + Khetha uhlelo lokusebenza oluzenzakalelayo lwamafayela we-: +-Isi-Arabic ++Arabic + Okuqukethwe + Ayikwazanga ukuvula i-"" + Iyalungiselela +@@ -268,15 +268,15 @@ + Okungaphephanga + Xhuma kule nethiwekhi ukuze ushintshe amasethingi wokukhiya i-SIM + Idivayisi imatasa +-Isi-Georgian +-Isi-Ukrain ++Georgian ++Ukrainian + Izipha i-... + Unyaka okurekhodwe ngawo + Khetha ifolda okumele uyilayishe + Qedile + Isiginci + Ixhunyiwe +-Isi-Nepali ngekhibhodi ye-InScript ++Nepali ngekhibhodi ye-InScript + Inethiwekhi ye-, , , amandla esignali %, kuphethwe umlawuli wakho, xhuma + Yenza kusebenze, i- + Isi-German (Germany) esinekhibhodi ye-Neo 2 +@@ -288,7 +288,7 @@ + izithombe zenziwe isipele ku-Google Drayivu + Isipredishithi se-Google + Hhayi manje +-Isi-Mongolian ++Mongolian + amaphutha. + Inethiwkehi ye-, , , , amandla esignali %, imininingwane + Isi-Portuguese +@@ -296,9 +296,9 @@ + Ifolda + Hamba ku-drive.google.com... + Ukuze uvule amafayela nge-, kukopishe kuqala kufolda lamafayela we-Windows. +-I-English (US) enekhibhodi yamazwe ngamazwe ye-PC ++English (US) enekhibhodi yamazwe ngamazwe ye-PC + Khetha ifayela, bese uguqula ukuvula i- yokufinyelela ungaxhunyiwe ku-inthanethi +-Isi-Lithuanian ++Lithuanian + Konke + Ayikwazanga ukwenza i- itholakale ngokungaxhunyiwe kwi-inthanethi + · +@@ -337,7 +337,7 @@ + Igama + Pakisha nge- + Incazelo +-Isi-French (Canada) esinekhibhodi Yezilimi eziningi ++French (Canada) esinekhibhodi Yezilimi eziningi + Ixhumeka ku- + Ifaka iphrofayela leselula, Inethiwekhi engu- kwangu-, + I-Meta +@@ -347,21 +347,21 @@ + I-Kiwi + Isidlali somsindo + Landa iphrofayela yeselula, Inethiwekhi engu- kwezingu-, , +-I-English (UK) ++English (UK) + I-Bangla Phonetic + Isihloko +-I-English (US) enekhibhodi ye-Workman ++English (US) enekhibhodi ye-Workman + I-PUK engalungile + Yenza kusebenze... +-Isi-Irish ++Irish + I-Unicorn + Vula uhlu lwadlalayo + kuhanjiswe okungu-. + Nika Amandla Ungaxhumekile Ku-inthanethi + I-Google dokhumenti + Ukukhethwa kweziphu +-Isi-Spanish (Latin America) +-Isi-Georgian ++Spanish (Latin America) ++Georgian + Kumele ube ku-inthanethi ukuze ufinyelele kule fayela. + Ifolda enegama "" isivele ikhona. Sicela ukhethe igama elihlukile. + Yenza isipele +@@ -373,7 +373,7 @@ + Noma ubani osebenzisa le divayisi kuzodingeka afake Iphinikhodi ukuze axhumeke kule nethiwekhi yeselula + Ulwazi oluvamile + Isi-Romanian esinekhibhodi Evamile +-Isi-Slovenian ++Slovenian + Ingcweti yezitshalo + Ikhofi + Ukusebenza kwekhophi kuhlulekile. +@@ -397,7 +397,7 @@ + Isi-Romanian + Ifonethikhi yesi-Bulgarian + Ukwenza kusebenze kuhlulekile +-I-English (US) enekhibhodi yamazwe ngamazwe ye-Workman ++English (US) enekhibhodi yamazwe ngamazwe ye-Workman + Imininingwane + Le folda yabiwa Nedeskithophu ye-Parallels + Thenga isitoreji esiningi +@@ -421,17 +421,17 @@ + Isi-Swedish + I-Sushi + Inkawu +-Isi-Chinese Esisheshayo ++Chinese Esisheshayo + Uhlu lwefayela luhlungwe nge- nge-oda elikhuphukayo. + Isi-Tamil esinekhibhodi ye-Typewriter +-Isi-Turkish ++Turkish + Ivula i-"" + Inethiwekhi yedatha yeselula + izithombe ezenziwe isipele + I-Corgi + Uxolo, le vidiyo ayisekelwe yidivayisi yakho yokusakaza. + Ukufika +-Isi-Macedonian ++ Macedonian + Ukulanda + Isi-Portuguese (Portugal) + I-Onigiri +@@ -461,7 +461,7 @@ + Albhamu + Sebenzisa igama elinezinhlamvu ezingu- noma ngaphansi + Ukuzipha kwehlulekile, iphutha elingalindelekile livelile: +-Isi-Japanese ++Japanese + Ingabe uqinisekile ukuthi ufuna ukususa i-""? + Uvemvame obomvu + Susa ukuthula +@@ -471,7 +471,7 @@ + Umsebenzi uthatha isikhathi eside kunokulindelekile. Ingabe ufuna ukuwukhansela? + Phatha ukwabelana ne-Parallels Desktop + Bona okuningi... +-Isi-Armenian ++Armenian + Iphasiwedi engalungile + Ukuguqulwa kwamaletha esi-Nepali + I-Pizza +@@ -480,7 +480,7 @@ + Kuvele iphutha. + Isi-Hebrew + Kuvele iphutha. Ezinye zezinto kungenzeka azibuyiselwanga. +-I-English (Canada) ++English (Canada) + I-Basketball + Isi-Polish + Isethi ye-Hangul 3 (390) +@@ -524,16 +524,16 @@ + Ungasebenzisi izilungiselelo zommeleli zalaba basingathi nezizinda: + Isi-Sorani Kurdish esinekhibhodi esekelwe ku-English + Iphoyinti lokufinyelela +-Isi-Spanish ++Spanish + Ayikho imiphumela ye-. + Iphasiwedi engavumelekile + Faka + Isi-Italian + Phinda ufake iphinikhodi entsha +-Isi-Latvian ++Latvian + Isihlungi esithi sivaliwe. + Khetha konke +-Isi-Icelandic ++Icelandic + Amachashazi + Uhlu lwefayela lushintshele kuhlu lokubuka. + Ifayela alikwazanga ukufundwa. +@@ -564,11 +564,11 @@ + Susa futhi ufomethe + Thulisa + Amafayela e-Google Play +-Isi-Kazakh ++Kazakh + Ukuguqulwa kwamaletha kwesi-Kannada + Uhlobo lokuxhumeka +-Isi-Chinese Sosiko +-Isi-Korean ++Chinese Sosiko ++Korean + Isethi ye-Hangul 3 (Kokugcina) + Ikhiyiwe + Leli fayela selilibele kwenye indawo. Sicela uhlole ukulungiselelwa kwendawo yakho yokulanda uphinde uzame futhi. +@@ -594,21 +594,21 @@ + Vala + Inethiwekhi ye- ayixhunyiwe + Ifomu le-Google +-Isi-Hungarian esinekhibhodi ye-Qwerty ++Hungarian esinekhibhodi ye-Qwerty + Ingobo yomlando eminyanisiwe ye-LZMA + Umbhalo wosesho usuliwe, kuboniswa wonke amafaela namafolda. + Ihambisa i- ku- + Umbhalo we-CSV + Isikhala + Ihambisa i-... +-Isi-Japanese esinekhibhodi yase-US ++Japanese esinekhibhodi yase-US + , ayikho inethiwekhi + Amavidiyo + Ukuze ulondoloze leli fayela ukuthi ulisebenzise ngokungaxhunyiwe, buyela emuva ku-inthanethi, chofoza ngakwesokudla ifayela, bese ukhethe inketho ye-. + Izimvemvane + Funda kabanzi + Isemishi +-Isi-Hungarian ++Hungarian + Vula nge- + Guqula iphinikhodi + Ilindele ulwazi lesikhala... +@@ -620,7 +620,7 @@ + Isi-Dutch (Belgium) + Nika amandla imibhalo engezansi + Inethiwekhi ye-, , amandla esignali %, Ibhethri lefoni %, xhuma +-Isi-Malay ++Malay + Khetha uhlelo lokusebenza ukuze livule leli fayela + I-PUK engavumelekile + Iphutha elingaziwa lenethiwekhi +@@ -642,7 +642,7 @@ + Yehlulekile ukuthola ulwazi lesikhala + Inethiwekhi ye-, , , , amandla esignali %, kuphethwe umlawuli wakho, imininingwane + Ungavumeli abammeleli kumanethiwekhi abiwe +-Isi-Norwegian ++Norwegian + Vumela abanye abasebenzisi bale divayisi ukuthi basebenzise le nethiwekhi + Ivumelanisa i-... + Okwakamuva +@@ -675,7 +675,7 @@ + Le vidiyo izoqhubeka idlale kuze izinkomo zibuye ekhaya. + Isusiwe i- kusuka okhethweni. + Inethiwkehi ye-, , , , amandla esignali %, imininingwane +-Isi-Persian ++Persian + Wonke amafayela alondolozwe kule folda enziwa isipele ngokuzenzakalelayo ku-inthanethi + Isi-Sanskrit + Umuntu owenza i-tai chi +@@ -708,14 +708,14 @@ + amafolda akhethiwe + () + Ukufakwa kuhlulekile. +-Isi-Turkish ++Turkish + Isi-Tamil (Ukuguqulwa kwamaletha) + Vula nge... + Inethiwekhi ye- kwangu-, , , Amandla Esignali %, Ibhethri Lefoni %, Xhuma + Isi-Thai esinekhibhodi ye-TIS 820-2531 + Nqamula ukuze unike amandla ukuskena + Isi-Tamil esinekhibhodi ye-InScript +-Isi-Macedonian ++ Macedonian + Thenga isitoreji esiningi... + '<b></b>' - <em>iDrayivu yokusesha</em> + I-Kannada Phonetic +@@ -754,7 +754,7 @@ + I-Malayalam Phonetic + Bonisa amafayela afihliwe + Landa +-Isi-Belarusian ++Belarusian + Ukuguqulwa kwamaletha esi-Persian + Nikeza i-Linux imvume yezinhlelo zokusebenza ukufinyelela amafayela ku-Google Drayivu yakho. Izinguquko zizovumelanisa kwamanye amadivayisi akho. + Shova +@@ -774,17 +774,17 @@ + Ihambisa izinto ezingu-... + Finyelela kalula kokuthi Izithombe ze-Google + Khansela +-Isi-Hindi ++Hindi + Ukufometha idrayivu kuzosula yonke idatha egcinwe kuyo kuphinde kususe zonke izingxenye ezikhona, okufaka zonke izingxenye okungenzeka zingabonakali. Lesi senzo asikwazi ukuhlehliswa. + Ayikwazanga ukufometha i- +-Isi-Greek ++Greek + kukopishwe okungu-. + Ulwazi lwesithombe + Sika + Bonisa imininingwane yesipele samafu + Inethiwekhi ilawulwa inqubomgomo + Izinketho eziningi ezitholakala kubha yesenzo. Cindezela ku-Alt + A ukuze ugxilise ibha yesenzo. +-Isi-Chinese Wubi ++Chinese Wubi + Hambisa + Inyoni + Ukuze ulondoloze i-"" ngokungaxhunyiwe ku-inthanethi kuzomele ukhulule ngokungeziwe okungu- kwesikhala: +@@ -819,10 +819,10 @@ + I-US Colemak + ingobo yomlando ye-7z + Idivayisi ayikwazi ukuvulwa ngoba isistimu yefayela ayiboniwe. +-Isi-Slovenian +-Isi-French (Switzerland) ++Slovenian ++French (Switzerland) + Ukuqinisekisa kwe-PPP kuhlulekile ngenxa yegama lomsebenzisi elingalungile noma iphasiwedi +-I-English (US) enekhibhodi ye-Colemak ++English (US) enekhibhodi ye-Colemak + Leli fayela lenzelwe i-PC esebenzisa isofthiwe ye-Windows. Lokhu akuhambelani nedivayisi yakho esebenzisa i-Chrome OS. Funda kabanzi ngokuvula amafayela ku-Chrome OS. + Ayikho inethiwekhi + I-Jack Russell Terrier +@@ -837,13 +837,13 @@ + Dawuniloda, + Kwabiwe nami + Amanzi e-ice +-I-English (UK enekhibhodi ye-Dvorak ++English (UK enekhibhodi ye-Dvorak + I-"" yabiwe nawe. Awukwazi ukuyisusa ngoba akuyona eyakho. + Iyaqalisa... + Lungiselela + Ukhethe konke okungenayo. + Yehlulekile ukubuyisa ulwazi lohlelo lokusebenza. +-Isi-French (Belgium) ++French (Belgium) + Faka + Imodeli yedivayisi + Umsebenzi wobuciko +@@ -856,7 +856,7 @@ + Ifonethikhi yesi-Armenian + Umthombo + Isethi ye-Hangul 3 (Akekho u-Shift) +-Isi-Japanese ++Japanese + I-OTASP ihlulekile + Ingobo yomlando yotiyela eminyanisiwe ye-XZ + Namathisela kufolda +@@ -866,7 +866,7 @@ + Izolo ngo- + Ifayela noma uhla lwemibhalo olunegama elifanayo seluvele likhona + Ukhiye omubi we-WEP +-Isi-Greek ++Greek + Ukuskena kuphelile + I- ithukululiwe. + Ubukhulu +@@ -889,29 +889,29 @@ + Ikhipha izinto ezingu-... + I-UK + Isikrini esigcwele +-Isi-French (France) ++French (France) + Inethiwekhi ye-, , , amandla esignali %, imininingwane +-I-English(US) ++English(US) + I-URL yokutholakala kommeleli ozenzakalelayo wewebhu + Isi-Italian +-Isi-Latvian ++Latvian + Isi-Cantonese + Indlovu + Inethiwekhi engu- kwezingu-, , , Amandla Wesinglai%, Kuvinjelwe Umphathi wakho, Imininingwane + Khetha ifayela okumele ulivule +-Isi-Croatia +-Isi-Indonesia ++Croatian ++Indonesian + Ivumelanisa izinto ezingu-... + Uhlu lwefayela lushintshele ekubukeni kwesithonjana. + Ifayela lesithombe se-Crostini +-Isi-Icelandic ++Icelandic + Iphinikhodi engalungile. Unemizamo engu- esele. + - Imbobo + Ungahloli + Iphasiwedi embi + Ukudweba kwe-Google + Ngiyitholile +-Isi-Maltese ++Maltese + Ibhayisikili + Okukhethiwe . + Isi-Croatian +@@ -923,19 +923,19 @@ + Hambisa Kudoti + Ikati + Ukuzipha kwehlulekile, into ikhona: "" +-Isi-Spanish (I-Spain) ++Spanish (I-Spain) + Amalungu e-'' azothola ukufinyelela kwikhophi yalezi zinto. +-Isi-Nepali ngekhibhodi ye-Phonetic ++Nepali ngekhibhodi ye-Phonetic + Isipredishithi se-Excel + Ukuguqulwa kwamaletha we-Arabic + Ayixhunyiwe +-Isi-Hungarian ++Hungarian + Thola iziqu + Inja enyakazisa umsila + Isi-Danish + Asikho isikhala esanele. + Leli fayela lidizayinelwe ikhompuyutha esebenzisa isofthiwe ye-Macintosh. Lokhu akuhambelani nedivayisi yakho esebenzisa i-Chrome OS. Funda kabanzi ngokuvula amafayela ku-Chrome OS. +-Isi-Chinese (Traditional) Pinyin ++Chinese (Traditional) Pinyin + Inethiwekhi ye-, , , amandla esignali %, kuphethwe umlawuli wakho, imininingwane + Ifonethiki yesi-Russian + Amafayela e-Linux +@@ -959,10 +959,10 @@ + Londoloza ubunikazi nephasiwedi + Othanda izincwadi + Ukuguqulwa kwamaletha kwesi-Gujarati +-I-English (US enekhibhodi yamazwe ngamazwe ++English (US enekhibhodi yamazwe ngamazwe + Izinto ezikudoti zisuswa ingunaphakade ngemva kwezinsuku ezingama-30. + Google Amadokhumenti +-Isi-Kazakh ++Kazakh + Izinto ezingu- zithukululiwe. + Ukufaka kuqaliswe ngempumelelo. + Izithombe +@@ -973,7 +973,7 @@ + Thumela impendulo + Ibanga elikhethiwe lokungenayo kwe- kusuka ku- kuya ku-. + Ingobo yomlando eminyanisiwe ye-Gzip +-I-English (South Africa) ++English (South Africa) + Ayixhunyiwe ku-inthanethi + Ifayela elinegama "" selivele likhona. Ingabe ufuna ukuyimiselela? + Unemizamo engu- esele. Ngeke ukwazi ukusebenzisa le nethiwekhi kuze kube yilapho usetha Iphinikhodi entsha. +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0034-Incrementing-VERSION-to-102.0.5005.138.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0034-Incrementing-VERSION-to-102.0.5005.138.patch new file mode 100644 index 000000000000..a56920f1f86c --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0034-Incrementing-VERSION-to-102.0.5005.138.patch @@ -0,0 +1,28 @@ +From 54eda0b04d06a18c37d0fe5acd9c7e59a9309ecf Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Thu, 23 Jun 2022 01:00:32 +0000 +Subject: [PATCH 34/59] Incrementing VERSION to 102.0.5005.138 + +Change-Id: I72b187b9006fa47fafdd1239751c65d268601487 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3719359 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1193} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 96ae4bfab48f..a63b8dbbec13 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=137 ++PATCH=138 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0035-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0035-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..2b1eb8b7e58d --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0035-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,578 @@ +From 72690f8bebac28c822f300c57111518f5e0711b0 Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Thu, 23 Jun 2022 14:24:18 +0000 +Subject: [PATCH 35/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: I1a319a29c31a8d9cdc82ef3481cbaf7422832818 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3721556 +Auto-Submit: Ben Mason +Commit-Queue: Rubber Stamper +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1194} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + ash/strings/ash_strings_hi.xtb | 2 +- + .../app/resources/generated_resources_fi.xtb | 30 ++++---- + .../app/resources/generated_resources_km.xtb | 2 +- + .../app/resources/generated_resources_ml.xtb | 8 +-- + components/strings/components_strings_zu.xtb | 4 +- + .../translations/ui_chromeos_strings_hy.xtb | 2 +- + .../translations/ui_chromeos_strings_ml.xtb | 2 +- + .../translations/ui_chromeos_strings_zu.xtb | 70 +++++++++---------- + ui/strings/translations/ui_strings_ml.xtb | 2 +- + 9 files changed, 61 insertions(+), 61 deletions(-) + +diff --git a/ash/strings/ash_strings_hi.xtb b/ash/strings/ash_strings_hi.xtb +index 3dc696f3a7ea..291935cd90a5 100644 +--- a/ash/strings/ash_strings_hi.xtb ++++ b/ash/strings/ash_strings_hi.xtb +@@ -68,7 +68,7 @@ + रोकें + चार्ज कर रहा है + () +-फ़ोन का पता लगाने की सुविधा ++फ़ोन का पता लगाएं + को बजे फिर से देखें. + कमज़ोर सिग्नल + को फ़ोल्डर पर ले जाएं. +diff --git a/chrome/app/resources/generated_resources_fi.xtb b/chrome/app/resources/generated_resources_fi.xtb +index 27cbdce92d1e..512a1c28b236 100644 +--- a/chrome/app/resources/generated_resources_fi.xtb ++++ b/chrome/app/resources/generated_resources_fi.xtb +@@ -340,7 +340,7 @@ + Laiteparia muodostetaan… + haluaa avata tämän sovelluksen. + Poistetaan… +-Käytä Assistantia sanomalla "Ok Google". Jos haluat säästää virtaa, valitse Käytössä (suositus). Assistant vastaa vain, jos laite on kytketty virtalähteeseen tai laturiin. ++Käytä Assistantia sanomalla "Hey Google". Jos haluat säästää virtaa, valitse Käytössä (suositus). Assistant vastaa vain, jos laite on kytketty virtalähteeseen tai laturiin. + A11y + Varmuuskopioi mediatiedostot laitteelta Tiedostot-sovelluksen avulla. + asetti nykyisen taustakuvan. Saatat joutua poistamaan sovelluksen ennen kuin voit valita uuden taustakuvan. +@@ -1408,7 +1408,7 @@ Voit ylläpitää tilin asetuksia asentamalla laitteellesi Family Link ‑sovell + on pyytänyt lisäoikeuksia. + Valitse käyttäjänimi + Määritä verkko +-Jos hyväksyt tämän, Google Assistant odottaa lepotilassa, kunnes se kuulee sanat "Ok Google" ja tunnistaa Voice Matchilla puhujaksi käyttäjän . ++Jos hyväksyt tämän, Google Assistant odottaa lepotilassa, kunnes se kuulee sanat "Hey Google" ja tunnistaa Voice Matchilla puhujaksi käyttäjän . + + Voice Matchin avulla Google Assistant voi tunnistaa käyttäjän () äänen laitteellasi () ja erottaa hänet muista. + +@@ -2363,7 +2363,7 @@ ja loitonna painamalla Ctrl + Alt + kirkkauden vähennys. + Jatka äänen mykistystä + – verkkovirhe + Turvallisuudella on väliä. Käytä nyt hetki laajennusten tarkistamiseen. +-Salli, että voi käyttää Google Assistantia sanomalla "Ok Google" ++Salli, että voi käyttää Google Assistantia sanomalla "Hey Google" + <Ei osa varmennetta> + Määritä digitaaliset pelisäännöt, joiden avulla lapsesi voi pelata, tutkia ja oppia sekä tehdä koulutehtäviä kotona. + Tuntematon tili +@@ -3878,7 +3878,7 @@ ja loitonna painamalla Ctrl + Alt + kirkkauden vähennys. + Poista korostus + Katso, miten sovelluksia päivitetään + {NUM_TABS,plural, =1{Poista sivuston mykistys}other{Poista sivustojen mykistys}} +-Käytä Assistantia sanomalla "Ok Google" ++Käytä Assistantia sanomalla "Hey Google" + Viestit + Sivustot yhdistävät yleensä HID-laitteisiin esim. käyttääkseen epätavallisia näppäimistöjä, peliohjaimia tai muita laitteita + Voit tarkistaa muutamia muita lupia puhelimellasi. Varmista, että puhelimen Bluetooth ja Wi-Fi ovat päällä. +@@ -3970,7 +3970,7 @@ ja loitonna painamalla Ctrl + Alt + kirkkauden vähennys. + Salasanat kannattaa salata turvallisuussyistä laitteella ennen niiden tallentamista Googlen Salasanojen ylläpitoon + Noudatat järjestelmänvalvojan tätä asetusta koskevaa suositusta. + valittu, valitse albumeita () painamalla Enter +-Google Assistantin Ok Google ++Google Assistantin Hey Google + Asetettu yleisaika (Coordinated Universal Time, UTC/GMT) + Älä asenna + Ilmoitusten synkronointia ei voitu ottaa käyttöön +@@ -5167,7 +5167,7 @@ Julkinen eksponentti ( bittiä): + Viimeaikaiset Chrome-välilehdet + Varmennehierarkia + Luo QR-koodi +-Huom. Käyttäjän () henkilökohtaisiin tuloksiin voi olla mahdollista päästä käsiksi myös, jos hänen ääntään on nauhoitettu tai jonkun toisen ääni muistuttaa hänen ääntään. Jos haluat säästää virtaa, muuta käyttäjän Assistantin asetuksia niin, että "Ok Google" on käytössä vain, kun laite on kytketty virtalähteeseen. ++Huom. Käyttäjän () henkilökohtaisiin tuloksiin voi olla mahdollista päästä käsiksi myös, jos hänen ääntään on nauhoitettu tai jonkun toisen ääni muistuttaa hänen ääntään. Jos haluat säästää virtaa, muuta käyttäjän Assistantin asetuksia niin, että "Hey Google" on käytössä vain, kun laite on kytketty virtalähteeseen. + Näytön lukitus + Varmenteen kohdehakemiston attribuutit + Tiivistettyä kuvaa ei ole määritetty +@@ -5701,7 +5701,7 @@ Julkinen eksponentti ( bittiä): + Jatka latausta + Microsoftin elinikäinen allekirjoitus + Vierailijakäyttö +-Käytä Assistantia sanomalla "Ok Google". ++Käytä Assistantia sanomalla "Hey Google". + Vaihda hiiren ykköspainiketta + Valitse oletusasetus + Käytä suojattua DNS:ää +@@ -5918,7 +5918,7 @@ Julkinen eksponentti ( bittiä): + ChromeOS Flex ‑järjestelmän näköistiedoston kirjoittaja + Kettu + Avaa incognito-ikkunassa +-Jos hyväksyt tämän, Google Assistant odottaa lepotilassa, kunnes se kuulee sanat "Ok Google" ja tunnistaa Voice Matchilla puhujaksi sinut. ++Jos hyväksyt tämän, Google Assistant odottaa lepotilassa, kunnes se kuulee sanat "Hey Google" ja tunnistaa Voice Matchilla puhujaksi sinut. + + Voice Matchin avulla Assistant osaa tunnistaa sinut ja erottaa sinut muista. Assistant luo tallenteista yksilöllisen äänimallin, joka tallennetaan vain laitteellesi. Äänimalli voidaan lähettää tilapäisesti Googlelle jotta äänesi voidaan tunnistaa paremmin. + +@@ -5964,7 +5964,7 @@ Julkinen eksponentti ( bittiä): + XML-sivustoluettelot ladattiin viimeksi . + Sivustot havaitsevat yleensä, kun käytät laitetta aktiivisesti ja määrittävät sen perusteella saatavuutesi chat-sovelluksissa + Verkon virheenkorjaus +-Ok Google on valmiina ++Hey Google on valmiina + Avaa suuressa koossa + haluaa tulostaa tiedoston tulostimella . + Vapauta tilaa jatkaaksesi +@@ -6150,7 +6150,7 @@ Julkinen eksponentti ( bittiä): + Näytä lähdekoodi + Asennus epäonnistui. + Poista korostus +-Sano ”Ok Google” uudelleen ++Sano ”Hey Google” uudelleen + Lisää uusi sivu + Tilaa ei voi asettaa ikkunan asettamisen jälkeen. + Lukea ja muokata selaushistoriaasi +@@ -6402,7 +6402,7 @@ Julkinen eksponentti ( bittiä): + Suositus + Ota vierailijaselaus käyttöön + Vaihdetaanko tuetut linkit avaava oletussovellus? +-Voit kysyä "Ok Google, what song is this?" tai "Ok Google, what's on my screen?" ++Voit kysyä "Hey Google, what song is this?" tai "Hey Google, what's on my screen?" + {NUM_APPLICATIONS,plural, =1{Tämä sovellus saattaa estää Chromea toimimasta oikein}other{Nämä sovellukset saattavat estää Chromea toimimasta oikein}} + Hups, jotain meni vikaan esittelytilan määrityksessä. + Tämä sivu ei saa nähdä leikepöydälle kopioitua tekstiä tai kuvia. +@@ -6621,7 +6621,7 @@ Julkinen eksponentti ( bittiä): + Android + on keskeytetty + Incognito-portaali: +-Sano ”Ok Google”. ++Sano ”Hey Google”. + Nimeä profiili uudelleen + Luo + Kuuntele valittu teksti +@@ -6809,7 +6809,7 @@ Julkinen eksponentti ( bittiä): + Lisää kansio... + Kioskisovelluksen cryptohomea ei voitu ottaa käyttöön. + Tätä suojausavainta ei voi nollata. Virhe: +-"Ok Google" ++"Hey Google" + Crostini-päivitys + Korostustyökalu + : +@@ -6980,7 +6980,7 @@ Poista määritys painamalla määritettyä kytkintä tai näppäintä.Antamalla ChromeOS-laitteiden lähettää raportteja automaattisesti voit auttaa meitä korjaamaan ja kehittämään ChromeOS:n ominaisuuksia. Raportteihin voi sisältyä esimerkiksi tietoja ChromeOS:n kaatumisista, käytetyistä ominaisuuksista ja tyypillisestä muistin käytöstä sekä Android-sovellusten diagnostiikka- ja käyttödataa. Kootusta datasta on hyötyä myös Googlen sovelluksille ja kumppaneille, esim. Android-kehittäjille. + Voit sallia tai estää raporttien lähettämisen milloin tahansa ChromeOS-laitteen asetuksissa. Jos olet verkkotunnuksen järjestelmänvalvoja, voit muuttaa asetusta hallintakonsolissa. + Jos Verkko‑ ja sovellustoiminta ‑asetus on päällä Google-tililläsi, Android-dataa voidaan tallentaa tilillesi. Voit nähdä dataa, poistaa sitä ja muuttaa tiliasetuksia osoitteessa account.google.com. +-Huom. Samanlaisella äänellä tai äänitteellä saattaa päästä henkilökohtaisiin tuloksiisi tai Assistantiisi. Jos haluat säästää virtaa, muuta Assistantin asetuksia niin, että "Ok Google" on käytössä vain, kun laite on kytkettynä virtalähteeseen. ++Huom. Samanlaisella äänellä tai äänitteellä saattaa päästä henkilökohtaisiin tuloksiisi tai Assistantiisi. Jos haluat säästää virtaa, muuta Assistantin asetuksia niin, että "Hey Google" on käytössä vain, kun laite on kytkettynä virtalähteeseen. + Kirjautuminen on sallittu vain omistajatilillä. Käynnistä tietokone uudelleen ja kirjaudu omistajatilillä. Tietokone käynnistetään uudelleen 30 sekunnin kuluttua. + Estä kameran ja mikrofonin käyttö aina + IPP-jäsentäjä +@@ -8371,7 +8371,7 @@ Tallenna avaintiedosto suojattuun sijaintiin. Tarvitset sitä, jos haluat luoda + Kamera ja mikrofoni + Järjestelmän diagnostiikkatiedot + Korjaa laajennus +-Kokeile kysyä "Ok Google, what song is this?" tai "Ok Google, what's on my screen?" ++Kokeile kysyä "Hey Google, what song is this?" tai "Hey Google, what's on my screen?" + Epätavallinen tiedosto + Näitä tilejä ei käytetä Android-sovellusten kanssa tällä hetkellä. Jos valitset Android-sovelluksen kanssa käytettävän tilin, sitä voidaan käyttää myös muilla Android-sovelluksilla. Voit muokata Android-sovelluksen pääsyä valitsemalla Asetukset > Tilit. + Anna tunnuslause +diff --git a/chrome/app/resources/generated_resources_km.xtb b/chrome/app/resources/generated_resources_km.xtb +index 29b9a409b0fc..822d3a841ecb 100644 +--- a/chrome/app/resources/generated_resources_km.xtb ++++ b/chrome/app/resources/generated_resources_km.xtb +@@ -5000,7 +5000,7 @@ + បណ្ដាញ Wi-Fi ជា​អាទិភាព + ចាប់ផ្តើមឡើងវិញ + សកម្មភាព និង​ចំណូលចិត្ត​ដែលអ្នក​បានរក្សាទុក​នឹងអាចប្រើបាន​នៅលើរាល់​ឧបករណ៍ ChromeOS Flex នៅពេលអ្នក​ចូល​ដោយប្រើ​គណនី Google របស់អ្នក។ អ្នកអាចជ្រើសរើស​អ្វីដែលត្រូវធ្វើសមកាលកម្ម​នៅក្នុងការកំណត់។ +-កុំអនុញ្ញាត ++មិនអនុញ្ញាត + រូបថត Google ទម្រង់ + ព័ត៌មានលម្អិតអំពីគុណភាពនៃការបញ្ចាំង + ទិន្នន័យស្នាមម្រាមដៃ​របស់អ្នកត្រូវបាន​រក្សាទុកយ៉ាង​មានសុវត្ថិភាព និងមិនចេញពី របស់អ្នកឡើយ។ ស្វែងយល់បន្ថែម +diff --git a/chrome/app/resources/generated_resources_ml.xtb b/chrome/app/resources/generated_resources_ml.xtb +index 75308f5d91c0..e699d814127b 100644 +--- a/chrome/app/resources/generated_resources_ml.xtb ++++ b/chrome/app/resources/generated_resources_ml.xtb +@@ -254,7 +254,7 @@ + കൂടുതൽ ഭാഷകൾ + നിർദ്ദേശിക്കപ്പെടുമ്പോൾ നിലവിലെ വെബ്‌സൈറ്റിലെ നിങ്ങളുടെ ഡാറ്റ മുഴുവൻ വായിച്ച് അതിൽ മാറ്റം വരുത്തുക + , നിങ്ങളുടെ ക്രമീകരണം റീസെറ്റ് ചെയ്യാൻ താൽപ്പര്യപ്പെടുന്നു. +-അപ്‌ലോഡുചെയ്യുക ++അപ്‌ലോഡ് ചെയ്യുക + പാസ്‌വേഡുകൾ അവലോകനം ചെയ്യൂ + Linux പുനഃസ്ഥാപിക്കൽ നിലവിൽ പുരോഗതിയിലാണ് + വിപുലീകരണ പിശക് +@@ -2663,7 +2663,7 @@ + നിങ്ങളുടെ ഉപകരണം മാനേജ് ചെയ്യുന്നത് ആണ്. ഈ ഉപകരണത്തിലെ ഏത് പ്രൊഫൈലിലുള്ള ഡാറ്റയും അഡ്‌മിൻമാർക്ക് ആക്‌സസ് ചെയ്യാം. + വിപുലീകരണം നീക്കംചെയ്യുക + നിങ്ങളുടെ തിരയൽ യന്ത്രം എന്നതിലേക്ക് മാറ്റി. +-നിങ്ങൾക്ക് വേണ്ടി ഇത് അൺബ്ലോക്കുചെയ്യാൻ മാനേജർക്ക് കഴിയും ++നിങ്ങൾക്ക് വേണ്ടി ഇത് അൺബ്ലോക്ക് ചെയ്യാൻ മാനേജർക്ക് കഴിയും + Family Link ഉപയോഗിച്ച് വെബ്സൈറ്റ് നിയന്ത്രണങ്ങളും സ്ക്രീൻ സമയ പരിധികളും സജ്ജീകരിക്കുക + ഉപകരണത്തിൽ നയം ഇൻസ്‌റ്റാൾ ചെയ്യാനായില്ല. + ഏകദേശം ശേഷിക്കുന്നു +@@ -4827,7 +4827,7 @@ + Smart Lock സ്ക്രീൻ ലോക്ക് ഓപ്ഷനുകൾ + &കാണുക + ഒട്ടിക്കു&കയും പോകുകയും ചെയ്യുക +-നിങ്ങൾക്ക് വേണ്ടി ഇത് അൺബ്ലോക്കുചെയ്യാൻ രക്ഷിതാക്കൾക്ക് കഴിയും ++നിങ്ങൾക്ക് വേണ്ടി ഇത് അൺബ്ലോക്ക് ചെയ്യാൻ രക്ഷിതാക്കൾക്ക് കഴിയും + കമ്മ്യൂണിക്കേഷനുകൾ + ഫയൽ പങ്കിടൽ ചേർക്കുക + ശരിയായ ഉപയോക്തൃനാമം നൽകുക +@@ -6861,7 +6861,7 @@ + സ്‌റ്റോറേജ് സ്‌പെയ്‌സ് ഇല്ലാത്തതിനാൽ ഇൻസ്‌റ്റാൾ ചെയ്യാനായില്ല. ഇടം സൃഷ്‌ടിക്കാൻ, ഉപകരണ സ്റ്റോറേജിൽ നിന്ന് ഫയലുകൾ ഇല്ലാതാക്കുക. + JavaScript ഉപയോഗിക്കാൻ അനുവദിക്കുന്നില്ല + ഡൗൺലോഡ് ചെയ്യുന്നതിനു മുമ്പ് ഓരോ ഫയലും എവിടെ സംരക്ഷിക്കണമെന്ന് ചോദിക്കുക +-നിങ്ങൾക്ക് വേണ്ടി ഇത് അൺബ്ലോക്കുചെയ്യാൻ രക്ഷിതാവിന് കഴിയും ++നിങ്ങൾക്ക് വേണ്ടി ഇത് അൺബ്ലോക്ക് ചെയ്യാൻ രക്ഷിതാവിന് കഴിയും + ഉപകരണത്തിന്റെ പേര് മാറ്റുക + സമീപത്തുള്ള കോൺടാക്റ്റുകൾക്ക് നിങ്ങളുമായി പങ്കിടാം. അനുമതി ആവശ്യമാണ്. + ഉപകരണത്തിൽ നിന്ന് പങ്കിട്ട ടെക്‌സ്റ്റ് +diff --git a/components/strings/components_strings_zu.xtb b/components/strings/components_strings_zu.xtb +index 81baebec6ab4..7070d0c76b70 100644 +--- a/components/strings/components_strings_zu.xtb ++++ b/components/strings/components_strings_zu.xtb +@@ -1417,7 +1417,7 @@ Lokhu uma kungenjalo kuzovinjelwa izilungiselelo zakho zobumfihlo. Lokhu kuzovum + Thola isaphulelo ku- nokwengeziwe + Buka + Amasistimu okusebenza +-Isi-German ++German + Le syithi ngeke ikwazi ukusebenzisa i-U2F API ngemuva kuka-Febhuwari 2022. Uma ungumnikazi wesayithi, kufanele uyishintshe ukuze usebenzise i-API Yokufakazela Ubuqiniso ye-API. + Le ndlela yokulethwa ayitholakali. Zama indlela ehlukile. + Dala inothi elisha ngokushesha ku-Google Keep +@@ -1646,7 +1646,7 @@ Lokhu uma kungenjalo kuzovinjelwa izilungiselelo zakho zobumfihlo. Lokhu kuzovum + Ayivumelekile + {CONTACT,plural, =0{}=1{ nongu- ngaphezulu}one{ nongu- ngaphezulu}other{ nongu- ngaphezulu}} + Ithola amadivayisi... +-Isi-Italian ++Italian + Ubunjiniyela bamabhuloho + &Yenza futhi ukuhlela + Awama-movie wehlaya +diff --git a/ui/chromeos/translations/ui_chromeos_strings_hy.xtb b/ui/chromeos/translations/ui_chromeos_strings_hy.xtb +index 9265335e765c..80b91e20064a 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_hy.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_hy.xtb +@@ -121,7 +121,7 @@ + Անցնել ֆայլի տեղադրություն + Կառավարել Drive-ում + Ֆորմատավորման արդյունքում կրիչի վրա պահված բոլոր տվյալները կջնջվեն: Այս գործողությունը հնարավոր չէ հետարկել: +-տիգրինյա ++թիգրինյա + RAR արխիվ + LZMA սեղմված tar-արխիվ + ռուսերեն +diff --git a/ui/chromeos/translations/ui_chromeos_strings_ml.xtb b/ui/chromeos/translations/ui_chromeos_strings_ml.xtb +index 16f4b63d0683..089a3df8bdc9 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_ml.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_ml.xtb +@@ -32,7 +32,7 @@ + യാന്ത്രിക നാമ സെർവറുകൾ + ലാവോ + Chrome വിപുലീകരണം +-അപ്‌ലോഡുചെയ്യുക ++അപ്‌ലോഡ് ചെയ്യുക + വിഭാഗം + നേരിട്ടുള്ള ഇന്‍റര്‍നെറ്റ് കണക്ഷന്‍ + പിൻ മൂല്യങ്ങൾ പൊരുത്തപ്പെടുന്നില്ല. +diff --git a/ui/chromeos/translations/ui_chromeos_strings_zu.xtb b/ui/chromeos/translations/ui_chromeos_strings_zu.xtb +index 474eda5c24ca..0f262a4231f8 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_zu.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_zu.xtb +@@ -57,7 +57,7 @@ + Umuntu onezimbali + Isi-Slovak + I-"" ayizange ilayishwe. Asikho isikhala esanele esikhululekile ku-Google Drayivu yakho. +-Isi-Finnish ++Finnish + I-Swiss + Ayikwazi ukuqamba kabusha i-"". + English (US) enekhibhodi ye-Dvorak +@@ -72,7 +72,7 @@ + Idinga inethiwekhi yasekhaya + PB + Ikhamela +-Isi-Portuguese nge-US International keyboard ++Portuguese nge-US International keyboard + Isitifiketi somsebenzisi asitholakali ukufakazela ubuqiniso inethiwekhi. + Chinese Pinyin + Yenza amafayela angu- atholakale ngokungaxhunyiwe kwi-inthanethi +@@ -87,12 +87,12 @@ + Izipha izinto ezingu-... + Ingeza Iphrofayela... + Amagama wamasevisi +-Isi-German (Germany) ++German (Germany) + Chinese Cangjie + izinto ezingu- zikopishiwe. + Bonisa onke amafolda e-Google Play + Ukugugulwa kwamaletha kwesi-Hebrew +-Isi-Dutch (I-Netherlands) ++Dutch (I-Netherlands) + Inani lokubalwa kwefayela + Isitifiketi sokuqinisekisa sinqatshelwe endaweni + Ulwazi lwevidiyo +@@ -114,7 +114,7 @@ + Kufomethwe i- + Isi-Slovak + Ukuhambisa kuhlulekile, iphutha elingalindelekile: +-Isi-Finnish ++Finnish + Ukulungiswa kwesithombe + Nweba amaphaneli wempendulo yamafayela + Lolu hlobo lwefayela alusekelwa. Funda kabanzi ngokuvula amafayela ku-Chrome OS. +@@ -140,7 +140,7 @@ + Isi-Russian esinekhibhodi ye-Phonetic YaZHert + Ukulungiselelwa okwenziwa ngesandla kommeleli + Inhlamvu engavumelekile: +-Isi-Portuguese nge-US International PC keyboard ++Portuguese nge-US International PC keyboard + isi-Sipmlified Chinese + Ingobo yomlando yeziphu + Korean +@@ -177,7 +177,7 @@ + inethiwekhi, valiwe + I-Tamagotchi + Iphinikhodi engalungile ifakwe izikhathi eziningi kakhulu. Ukusetha Iphinikhodi entsha, faka ukhiye we-Personal Unblocking Key (PUK) onamadijithi ayi-8 onikezwe inkampani yakho yenethiwekhi. +-Isi-Gujarati Phonetic ++Gujarati Phonetic + I-Alt + Skena + izinto ezisusiwe +@@ -215,7 +215,7 @@ + Shintsha okuzenzakalelayo... + Yenza isipele + Udoti +-Isi-Czech ++Czech + Idokhumenti ye-PDF + Azikho izinto ezifana ne-<b>""</b> + Ulwazi +@@ -251,7 +251,7 @@ + Amafayela ami + I-UK Dvorak + Indlela +-Isi-Portuguese (Brazil) ++Portuguese (Brazil) + Izilimi eziningi ze-Canadian + Ubunikazi buzodluliselwa ku-. + Irish +@@ -279,7 +279,7 @@ + Nepali ngekhibhodi ye-InScript + Inethiwekhi ye-, , , amandla esignali %, kuphethwe umlawuli wakho, xhuma + Yenza kusebenze, i- +-Isi-German (Germany) esinekhibhodi ye-Neo 2 ++German (Germany) esinekhibhodi ye-Neo 2 + Ukufometha imidiya engasuswa kuzosula yonke idatha. Ingabe ufisa ukuqhubeka? + Isikhathi okudalwe ngaso + Ikhamera esheshayo +@@ -291,7 +291,7 @@ + Mongolian + amaphutha. + Inethiwkehi ye-, , , , amandla esignali %, imininingwane +-Isi-Portuguese ++Portuguese + Isexwayiso: Lamafayela awesikhashana futhi angase asuswe ngokuzenzekelayo ukukhulula isikhala sediski. Funda kabanzi + Ifolda + Hamba ku-drive.google.com... +@@ -333,7 +333,7 @@ + Akukho ukudlala okutholakalayo + Isi-Serbian + Emuva +-Isi-German Neo 2 ++German Neo 2 + Igama + Pakisha nge- + Incazelo +@@ -412,13 +412,13 @@ + Ikopisha i- ku- + Umculi + Ifaka iphrofayela leselula, Inethiwekhi engu- kwangu-, , +-Isi-Czech esinekhibhodi ye-Qwerty ++Czech esinekhibhodi ye-Qwerty + Le khompyutha + Yenza amafayela atholakala ngokungaxhunyiwe kwi-inthanethi + Umuntu okwisthwathwa + Amalungu e-'' azolahlekelwa ukufinyelela ngaphandle kokuthi lezi zinto zabiwe nabo. + Google Amaslayidi +-Isi-Swedish ++Swedish + I-Sushi + Inkawu + Chinese Esisheshayo +@@ -433,7 +433,7 @@ + Ukufika + Macedonian + Ukulanda +-Isi-Portuguese (Portugal) ++Portuguese (Portugal) + I-Onigiri + Iphrezentheshini ye-PowerPoint + KB +@@ -445,7 +445,7 @@ + izinto ezikhethiwe + Ama-Chromebase + Buka +-Isi-German ++German + Chofoza ukuze uhlunge ikholomu ngendlela eyehlayo. + bytes + Isilayida sevolumu +@@ -478,11 +478,11 @@ + wamafayela uzosulwa + Ihambisa izinto ezi- ku- + Kuvele iphutha. +-Isi-Hebrew ++Hebrew + Kuvele iphutha. Ezinye zezinto kungenzeka azibuyiselwanga. + English (Canada) + I-Basketball +-Isi-Polish ++Polish + Isethi ye-Hangul 3 (390) + Idethi elungiswe ngayo + I-Chess +@@ -528,7 +528,7 @@ + Ayikho imiphumela ye-. + Iphasiwedi engavumelekile + Faka +-Isi-Italian ++Italian + Phinda ufake iphinikhodi entsha + Latvian + Isihlungi esithi sivaliwe. +@@ -554,11 +554,11 @@ + Iphutha, i- ayisekho. + I-, Vula + Ulwazi lomsindo +-Isi-Thai esinekhibhodi ye-Pattachote ++Thai esinekhibhodi ye-Pattachote + 1 isithombe esisha + Isipele samafu we-Chrome OS + I-Hungarian QWERTY +-Isi-German (Switzerland) ++German (Switzerland) + Umsingathi noma isizinda esizokhishwa + Isi-Urdu + Susa futhi ufomethe +@@ -581,7 +581,7 @@ + Kuvele iphutha phakathi nokufakwa kohlelo lwakho lokusebenza lwe-Linux. + Ifomethi + Ukusebenza kwekhophi kuhlulekile, iphutha elingalindelekile: +-Isi-Dutch (Netherlands) nge-US International PC keyboard ++Dutch (Netherlands) nge-US International PC keyboard + I-Chromebit + izinto + Ama-Chromebox +@@ -614,10 +614,10 @@ + Ilindele ulwazi lesikhala... + Eminye imisebenzi ithatha isikhathi eside kunokulindelekile. Ingabe ufuna ukuyikhansela? + Isi-Phunjabi +-Isi-Danish ++Danish + Ifomethi + Leli fayela alikwazanga ukudlalwa. +-Isi-Dutch (Belgium) ++Dutch (Belgium) + Nika amandla imibhalo engezansi + Inethiwekhi ye-, , amandla esignali %, Ibhethri lefoni %, xhuma + Malay +@@ -703,7 +703,7 @@ + Ibhubezi + Leli fayela lidizayinelwe i-PC esebenzisa isofthiwe ye-Windows. Lokhu akuhambisani nedivayisi yakho esebenzisa i-Chrome OS. Sicela useshe Isitolo Sewebhu se-Chrome ukuze uthole uhlelo lokusebenza lokungena esikhundleni olufanele. + I-Google Drayivu +-Isi-Swedish ++Swedish + Usuphelelwe yisikhala + amafolda akhethiwe + () +@@ -712,7 +712,7 @@ + Isi-Tamil (Ukuguqulwa kwamaletha) + Vula nge... + Inethiwekhi ye- kwangu-, , , Amandla Esignali %, Ibhethri Lefoni %, Xhuma +-Isi-Thai esinekhibhodi ye-TIS 820-2531 ++Thai esinekhibhodi ye-TIS 820-2531 + Nqamula ukuze unike amandla ukuskena + Isi-Tamil esinekhibhodi ye-InScript + Macedonian +@@ -736,13 +736,13 @@ + Ukuguqulwa kwamaletha ngesi-Telugu + Yabelana nabanye + Igama lomsebenzisi/iphasiwedi ayilungile noma i-EAP-auth yehlulekile +-Isi-German (Belgium) ++German (Belgium) + Iwindi elisha + Isi-Vietnamese Telex + Ukukopisha izinto ezingu-... + Uhlu lwefayela luhlungwe nge- nge-oda eyehlayo. + Amadivayisi we-ChromeOS Flex +-Isi-Czech ++Czech + Ikhibhodi ye-Ethiopic + Imephu ye-Google + Isi-Ukrainian +@@ -760,7 +760,7 @@ + Shova + Iteki + isi-Lithuanian +-Isi-Dutch ++Dutch + Phina kushelufu + Nika izinhlelo zokusebenza ze-Linux imvume yokufinyelela amafayela kufolda ye- + Ibuyisela i-""... +@@ -794,8 +794,8 @@ + Idokhumenti ye-HTML + Ama-Chromebook + Isimo +-Isi-Hebrew +-Isi-Thai esinekhibhodi ye-Kedmanee ++Hebrew ++Thai esinekhibhodi ye-Kedmanee + itholakele. + + Isikhala sakho se-Google Drayivu asisikhulu ngokwanele. U- ngaphezulu uyadingeka. +@@ -808,8 +808,8 @@ + Iphinikhodi iyadingeka ukuze usebenzise idatha yeselula + I-French BÉPO + Engeza okuhlukile +-Isi-Polish +-Isi-Filipino ++Polish ++Filipino + Khubaza imibhalo engezansi + Amadrayivu abiwayo + Ukufometha ingxenye kuzosula yonke idatha egcinwe kuyo. Lesi senzo asikwazi ukuhlehliswa. +@@ -893,7 +893,7 @@ + Inethiwekhi ye-, , , amandla esignali %, imininingwane + English(US) + I-URL yokutholakala kommeleli ozenzakalelayo wewebhu +-Isi-Italian ++Italian + Latvian + Isi-Cantonese + Indlovu +@@ -932,7 +932,7 @@ + Hungarian + Thola iziqu + Inja enyakazisa umsila +-Isi-Danish ++Danish + Asikho isikhala esanele. + Leli fayela lidizayinelwe ikhompuyutha esebenzisa isofthiwe ye-Macintosh. Lokhu akuhambelani nedivayisi yakho esebenzisa i-Chrome OS. Funda kabanzi ngokuvula amafayela ku-Chrome OS. + Chinese (Traditional) Pinyin +diff --git a/ui/strings/translations/ui_strings_ml.xtb b/ui/strings/translations/ui_strings_ml.xtb +index 57b083b88175..1d6805b8907c 100644 +--- a/ui/strings/translations/ui_strings_ml.xtb ++++ b/ui/strings/translations/ui_strings_ml.xtb +@@ -6,7 +6,7 @@ + {DAYS,plural, =1{ഒരു ദിവസം മുമ്പ്}other{# ദിവസം മുമ്പ്}} + {SECONDS,plural, =1{ഒരു മിനിറ്റിന് മുമ്പ്}other{# മിനിറ്റ് മുമ്പ്}} + {MINUTES,plural, =1{ 1 മീറ്റര്‍}other{# മീറ്റർ}} +-അപ്‌ലോഡുചെയ്യുക ++അപ്‌ലോഡ് ചെയ്യുക + പങ്കിടാനായില്ല + Win + ചെറിയ ഭാഗങ്ങളായി ടെക്‌സ്‌റ്റ് പങ്കിടാൻ ശ്രമിക്കൂ. +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0036-5005-infra-Add-the-root-vpython-spec-files-to-orches.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0036-5005-infra-Add-the-root-vpython-spec-files-to-orches.patch new file mode 100644 index 000000000000..b676ade10a0a --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0036-5005-infra-Add-the-root-vpython-spec-files-to-orches.patch @@ -0,0 +1,57 @@ +From ccc523864d7c822d2fbc5ffa5ffb92441d8d03c0 Mon Sep 17 00:00:00 2001 +From: Ben Pastene +Date: Thu, 23 Jun 2022 18:23:48 +0000 +Subject: [PATCH 36/59] 5005: infra: Add the root vpython spec files to + orchestrator runtime deps + +Some merge scripts import six. When preventing tools/build's venv from +propagating into their execution, they fail with import errors, eg: +https://logs.chromium.org/logs/chromium/led/infra-try-recipes-tester_chops-service-accounts.iam.gserviceaccount.com/87eaf62ee4e951d34e812ec2f066e106325201c793155d01c8e6ab39ffb58a0e/+/u/angle_unittests__with_patch__on_Ubuntu-18.04/Merge_script_log + +This is because the orchestrator doesn't have chromium's root vpython +spec files, and so have no way of importing six. So this throws the root +specs into the bundle that the orchestrator fetches since it's very +possible that merge/collect scripts will pop-up in the future that need +other non-standard libs present in the root spec files. + +(cherry picked from commit c263d8d4c6e6639e328b8b818e1ba038b2159807) + +Bug: 1326517 +Change-Id: I8c42fcfcc29c977b7c31fc58f03256b30f844a01 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3718050 +Reviewed-by: Stephanie Kim +Reviewed-by: Garrett Beaty +Commit-Queue: Ben Pastene +Cr-Original-Commit-Position: refs/heads/main@{#1016890} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3721582 +Cr-Commit-Position: refs/branch-heads/5005@{#1195} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + infra/orchestrator/BUILD.gn | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/infra/orchestrator/BUILD.gn b/infra/orchestrator/BUILD.gn +index 624de2e75eb3..b2488e07b978 100644 +--- a/infra/orchestrator/BUILD.gn ++++ b/infra/orchestrator/BUILD.gn +@@ -18,8 +18,15 @@ group("orchestrator_all") { + ":standard_isolated_script_merge_py", + ] + +- # Test specs the Orchestrator needs to trigger swarming tests +- data = [ "//testing/buildbot/*.json" ] ++ data = [ ++ # Various merge/collect scripts will likely need a venv specified in ++ # the root vpython spec files. ++ "//.vpython", ++ "//.vpython3", ++ ++ # Test specs the Orchestrator needs to trigger swarming tests ++ "//testing/buildbot/*.json", ++ ] + + # coverage tool for the Orchestrator to merge and output coverage data + if (use_clang_coverage) { +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0037-Incrementing-VERSION-to-102.0.5005.139.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0037-Incrementing-VERSION-to-102.0.5005.139.patch new file mode 100644 index 000000000000..e25413ff5018 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0037-Incrementing-VERSION-to-102.0.5005.139.patch @@ -0,0 +1,28 @@ +From 035949396fb58fe3d690f6e6f2bd2ac020554faf Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Fri, 24 Jun 2022 01:00:37 +0000 +Subject: [PATCH 37/59] Incrementing VERSION to 102.0.5005.139 + +Change-Id: I328ea7e8c903db76166895af4cb90a578f2a0592 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3722416 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1196} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index a63b8dbbec13..68428cc298bc 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=138 ++PATCH=139 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0038-Incrementing-VERSION-to-102.0.5005.140.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0038-Incrementing-VERSION-to-102.0.5005.140.patch new file mode 100644 index 000000000000..04bec07f91ee --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0038-Incrementing-VERSION-to-102.0.5005.140.patch @@ -0,0 +1,28 @@ +From e11498cece444b8f37363fd08322e87429d79e1c Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Sat, 25 Jun 2022 01:00:30 +0000 +Subject: [PATCH 38/59] Incrementing VERSION to 102.0.5005.140 + +Change-Id: Ie76b68333f90b75b8ddcb541e3b0015b169e4a86 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3724132 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1197} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 68428cc298bc..4bf645c073de 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=139 ++PATCH=140 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0039-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0039-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..2c7116966845 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0039-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,101 @@ +From b1ffae104b7ed5ba78885ad1be9607ffc450fe2e Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Sat, 25 Jun 2022 14:46:50 +0000 +Subject: [PATCH 39/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: I671e7b0066f2e8e7694516ecb1c1f19352e3c857 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3722269 +Bot-Commit: Rubber Stamper +Auto-Submit: Ben Mason +Commit-Queue: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1198} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + ash/strings/ash_strings_pt-PT.xtb | 2 +- + chrome/app/resources/generated_resources_te.xtb | 4 ++-- + .../strings/translations/android_chrome_strings_te.xtb | 6 +++--- + components/strings/components_strings_bs.xtb | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/ash/strings/ash_strings_pt-PT.xtb b/ash/strings/ash_strings_pt-PT.xtb +index c47907a293be..0475f638819c 100644 +--- a/ash/strings/ash_strings_pt-PT.xtb ++++ b/ash/strings/ash_strings_pt-PT.xtb +@@ -684,7 +684,7 @@ Eis alguns exemplos do que pode experimentar para começar. + , + + Frase seguinte +-O tempo terminou ++Acabou o tempo + Clique em qualquer local para capturar o ecrã inteiro. + O dispositivo estabeleceu ligação a um novo telemóvel. + Confirme a configuração do ecrã +diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb +index 8af2cc506d63..65684cdb50e1 100644 +--- a/chrome/app/resources/generated_resources_te.xtb ++++ b/chrome/app/resources/generated_resources_te.xtb +@@ -38,7 +38,7 @@ + ఫైల్ చెల్లదు లేదా పాడైంది + ఈ పేజీ ప్రతిస్పందించడం లేదు + అందుబాటులో ఉన్న పరికరాలు +-మీ కంప్యూటర్‌‍లో కూడా యొక్క అంతర్గత RLZ లైబ్రరీ ఉంటుంది. RLZ సెర్చ్‌లను మరియు నిర్దిష్ట ప్రమోషనల్ ప్రచారం ద్వారా ఉపయోగించబడిన వినియోగాన్ని లెక్కించడానికి, ప్రత్యేకం కానటువంటి, వ్యక్తిగతంగా గుర్తించలేని ట్యాగ్‌ను సమర్పిస్తుంది. ఈ లేబుళ్లు కొన్నిసార్లు లోని Google శోధన ప్రశ్నలలో కనిపిస్తాయి. ++మీ కంప్యూటర్‌‍లో కూడా యొక్క అంతర్గత RLZ లైబ్రరీ ఉంటుంది. RLZ సెర్చ్‌లను మరియు నిర్దిష్ట ప్రమోషనల్ ప్రచారం ద్వారా ఉపయోగించబడిన వినియోగాన్ని లెక్కించడానికి, ప్రత్యేకం కానటువంటి, వ్యక్తిగతంగా గుర్తించలేని ట్యాగ్‌ను సమర్పిస్తుంది. ఈ లేబుళ్లు కొన్నిసార్లు లోని Google Search ప్రశ్నలలో కనిపిస్తాయి. + ఏదో తప్పు జరిగింది. Linux పాక్షికంగా మాత్రమే అప్‌గ్రేడ్ అయి ఉండవచ్చు. మరింత సమాచారం కోసం లాగ్స్‌ను రివ్యూ చేయండి. Files > నా ఫైల్స్ > అనే సెట్టింగ్‌లో లాగ్స్ సేవ్ చేయబడ్డాయి + అలాగే, ఈ యాప్‌ల నుండి డేటాను క్లియర్ చేయాలా? + ఈ సైట్‌కు వెళ్లడానికి మీకు అనుమతి అవసరం. ఇందులో అనుచితమైన కంటెంట్ ఉండవచ్చు. +@@ -6307,7 +6307,7 @@ + మీ సంస్థ ద్వారా ఈ యాప్ జోడించబడింది. యాప్‌ను పునఃప్రారంభించడం ద్వారా దీని ఇన్‌స్టాలేషన్‌ను పూర్తి చేయండి. + కోసం పాస్‌వర్డ్‌లు సేవ్ చేయబడలేదు + Google Driveకు బ్యాకప్ చేయండి. ఏ సమయంలో అయినా సులభంగా మీ డేటాని పునరుద్ధరించండి లేదా పరికరాన్ని మార్చండి. ఈ బ్యాకప్‌లో యాప్ డేటా ఉంటుంది. బ్యాకప్‌లు Googleకి అప్‌లోడ్ చేయబడతాయి మరియు మీ Google ఖాతా పాస్‌వర్డ్‌ని ఉపయోగించి ఎన్‌క్రిప్ట్ చేయబడతాయి. మరింత తెలుసుకోండి +-మీరు బ్రౌజ్ చేసే ప్రతిసారి Google శోధన మరియు Google స్మార్ట్‌లను పొందండి ++మీరు బ్రౌజ్ చేసే ప్రతిసారి Google Search మరియు Google స్మార్ట్‌లను పొందండి + కీబోర్డ్ షార్ట్‌కట్ + మీరు ఎంటర్ప్రైజ్-ఎన్‌రోల్ చేసిన పరికరంలో ఉండాలి + సహా&యం పొందండి +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb +index 657f92070e7e..8b0bd7668111 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb +@@ -201,7 +201,7 @@ + అన్ని పరికరాలలో సింక్ చేయండి మరియు వ్యక్తిగతీకరించండి + ఆటోమేటిక్ సైన్-ఇన్ + వచనాన్ని చిన్న భాగాలుగా చేసి షేర్ చేయడానికి ప్రయత్నించండి +-పేజీ వదిలిపెట్టకుండానే వెబ్‌సైట్‌లలోని అంశాల గురించి తెలుసుకోండి. 'వెతకడానికి తాకండి' అనే ఫీచర్ ద్వారా, ఏదైనా ఒక పదాన్ని, దానికి సంబంధించిన సందర్భాన్ని Google శోధనకు పంపవచ్చు. దీని వల్ల, ఆ పదానికి సంబంధించిన నిర్వచనాలు, ఫోటోలు, శోధన ఫలితాలు, ఇతర వివరాలు పొందవచ్చు. ++పేజీ వదిలిపెట్టకుండానే వెబ్‌సైట్‌లలోని అంశాల గురించి తెలుసుకోండి. 'వెతకడానికి తాకండి' అనే ఫీచర్ ద్వారా, ఏదైనా ఒక పదాన్ని, దానికి సంబంధించిన సందర్భాన్ని Google Searchకు పంపవచ్చు. దీని వల్ల, ఆ పదానికి సంబంధించిన నిర్వచనాలు, ఫోటోలు, శోధన ఫలితాలు, ఇతర వివరాలు పొందవచ్చు. + + ఏదైనా పదంపై ట్యాప్ చేసి, దానిని వెతకండి. మీ శోధనను మెరుగుపరచడానికి, మరిన్ని ఎక్కువ లేదా తక్కువ పదాలను ఎంచుకునేందుకు తాకి & అలాగే నొక్కి ఉంచండి. మీ శోధనను ఎడిట్ చేయడానికి, ప్యానెల్‌ను తెరిచి, చిహ్నంపై ట్యాప్ చేయడం ద్వారా కొత్త ట్యాబ్‌లో తెరిచి, శోధన పెట్టెలో మీ మార్పులు చేయండి. + పేజీకి వెళ్లండి +@@ -260,7 +260,7 @@ + కనిపించే తీరు + పాస్‌వర్డ్‌ను చూపించు + మీరు డౌన్‌లోడ్‌ని మళ్లీ ప్రారంభించాలనుకుంటున్నారా? +-పేజీ వదిలిపెట్టకుండానే వెబ్‌సైట్‌లలోని అంశాల గురించి తెలుసుకోండి. 'వెతకడానికి తాకండి' అనే ఫీచర్ ద్వారా, ఏదైనా ఒక పదాన్ని, దానికి సంబంధించిన సందర్భాన్ని Google శోధనకు పంపవచ్చు. దీని వల్ల, ఆ పదానికి సంబంధించిన నిర్వచనాలు, ఫోటోలు, శోధన ఫలితాలు, ఇతర వివరాలు పొందవచ్చు. ++పేజీ వదిలిపెట్టకుండానే వెబ్‌సైట్‌లలోని అంశాల గురించి తెలుసుకోండి. 'వెతకడానికి తాకండి' అనే ఫీచర్ ద్వారా, ఏదైనా ఒక పదాన్ని, దానికి సంబంధించిన సందర్భాన్ని Google Searchకు పంపవచ్చు. దీని వల్ల, ఆ పదానికి సంబంధించిన నిర్వచనాలు, ఫోటోలు, శోధన ఫలితాలు, ఇతర వివరాలు పొందవచ్చు. + + ఏదైనా పదంపై తాకి & అలాగే నొక్కి ఉంచడం ద్వారా, దానిని వెతకండి. మీ శోధనను మెరుగుపరచడానికి, మరిన్ని లేదా తక్కువ పదాలను ఎంచుకోండి. మీ శోధనను ఎడిట్ చేయడానికి, ప్యానెల్‌ను తెరిచి, చిహ్నంపై ట్యాప్ చేయడం ద్వారా కొత్త ట్యాబ్‌లో తెరిచి, శోధన పెట్టెలో మీ మార్పులు చేయండి. + ముగించు +@@ -1305,7 +1305,7 @@ + హోమ్ పేజీని ఎడిట్ చేయండి + మీ స్టోర్ చేయబడిన సైన్ ఇన్ సమాచారం గడువు ముగిసి ఉండవచ్చు + సైట్ సమాచారాన్ని చూడండి +-'వెతకడానికి తాకండి' ఫీచర్, ఎంచుకున్న పదాన్ని మరియు ప్రస్తుత పేజీని సంబంధిత సందర్భంగా Google శోధనకు పంపుతుంది. మీరు సెట్టింగ్‌లులో దీనిని ఆఫ్ చేయవచ్చు. ++'వెతకడానికి తాకండి' ఫీచర్, ఎంచుకున్న పదాన్ని మరియు ప్రస్తుత పేజీని సంబంధిత సందర్భంగా Google Searchకు పంపుతుంది. మీరు సెట్టింగ్‌లులో దీనిని ఆఫ్ చేయవచ్చు. + సపోర్ట్ చేసే వెబ్‌సైట్‌లలో మీకు సాయం చేయగలదు అని తనకు తానుగా గుర్తించినప్పుడు Assistant మీకు కనిపిస్తుంది + మీరు ఏ భాషలను చదవగలరు? + కంటెంట్ +diff --git a/components/strings/components_strings_bs.xtb b/components/strings/components_strings_bs.xtb +index 58f9812b7b3a..9faa55d99f8f 100644 +--- a/components/strings/components_strings_bs.xtb ++++ b/components/strings/components_strings_bs.xtb +@@ -769,7 +769,7 @@ To će u suprotnom biti blokirano prema vašim postavkama privatnosti. Ovo će o + Vijesti iz svijeta + Oh, ne! + Informacije o potvrdi +-Historija Chrome udaljenog računara, uključujući vremenske oznake, host računare i ID-jeve sesija klijenta ++Historija Chrome udaljenog računara, uključujući vremenske oznake, host računare i ID-ove sesija klijenta + C9 (omotnica) + Usluga za zakrpe + Igra je počela. +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0040-Incrementing-VERSION-to-102.0.5005.141.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0040-Incrementing-VERSION-to-102.0.5005.141.patch new file mode 100644 index 000000000000..7d2f3f8ca71f --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0040-Incrementing-VERSION-to-102.0.5005.141.patch @@ -0,0 +1,28 @@ +From 2a66348c7b114c77befec67d09f7c51bc90481b0 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Sun, 26 Jun 2022 01:00:46 +0000 +Subject: [PATCH 40/59] Incrementing VERSION to 102.0.5005.141 + +Change-Id: I1a2244a2a320c1da6d8a7b015ba0e0e8db376acc +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3723310 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1199} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 4bf645c073de..dcc62d12b2fe 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=140 ++PATCH=141 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0041-Incrementing-VERSION-to-102.0.5005.142.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0041-Incrementing-VERSION-to-102.0.5005.142.patch new file mode 100644 index 000000000000..777243798c5c --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0041-Incrementing-VERSION-to-102.0.5005.142.patch @@ -0,0 +1,28 @@ +From c449c4553089b1e88bb24d31684952641135f667 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Mon, 27 Jun 2022 01:00:35 +0000 +Subject: [PATCH 41/59] Incrementing VERSION to 102.0.5005.142 + +Change-Id: Ic20be63d5fcc729e4839732ad7f4ca10244ca906 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3721306 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1200} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index dcc62d12b2fe..a69a3990b617 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=141 ++PATCH=142 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0042-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0042-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..7e9a3b997ef7 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0042-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,46 @@ +From cfe07affad708cf7e70decd86bb3cca64e9fca86 Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Mon, 27 Jun 2022 14:21:01 +0000 +Subject: [PATCH 42/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: I17782c02f17621fa514cfb29abee2836213415b2 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3726410 +Auto-Submit: Ben Mason +Bot-Commit: Rubber Stamper +Commit-Queue: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1201} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/app/resources/generated_resources_ne.xtb | 2 +- + chrome/credential_provider/gaiacp/strings/gaia_resources_my.xtb | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/chrome/app/resources/generated_resources_ne.xtb b/chrome/app/resources/generated_resources_ne.xtb +index 3b97345b7229..7f5558886721 100644 +--- a/chrome/app/resources/generated_resources_ne.xtb ++++ b/chrome/app/resources/generated_resources_ne.xtb +@@ -6698,7 +6698,7 @@ + कुनै साइटले तपाईंको डिभाइसका फाइल वा फोल्डरहरू सम्पादन गर्न खोज्दा सोध्नुहोस् (सिफारिस गरिएको) + Google ड्राइभमा ब्याकअप गर्नुहोस् जुनसुकै बेला सजिलैसँग आफ्नो डेटा पुनर्स्थापना गर्नुहोस् वा यन्त्र बदल्नुहोस्। तपाईंको ब्याकअपमा एपको डेटा समावेश हुन्छ। तपाईंका ब्याकअपहरू Google मा अपलोड गरी तपाईंको Google खाताको पासवर्ड प्रयोग गरेर इन्क्रिप्ट गरिन्छन्। + खाता थप्ने क्रममा कुनै त्रुटि भयो +-यन्त्र दर्ता गर्दै... ++डिभाइस दर्ता गरिँदै छ... + Play Store अन गर्नुहोस् + "" मा जडान गरिँदै + आवाज नआउने म्यासेजिङ प्रयोग गर्नुहोस् +diff --git a/chrome/credential_provider/gaiacp/strings/gaia_resources_my.xtb b/chrome/credential_provider/gaiacp/strings/gaia_resources_my.xtb +index 0cf012125d68..fc7eb723b99f 100644 +--- a/chrome/credential_provider/gaiacp/strings/gaia_resources_my.xtb ++++ b/chrome/credential_provider/gaiacp/strings/gaia_resources_my.xtb +@@ -7,7 +7,7 @@ + သတ်မှတ်ပေးထားသည့်အချိန် ကုန်သွားပါပြီ။ သင့်အလုပ်သုံးအကောင့်နှင့် လက်မှတ်ထိုးဝင်ပါ။ + သင့်အလုပ်သုံး အကောင့်သို့ လက်မှတ်ထိုးဝင်၍ မရပါ။ သင့်စီမံခန့်ခွဲသူထံ ဆက်သွယ်ပါ။ + ဤအီးမေးလ်ဖြင့် လက်မှတ်ထိုးဝင်ခွင့်မပြုပါ။ အလုပ် (သို့) ကျောင်းအတွက် သင်အသုံးပြုသောအကောင့်ကို ပြန်စမ်းကြည့်ပါ။ လက်မှတ်ထိုးဝင်၍မရသေးပါက သင်၏စီမံခန့်ခွဲသူထံ ဆက်သွယ်ပါ။ +-ဤစက်ပေါ်တွင် ကိုယ်ရေးကိုယ်တာအကောင့်နှင့် လက်မှတ်ထိုးဝင်ခြင်းကို ခွင့်မပြုပါ။ အလုပ်သုံး အကောင့်နှင့် လက်မှတ်ထိုးဝင်ပါ။ ++ဤစက်ပေါ်တွင် ကိုယ်ပိုင်အကောင့်ဖြင့် လက်မှတ်ထိုးဝင်ခြင်းကို ခွင့်မပြုပါ။ အလုပ်သုံး အကောင့်ဖြင့် ဝင်ပါ။ + သင့်လက်ရှိ Windows စကားဝှက် မထည့်ဘဲ ရှေ့ဆက်ပါက ဤစက်ပေါ်ရှိဒေတာများ အပြီးဆုံးရှုံးသွားနိုင်သည်။ + ဤကွန်ပျူတာပေါ်ရှိ အသုံးပြုသူတစ်ဦးကို ဤအကောင့်သုံး၍ ထည့်ထားပြီး ဖြစ်ပါသည်။ အခြားအကောင့်တစ်ခုဖြင့် လက်မှတ်ထိုးဝင်ရောက်ပါ။ + သင့်စက်ကို အင်တာနက်ချိတ်ဆက်ထားခြင်း ရှိမရှိ စစ်ဆေးပြီး ထပ်စမ်းကြည့်ပါ +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0043-Incrementing-VERSION-to-102.0.5005.143.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0043-Incrementing-VERSION-to-102.0.5005.143.patch new file mode 100644 index 000000000000..1d107689582c --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0043-Incrementing-VERSION-to-102.0.5005.143.patch @@ -0,0 +1,28 @@ +From 48449d6d4fe931000cc37681a3f797169e74c5d9 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Tue, 28 Jun 2022 01:00:24 +0000 +Subject: [PATCH 43/59] Incrementing VERSION to 102.0.5005.143 + +Change-Id: I0045565f8b8db576541a4a3630cf6ff7db5415a5 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3731448 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1202} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index a69a3990b617..915e8754e191 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=142 ++PATCH=143 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0044-testing-fix-check_static_initializers.py-for-python3.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0044-testing-fix-check_static_initializers.py-for-python3.patch new file mode 100644 index 000000000000..bd6c8ff8965b --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0044-testing-fix-check_static_initializers.py-for-python3.patch @@ -0,0 +1,57 @@ +From 7d8cce15d329617b717e4b48fc15054f6c8a2bc2 Mon Sep 17 00:00:00 2001 +From: Takuto Ikuta +Date: Tue, 28 Jun 2022 02:29:02 +0000 +Subject: [PATCH 44/59] testing: fix check_static_initializers.py for python3 + for M102 + +(cherry picked from commit dce7a1bfd410fbeb4e17fc6562c150f5dd81310e) + +Bug: 1333950 +Change-Id: I876378a3ccdbb795c64172555766c027d8259f99 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3689103 +Reviewed-by: Brian Sheedy +Reviewed-by: Ben Pastene +Auto-Submit: Takuto Ikuta +Commit-Queue: Takuto Ikuta +Cr-Original-Commit-Position: refs/heads/main@{#1011772} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3713705 +Cr-Commit-Position: refs/branch-heads/5005@{#1203} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + testing/scripts/check_static_initializers.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/testing/scripts/check_static_initializers.py b/testing/scripts/check_static_initializers.py +index 3afd112883b5..d5351e749254 100755 +--- a/testing/scripts/check_static_initializers.py ++++ b/testing/scripts/check_static_initializers.py +@@ -64,7 +64,7 @@ COVERAGE_BUILD_FALLBACK_EXPECTED_MAC_SI_COUNT = 4 + + + def run_process(command): +- p = subprocess.Popen(command, stdout=subprocess.PIPE) ++ p = subprocess.Popen(command, stdout=subprocess.PIPE, universal_newlines=True) + stdout = p.communicate()[0] + if p.returncode != 0: + raise Exception( +@@ -205,7 +205,7 @@ def main_run(args): + if sys.platform.startswith('darwin'): + rc = main_mac(src_dir, + allow_coverage_initializer = '--allow-coverage-initializer' in args.args) +- elif sys.platform == 'linux2': ++ elif sys.platform.startswith('linux'): + is_chromeos = 'buildername' in args.properties and \ + 'chromeos' in args.properties['buildername'] + rc = main_linux(src_dir, is_chromeos) +@@ -222,7 +222,7 @@ def main_run(args): + def main_compile_targets(args): + if sys.platform.startswith('darwin'): + compile_targets = ['chrome'] +- elif sys.platform == 'linux2': ++ elif sys.platform.startswith('linux'): + compile_targets = ['chrome', 'nacl_helper', 'nacl_helper_bootstrap'] + else: + compile_targets = [] +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0045-sheriff-Disable-QuarantineMacTest.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0045-sheriff-Disable-QuarantineMacTest.patch new file mode 100644 index 000000000000..e6a25e72274b --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0045-sheriff-Disable-QuarantineMacTest.patch @@ -0,0 +1,81 @@ +From ffa3ed225452998f8de5cdde235f3ba0a6400d83 Mon Sep 17 00:00:00 2001 +From: Yuki Shiino +Date: Tue, 28 Jun 2022 05:11:12 +0000 +Subject: [PATCH 45/59] sheriff: Disable QuarantineMacTest.* + +(cherry picked from commit b9fd9cf1ba3fb180e4c94dc98016066f4f876fa5) + +Bug: 1334495 +Change-Id: I300191c2cdf9303e71e680846e0b6568fe0cd6c0 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3692655 +Owners-Override: Yuki Shiino +Commit-Queue: Yuki Shiino +Reviewed-by: Takuto Ikuta +Cr-Original-Commit-Position: refs/heads/main@{#1011837} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3708693 +Commit-Queue: Takuto Ikuta +Owners-Override: Takuto Ikuta +Auto-Submit: Steven Holte +Cr-Commit-Position: refs/branch-heads/5005@{#1204} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + .../quarantine/quarantine_mac_unittest.mm | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/components/services/quarantine/quarantine_mac_unittest.mm b/components/services/quarantine/quarantine_mac_unittest.mm +index c7358a3ddfff..36572f572f6a 100644 +--- a/components/services/quarantine/quarantine_mac_unittest.mm ++++ b/components/services/quarantine/quarantine_mac_unittest.mm +@@ -68,7 +68,8 @@ class QuarantineMacTest : public testing::Test { + base::scoped_nsobject file_url_; + }; + +-TEST_F(QuarantineMacTest, CheckMetadataSetCorrectly) { ++// TODO(crbug.com/1334495): Enable this test. ++TEST_F(QuarantineMacTest, DISABLED_CheckMetadataSetCorrectly) { + QuarantineFile( + test_file_, source_url_, referrer_url_, "", + base::BindOnce(&CheckQuarantineResult, QuarantineFileResult::OK)); +@@ -76,7 +77,8 @@ TEST_F(QuarantineMacTest, CheckMetadataSetCorrectly) { + EXPECT_TRUE(IsFileQuarantined(test_file_, source_url_, referrer_url_)); + } + +-TEST_F(QuarantineMacTest, SetMetadataMultipleTimes) { ++// TODO(crbug.com/1334495): Enable this test. ++TEST_F(QuarantineMacTest, DISABLED_SetMetadataMultipleTimes) { + GURL dummy_url("http://www.dummy.example.com"); + QuarantineFile( + test_file_, source_url_, referrer_url_, "", +@@ -97,7 +99,8 @@ TEST_F(QuarantineMacTest, IsFileQuarantined_NoAnnotationsOnFile) { + EXPECT_FALSE(IsFileQuarantined(test_file_, GURL(), GURL())); + } + +-TEST_F(QuarantineMacTest, IsFileQuarantined_SourceUrlOnly) { ++// TODO(crbug.com/1334495): Enable this test. ++TEST_F(QuarantineMacTest, DISABLED_IsFileQuarantined_SourceUrlOnly) { + QuarantineFile( + test_file_, source_url_, GURL(), std::string(), + base::BindOnce(&CheckQuarantineResult, QuarantineFileResult::OK)); +@@ -108,7 +111,8 @@ TEST_F(QuarantineMacTest, IsFileQuarantined_SourceUrlOnly) { + EXPECT_FALSE(IsFileQuarantined(test_file_, referrer_url_, GURL())); + } + +-TEST_F(QuarantineMacTest, IsFileQuarantined_FullMetadata) { ++// TODO(crbug.com/1334495): Enable this test. ++TEST_F(QuarantineMacTest, DISABLED_IsFileQuarantined_FullMetadata) { + QuarantineFile( + test_file_, source_url_, referrer_url_, std::string(), + base::BindOnce(&CheckQuarantineResult, QuarantineFileResult::OK)); +@@ -121,7 +125,8 @@ TEST_F(QuarantineMacTest, IsFileQuarantined_FullMetadata) { + EXPECT_FALSE(IsFileQuarantined(test_file_, referrer_url_, referrer_url_)); + } + +-TEST_F(QuarantineMacTest, IsFileQuarantined_Sanitize) { ++// TODO(crbug.com/1334495): Enable this test. ++TEST_F(QuarantineMacTest, DISABLED_IsFileQuarantined_Sanitize) { + GURL host_url{"https://user:pass@example.com/foo/bar?x#y"}; + GURL host_url_clean{"https://example.com/foo/bar?x#y"}; + GURL referrer_url{"https://user:pass@example.com/foo/index?x#y"}; +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0046-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0046-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..d2d23b799766 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0046-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,274 @@ +From 363e0eca3560faf7d01c41c81fa622c840b705fb Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Tue, 28 Jun 2022 14:37:25 +0000 +Subject: [PATCH 46/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: Ib7225417cd733aad7e0379456f5c1d83215d5b19 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3731031 +Commit-Queue: Rubber Stamper +Bot-Commit: Rubber Stamper +Auto-Submit: Ben Mason +Cr-Commit-Position: refs/branch-heads/5005@{#1205} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + ash/strings/ash_strings_de.xtb | 2 +- + .../app/resources/generated_resources_mr.xtb | 2 +- + .../resources/generated_resources_pt-PT.xtb | 18 +++++++++--------- + .../app/resources/generated_resources_te.xtb | 2 +- + .../strings/accessibility_strings_pt-PT.xtb | 18 +++++++++--------- + .../policy/resources/policy_templates_de.xtb | 2 +- + components/strings/components_strings_mr.xtb | 2 +- + components/strings/components_strings_te.xtb | 2 +- + 8 files changed, 24 insertions(+), 24 deletions(-) + +diff --git a/ash/strings/ash_strings_de.xtb b/ash/strings/ash_strings_de.xtb +index 3298a08b2472..ecd143d7e28a 100644 +--- a/ash/strings/ash_strings_de.xtb ++++ b/ash/strings/ash_strings_de.xtb +@@ -1207,7 +1207,7 @@ Neuinstallation + Notiz erstellen + Shelf Party ein-/ausschalten. + Weiter um einen Buchstaben +-Die Leistung von Peripheriegeräten kann im Gastmodus eingeschränkt sein ++Die Leistung des Peripheriegeräts kann im Gastmodus eingeschränkt sein + und dein Smartphone werden automatisch miteinander verbunden + Gute Nacht, + Spionageschutz +diff --git a/chrome/app/resources/generated_resources_mr.xtb b/chrome/app/resources/generated_resources_mr.xtb +index 765298e60f1b..0d2076903033 100644 +--- a/chrome/app/resources/generated_resources_mr.xtb ++++ b/chrome/app/resources/generated_resources_mr.xtb +@@ -2719,7 +2719,7 @@ + नवीन वैशिष्ट्ये उपलब्ध होताच क्षणी ते ऑफर करते + पूर्वावलोकन + प्रिंट आणि स्कॅन करा +-नेटवर्क सर्टिफिकेट प्राप्त करा ++नेटवर्क सर्टिफिकेट मिळवा + वॉलपेपर बदला + बटनडाउन + वापरकर्ता इमेज पूर्वावलोकन +diff --git a/chrome/app/resources/generated_resources_pt-PT.xtb b/chrome/app/resources/generated_resources_pt-PT.xtb +index b2d1427a5ddc..b5c662e463fc 100644 +--- a/chrome/app/resources/generated_resources_pt-PT.xtb ++++ b/chrome/app/resources/generated_resources_pt-PT.xtb +@@ -13,7 +13,7 @@ + Localização do + Este separador está associado a uma porta de série. + {NUM_PAGES,plural, =1{Página sem resposta}other{Páginas sem resposta}} +-Volume da síntese de voz ++Volume da conversão de texto em voz + Os seus ficheiros de Docs, Folhas, Slides e Desenhos estão a ser sincronizados. Abra a app Google Drive para aceder aos ficheiros online ou offline. + Dispositivo USB-C (porta frontal) + TrackPoint +@@ -435,7 +435,7 @@ + Sim + A app está bloqueada + Clique em Tentar novamente e aceite o pedido no computador. +-Tom da síntese de voz ++Tom da conversão de texto em voz + País + Ativar as teclas aderentes (para executar atalhos de teclado escrevendo-os sequencialmente) + A licença da app expirou +@@ -529,7 +529,7 @@ As autorizações que já concedeu às apps podem aplicar-se a esta conta. Pode + Ativo hoje + Nunca guardado + Visto no mês passado +-Motores da síntese de voz ++Motores da conversão de texto em voz + Teclado + Não, Obrigado + Utilizar apenas Wi-Fi para determinar a localização +@@ -810,7 +810,7 @@ As autorizações que já concedeu às apps podem aplicar-se a esta conta. Pode + Ups! Ocorreu um problema ao contactar o servidor de início de sessão. Verifique a sua ligação de rede e o nome do domínio, e tente novamente. + Abrir Link Numa Nova &Janela + Faça uma cópia de segurança das apps Android para o Google Drive. +-Dados de aplicações alojadas ++Dados de apps alojadas + Não permitir que os sites utilizem JavaScript + Adicionar utilizador + : +@@ -2788,7 +2788,7 @@ Pretende pará-lo? + Extensão: + As páginas visualizadas nesta janela não serão apresentadas no histórico do navegador nem no histórico de pesquisas e não deixarão outros vestígios, como cookies, no computador depois de terminar sessão. Os ficheiros transferidos e os marcadores criados não serão preservados. + Abra a pesquisa no painel lateral +-Voz da síntese de voz ++Voz da conversão de texto em voz + Obrigado pelo seu feedback. Neste modo, está offline, pelo que o seu relatório será enviado mais tarde. + Limite de movimentos + Pedido de Partilha de Ecrã de +@@ -4563,7 +4563,7 @@ Pode atribuir vários interruptores a esta ação. + À procura de partilhas de ficheiros… + Pode navegar pelas páginas com um cursor de texto. Prima F7 para desativar esta opção. + É necessário reiniciar antes de ser possível repor o dispositivo com o Powerwash. Saber mais +-Olá! Sou a sua voz para a síntese de voz. ++Olá! Sou a sua voz para a conversão de texto em voz. + Guardar palavras-passe para este site + IBM + Ao continuar, aceita que este dispositivo também pode transferir e instalar automaticamente atualizações e apps da Google, do operador da criança e do fabricante deste dispositivo, possivelmente através de dados móveis. Algumas destas apps podem oferecer compras na app. +@@ -5526,7 +5526,7 @@ Certifique-se de que não revela informações confidenciais. + Está disponível uma atualização para a versão Debian 11 (Bullseye). + Carregar expandida + Este dispositivo (SN: ) foi bloqueado pelo proprietário. +-Taxa da síntese de voz ++Taxa da conversão de texto em voz + Abrir as definições do ChromeVox + Sem autorização para reproduzir som + Atualizar erro +@@ -5740,7 +5740,7 @@ Certifique-se de que não revela informações confidenciais. + Ninguém conseguirá partilhar consigo enquanto não se tornar visível.Para se tornar temporariamente visível, abra a área de estado e, em seguida, ative a Visibilidade na proximidade. + Não é possível estabelecer ligação à rede. Verifique a ligação de rede e tente novamente. + O proprietário pode controlar esta funcionalidade em Definições > Avançadas > Enviar automaticamente dados de diagnóstico e de utilização para a Google. +-Selecionar e personalizar as vozes para a síntese de voz. ++Selecionar e personalizar as vozes para a conversão de texto em voz. + Explore mais definições abaixo ou conclua agora + Memória SQLite + Separador aberto +@@ -6374,7 +6374,7 @@ Certifique-se de que não revela informações confidenciais. + % – até ficar completa + Erro de transferência + Ocorreu um erro enquanto o Chrome procurava software prejudicial. +-Definições de voz para a síntese de voz ++Definições de voz para a conversão de texto em voz + Autorização solicitada + Suave + Barra de informações +diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb +index 65684cdb50e1..a810b57ffadf 100644 +--- a/chrome/app/resources/generated_resources_te.xtb ++++ b/chrome/app/resources/generated_resources_te.xtb +@@ -5636,7 +5636,7 @@ + + అర్హతను చెక్ చేస్తోంది + మీరు Google పాస్‌వర్డ్ మేనేజర్‌లో సేవ్ చేసిన పాస్‌వర్డ్‌లను చూడవచ్చు, మేనేజ్ చేయవచ్చు +- శోధన ఫలితం : . విభాగానికి నావిగేట్ చేయడానికి ఎంటర్ నొక్కండి. ++ సెర్చ్ ఫలితం : . విభాగానికి నావిగేట్ చేయడానికి ఎంటర్ నొక్కండి. + సైట్‌లు సాధారణంగా మీ ఫాంట్‌లను ఉపయోగించుకుంటాయి, తద్వారా ఆన్‌లైన్ డిజైన్, గ్రాఫిక్స్ టూల్స్‌తో మీరు అధిక క్వాలిటీ గల కంటెంట్‌ను క్రియేట్ చేయవచ్చు + మీరు బ్రౌజింగ్ హిస్టరీ — మొత్తాన్ని లేదా ఒక నిర్దిష్ట సైట్‌కు సంబంధించిన బ్రౌజింగ్ హిస్టరీని తొలగించినప్పుడు — అనుబంధించి ఉన్న అంచనా సమాచారాన్ని కూడా మీరు తొలగిస్తారు. మీ బ్రౌజింగ్ హిస్టరీని చూడండి + మేము ఈ డేటాను ఎలా ఉపయోగిస్తాము: +diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_pt-PT.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_pt-PT.xtb +index 5173e0310f25..75f1605d0d03 100644 +--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_pt-PT.xtb ++++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_pt-PT.xtb +@@ -51,7 +51,7 @@ + Negrito + Título de nível 6 seguinte + Não existe nenhuma expressão matemática anterior. +-Definições da síntese de voz ++Definições da conversão de texto em voz + Linha selecionada + Pode sempre ver tutoriais ao abrir os menus com um toque de quatro dedos. Em seguida, ative o tutorial na secção "ChromeVox". + Botão ativar/desativar +@@ -198,7 +198,7 @@ + Painel de separadores + Um link + Também pode premir Enter para ativar itens. Por exemplo, pode utilizar a tecla Enter para enviar texto num formulário. Para continuar, prima Enter. +-Ativar ou desativar a síntese de voz ++Ativar ou desativar a conversão de texto em voz + Para avançar, prima Enter. Para retroceder, prima a tecla de retrocesso. + Escreva para pesquisar a página. Prima Enter para avançar para o resultado, as setas para cima ou para baixo para procurar resultados, continue a escrever para alterar a sua pesquisa ou prima Escape para cancelar. + Azul-violeta +@@ -219,7 +219,7 @@ + Título 6 + {COUNT,plural, =1{asterisco}other{# asteriscos}} + Castanho rosado +-Abrir definições da síntese de voz ++Abrir definições da conversão de texto em voz + Amarelo-esverdeado + Tutorial do ChromeVox + Atalhos de teclado do Chromebook +@@ -656,7 +656,7 @@ + Não existe nenhum cabeçalho de nível 1 seguinte. + Complementar + Lista de páginas +-Olá! Sou a sua voz para a síntese de voz. ++Olá! Sou a sua voz para a conversão de texto em voz. + Teclas essenciais: Shift + Palavra + Menu de contexto +@@ -705,7 +705,7 @@ + Título de nível 5 anterior + Apêndice + Muito bem! Aprendeu as noções básicas acerca do toque do ChromeVox. Pode voltar a assistir ao tutorial ou sair do mesmo com os botões abaixo. +-Extensão de síntese de voz Google Enhanced Network ++Extensão de conversão de texto em voz Google Enhanced Network + Tocar com dois dedos + Item de árvore + Azul-turquesa escuro +@@ -723,7 +723,7 @@ + Diminuir volume de voz + Prima a tecla de pesquisa + seta para a direita ou tecla de pesquisa + seta para a esquerda para procurar tópicos + Azul-pólvora +-Reponha as definições da síntese de voz para os valores predefinidos. ++Reponha as definições da conversão de texto em voz para os valores predefinidos. + Tabela + Reproduzir num volume mais baixo quando o ChromeVox estiver a falar + Amarelo +@@ -902,7 +902,7 @@ + Não existe nenhum gráfico anterior. + Aplicação + Botão de opção seguinte +-Voz da síntese de voz do sistema ++Voz da conversão de texto em voz do sistema + Sem pontuação + Ativar descrições detalhadas + Em branco +@@ -960,7 +960,7 @@ + {COUNT,plural, =1{hora}other{horas}} + Link seguinte + mark +-Repor definições da síntese de voz ++Repor definições da conversão de texto em voz + Editar texto, entrada de URL + tlbar + Botão de opção anterior +@@ -1057,7 +1057,7 @@ + Definição + dir + Renda antiga +-Personalizar as definições da síntese de voz ++Personalizar as definições da conversão de texto em voz + Verde-relva + {COUNT,plural, =1{libra}other{# sinais de libra}} + Região +diff --git a/components/policy/resources/policy_templates_de.xtb b/components/policy/resources/policy_templates_de.xtb +index feae20418efb..e3cdc43623fa 100644 +--- a/components/policy/resources/policy_templates_de.xtb ++++ b/components/policy/resources/policy_templates_de.xtb +@@ -6255,7 +6255,7 @@ werden abgelehnt. + Bei Ursprüngen, die durch die hier angegebenen Muster nicht abgedeckt sind, kommt entweder der globale Standardwert der Richtlinie „“, sofern konfiguriert, oder die persönliche Konfiguration des Nutzers zum Einsatz. + + Weitere Informationen zu gültigen URL-Mustern findest du unter https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns. +-Keepalive-Dauer beim Herunterfahren abrufen ++Fetch-Keepalive-Dauer beim Herunterfahren + Zeitraum in Tagen, nach dem der Nutzer abgemeldet wird, wenn die Version von niedriger ist als der angegebene -Wert. + Zulässige App- bzw. Erweiterungstypen konfigurieren + Sicherheitswarnungen anzeigen, wenn potenziell schädliche Befehlszeilen-Flags verwendet werden +diff --git a/components/strings/components_strings_mr.xtb b/components/strings/components_strings_mr.xtb +index 4d28b6c9f60b..b41b739d4c8c 100644 +--- a/components/strings/components_strings_mr.xtb ++++ b/components/strings/components_strings_mr.xtb +@@ -918,7 +918,7 @@ + Juuro-Ku-Kai + या डिव्हाइसच्या मालकाने डायनासोर गेम बंद केला आहे. + सर्टिफिकेट दाखवा ( ने जारी केलेले) +-मध्यंतर प्राप्त करा: ++मध्यंतर मिळवा: + किती वेळा पुन्हा प्रयत्न केले + आकार बदलण्यायोग्य + Number-11 (Envelope) +diff --git a/components/strings/components_strings_te.xtb b/components/strings/components_strings_te.xtb +index 4c6638f9b39e..27f1afd0deae 100644 +--- a/components/strings/components_strings_te.xtb ++++ b/components/strings/components_strings_te.xtb +@@ -2298,7 +2298,7 @@ + , Chrome సెట్టింగ్‌లలో అడ్రస్‌లను జోడించడానికి, మేనేజ్ చేయడానికి 'Tab'ను నొక్కి, ఆపై 'Enter'ను నొక్కండి + మీ పరికరాన్ని ఎలా ఉపయోగించాలో తెలుసుకోవాలనుకుంటున్నారా? + పేమెంట్ హ్యాండ్లర్‌లు +-శోధన ఫలితం ++సెర్చ్ ఫలితం + ప్రోటోకాల్ నిర్వాహకులు + మీ పరికరంలో మీరు లేదా మరొకరు ఇన్‌స్టాల్ చేసిన సర్టిఫికేట్ కారణంగా ఈ సమస్య తలెత్తుతుంది. నెట్‌వర్క్‌లను పర్యవేక్షించడానికి మరియు అడ్డగించడానికి సర్టిఫికెట్ ఉపయోగించబడుతుంది, ఇది Chrome ద్వారా విశ్వసించబడదు. పర్యవేక్షణ కోసం కొన్ని చట్టబద్ధమైన కేసులు ఉన్నప్పటికీ, పాఠశాల లేదా కంపెనీ నెట్‌వర్క్‌లో మాదిరిగా, మీరు దీన్ని ఆపలేక పోయినప్పటికీ, ఇది జరుగుతున్నట్లు మీకు తెలుసని Chrome నిర్ధారించుకోవాలనుకుంటుంది. వెబ్‌ను యాక్సెస్ చేసే ఏదైనా బ్రౌజర్ లేదా యాప్‌లో పర్యవేక్షణ జరగవచ్చు. + ఫైల్‌ను జోడించినప్పుడు +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0047-migrate-metrics_python_tests-to-python3-for-M102.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0047-migrate-metrics_python_tests-to-python3-for-M102.patch new file mode 100644 index 000000000000..abe8d1225025 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0047-migrate-metrics_python_tests-to-python3-for-M102.patch @@ -0,0 +1,106 @@ +From 394e7eb51ff0cdd3c240e8d10d9fb08adfbe60c9 Mon Sep 17 00:00:00 2001 +From: Takuto Ikuta +Date: Tue, 28 Jun 2022 17:22:43 +0000 +Subject: [PATCH 47/59] migrate metrics_python_tests to python3 for M102 + +This cherry pick includes additional fix for L235 in common.py. + +(cherry picked from commit a1b9cfb94303fcbaae90a5def1991d3724b0bdb4) + +Bug: 1287214 +Change-Id: I68b680617d2e7aa3ccc23375e2eaaa113779d7c5 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3689318 +Reviewed-by: Robert Kaplow +Auto-Submit: Takuto Ikuta +Reviewed-by: Brian Sheedy +Commit-Queue: Brian Sheedy +Cr-Original-Commit-Position: refs/heads/main@{#1011049} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3711081 +Cr-Commit-Position: refs/branch-heads/5005@{#1206} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + testing/scripts/common.py | 6 +++--- + testing/scripts/metrics_python_tests.py | 4 ++-- + tools/variations/fieldtrial_to_struct.py | 2 +- + tools/variations/fieldtrial_util.py | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/testing/scripts/common.py b/testing/scripts/common.py +index 4965f8f58ba0..995fb9688e83 100644 +--- a/testing/scripts/common.py ++++ b/testing/scripts/common.py +@@ -208,7 +208,7 @@ def parse_common_test_results(json_results, test_separator='/'): + def convert_trie_to_flat_paths(trie, prefix=None): + # Also see blinkpy.web_tests.layout_package.json_results_generator + result = {} +- for name, data in trie.iteritems(): ++ for name, data in trie.items(): + if prefix: + name = prefix + test_separator + name + if len(data) and not 'actual' in data and not 'expected' in data: +@@ -232,7 +232,7 @@ def parse_common_test_results(json_results, test_separator='/'): + passing_statuses = ('PASS', 'SLOW', 'NEEDSREBASELINE') + + for test, result in convert_trie_to_flat_paths( +- json_results['tests']).iteritems(): ++ json_results['tests']).items(): + key = 'unexpected_' if result.get('is_unexpected') else '' + data = result['actual'] + actual_results = data.split() +@@ -291,7 +291,7 @@ def get_gtest_summary_passes(output): + mapping = {} + + for cur_iteration_data in output.get('per_iteration_data', []): +- for test_fullname, results in cur_iteration_data.iteritems(): ++ for test_fullname, results in cur_iteration_data.items(): + # Results is a list with one entry per test try. Last one is the final + # result. + last_result = results[-1] +diff --git a/testing/scripts/metrics_python_tests.py b/testing/scripts/metrics_python_tests.py +index 70770f41b56e..41db12a37b12 100755 +--- a/testing/scripts/metrics_python_tests.py ++++ b/testing/scripts/metrics_python_tests.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env vpython3 + # Copyright 2021 The Chromium Authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +@@ -15,7 +15,7 @@ import common + + def main_run(args): + with common.temporary_file() as tempfile_path: +- rc = common.run_command(['vpython', ++ rc = common.run_command(['vpython3', + os.path.join(common.SRC_DIR, 'testing', 'test_env.py'), + os.path.join(common.SRC_DIR, 'tools', 'metrics', + 'metrics_python_tests.py'), +diff --git a/tools/variations/fieldtrial_to_struct.py b/tools/variations/fieldtrial_to_struct.py +index 9ecf38974795..3c90ff9fea5a 100755 +--- a/tools/variations/fieldtrial_to_struct.py ++++ b/tools/variations/fieldtrial_to_struct.py +@@ -76,7 +76,7 @@ def _LoadFieldTrialConfig(filename, platforms, invert): + def _ConvertOverrideUIStrings(override_ui_strings): + """Converts override_ui_strings to formatted dicts.""" + overrides = [] +- for ui_string, override in override_ui_strings.iteritems(): ++ for ui_string, override in override_ui_strings.items(): + overrides.append({ + 'name_hash': generate_ui_string_overrider.HashName(ui_string), + 'value': override +diff --git a/tools/variations/fieldtrial_util.py b/tools/variations/fieldtrial_util.py +index ac0b9f54292f..284bcb5899c8 100644 +--- a/tools/variations/fieldtrial_util.py ++++ b/tools/variations/fieldtrial_util.py +@@ -31,7 +31,7 @@ def _FindDuplicates(entries): + duplicates.add(entry) + else: + seen.add(entry) +- return duplicates ++ return sorted(duplicates) + + def _CheckForDuplicateFeatures(enable_features, disable_features): + enable_features = [f.split('<')[0] for f in enable_features] +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0048-M102-Let-GPU-Intel-Macs-target-12.4.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0048-M102-Let-GPU-Intel-Macs-target-12.4.patch new file mode 100644 index 000000000000..90b5485dc625 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0048-M102-Let-GPU-Intel-Macs-target-12.4.patch @@ -0,0 +1,1714 @@ +From 3c1756adad63e6cb926755a8e1f9bce6c1c7cf1b Mon Sep 17 00:00:00 2001 +From: Brian Sheedy +Date: Tue, 28 Jun 2022 23:34:56 +0000 +Subject: [PATCH 48/59] [M102] Let GPU Intel Macs target 12.4 + +Adds Mac 12.4 as a valid OS dimension for the stable Intel Mac Mini +mixin, as the experimental bot seems pretty happy with the OS upgrade. + +(cherry picked from commit 474c9f01cb4aa3dd5f192b7e9d9478c3cd0f0403) + +Bug: 1334335 +Change-Id: I7640208673c90a87202eee73aafd0f42764fbfb4 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3716986 +Auto-Submit: Brian Sheedy +Reviewed-by: Yuly Novikov +Commit-Queue: Yuly Novikov +Cr-Original-Commit-Position: refs/heads/main@{#1017135} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3733168 +Commit-Queue: Brian Sheedy +Cr-Commit-Position: refs/branch-heads/5005@{#1207} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + testing/buildbot/chromium.angle.json | 22 +-- + testing/buildbot/chromium.dawn.json | 48 ++--- + testing/buildbot/chromium.gpu.fyi.json | 182 +++++++++---------- + testing/buildbot/chromium.gpu.json | 56 +++--- + testing/buildbot/chromium.swangle.json | 2 +- + testing/buildbot/client.v8.fyi.json | 18 +- + testing/buildbot/mixins.pyl | 2 +- + testing/buildbot/tryserver.chromium.mac.json | 36 ++-- + 8 files changed, 183 insertions(+), 183 deletions(-) + +diff --git a/testing/buildbot/chromium.angle.json b/testing/buildbot/chromium.angle.json +index 0130290604aa..f4883ec8b7a4 100644 +--- a/testing/buildbot/chromium.angle.json ++++ b/testing/buildbot/chromium.angle.json +@@ -302,7 +302,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "named_caches": [ +@@ -362,7 +362,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "named_caches": [ +@@ -1792,7 +1792,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", +@@ -1817,7 +1817,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1859,7 +1859,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1897,7 +1897,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1936,7 +1936,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1974,7 +1974,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -2012,7 +2012,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -2050,7 +2050,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -2087,7 +2087,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +diff --git a/testing/buildbot/chromium.dawn.json b/testing/buildbot/chromium.dawn.json +index a128043e8aea..f1584918902f 100644 +--- a/testing/buildbot/chromium.dawn.json ++++ b/testing/buildbot/chromium.dawn.json +@@ -1783,7 +1783,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1810,7 +1810,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1837,7 +1837,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1864,7 +1864,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1889,7 +1889,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1912,7 +1912,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1943,7 +1943,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1967,7 +1967,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -2005,7 +2005,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -2043,7 +2043,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -2078,7 +2078,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -2116,7 +2116,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -2972,7 +2972,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -2999,7 +2999,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -3026,7 +3026,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -3053,7 +3053,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -3078,7 +3078,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -3101,7 +3101,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -3132,7 +3132,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -3156,7 +3156,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -3194,7 +3194,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -3232,7 +3232,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -3267,7 +3267,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -3305,7 +3305,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json +index 6c004533a068..3c22537f9264 100644 +--- a/testing/buildbot/chromium.gpu.fyi.json ++++ b/testing/buildbot/chromium.gpu.fyi.json +@@ -11285,7 +11285,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -11314,7 +11314,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -11341,7 +11341,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", +@@ -11368,7 +11368,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -11392,7 +11392,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -11416,7 +11416,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -11437,7 +11437,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -11462,7 +11462,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -11500,7 +11500,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -11536,7 +11536,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -11572,7 +11572,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -11608,7 +11608,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -11648,7 +11648,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -11693,7 +11693,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -11738,7 +11738,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -11774,7 +11774,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -11810,7 +11810,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -11855,7 +11855,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -11900,7 +11900,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -11937,7 +11937,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -11974,7 +11974,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12010,7 +12010,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12048,7 +12048,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12087,7 +12087,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12125,7 +12125,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12163,7 +12163,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12200,7 +12200,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12229,7 +12229,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -12257,7 +12257,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", +@@ -12284,7 +12284,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -12308,7 +12308,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -12332,7 +12332,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -12353,7 +12353,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -12378,7 +12378,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -12416,7 +12416,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12452,7 +12452,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12488,7 +12488,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12528,7 +12528,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12573,7 +12573,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12618,7 +12618,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12655,7 +12655,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12691,7 +12691,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -12728,7 +12728,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -13919,7 +13919,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -13948,7 +13948,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -13975,7 +13975,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", +@@ -14002,7 +14002,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -14026,7 +14026,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -14050,7 +14050,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -14071,7 +14071,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -14096,7 +14096,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -14134,7 +14134,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14170,7 +14170,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14206,7 +14206,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14242,7 +14242,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14282,7 +14282,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14327,7 +14327,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14372,7 +14372,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14408,7 +14408,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14444,7 +14444,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14489,7 +14489,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14534,7 +14534,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14561,7 +14561,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -14597,7 +14597,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14634,7 +14634,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14670,7 +14670,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14708,7 +14708,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14747,7 +14747,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14786,7 +14786,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14824,7 +14824,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14862,7 +14862,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14900,7 +14900,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -14937,7 +14937,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -21528,7 +21528,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -21549,7 +21549,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -21574,7 +21574,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -21612,7 +21612,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -21648,7 +21648,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -21684,7 +21684,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -21724,7 +21724,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -21769,7 +21769,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -21805,7 +21805,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -21841,7 +21841,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -21886,7 +21886,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -21923,7 +21923,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -21959,7 +21959,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -21991,7 +21991,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -22029,7 +22029,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -22067,7 +22067,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -22105,7 +22105,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -22143,7 +22143,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +diff --git a/testing/buildbot/chromium.gpu.json b/testing/buildbot/chromium.gpu.json +index 8269243328ac..3dac7b6281e0 100644 +--- a/testing/buildbot/chromium.gpu.json ++++ b/testing/buildbot/chromium.gpu.json +@@ -1318,7 +1318,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1346,7 +1346,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", +@@ -1373,7 +1373,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1397,7 +1397,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1435,7 +1435,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1471,7 +1471,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1507,7 +1507,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1547,7 +1547,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1592,7 +1592,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1637,7 +1637,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1674,7 +1674,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1710,7 +1710,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1747,7 +1747,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1776,7 +1776,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1805,7 +1805,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1832,7 +1832,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", +@@ -1859,7 +1859,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1883,7 +1883,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -1921,7 +1921,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1957,7 +1957,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1993,7 +1993,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -2033,7 +2033,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -2078,7 +2078,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -2123,7 +2123,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -2150,7 +2150,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -2186,7 +2186,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -2222,7 +2222,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -2259,7 +2259,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +diff --git a/testing/buildbot/chromium.swangle.json b/testing/buildbot/chromium.swangle.json +index 3e2f5b239a50..bb05a454c4a6 100644 +--- a/testing/buildbot/chromium.swangle.json ++++ b/testing/buildbot/chromium.swangle.json +@@ -1350,7 +1350,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +diff --git a/testing/buildbot/client.v8.fyi.json b/testing/buildbot/client.v8.fyi.json +index 5947391b0e32..fcd84b91c8c1 100644 +--- a/testing/buildbot/client.v8.fyi.json ++++ b/testing/buildbot/client.v8.fyi.json +@@ -1110,7 +1110,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1145,7 +1145,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1180,7 +1180,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1224,7 +1224,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1268,7 +1268,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1304,7 +1304,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1339,7 +1339,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1376,7 +1376,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1413,7 +1413,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +diff --git a/testing/buildbot/mixins.pyl b/testing/buildbot/mixins.pyl +index 26a150814f00..e628d94166d1 100644 +--- a/testing/buildbot/mixins.pyl ++++ b/testing/buildbot/mixins.pyl +@@ -834,7 +834,7 @@ + 'dimensions': { + 'cpu': 'x86-64', + 'gpu': '8086:3e9b', +- 'os': 'Mac-11.5.2', ++ 'os': 'Mac-11.5.2|Mac-12.4', + 'display_attached': '1', + }, + }, +diff --git a/testing/buildbot/tryserver.chromium.mac.json b/testing/buildbot/tryserver.chromium.mac.json +index 35722d269397..f4d9e7bdf54d 100644 +--- a/testing/buildbot/tryserver.chromium.mac.json ++++ b/testing/buildbot/tryserver.chromium.mac.json +@@ -73,7 +73,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -146,7 +146,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -228,7 +228,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" +@@ -304,7 +304,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -378,7 +378,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -452,7 +452,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -576,7 +576,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -668,7 +668,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -780,7 +780,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -854,7 +854,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -946,7 +946,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1022,7 +1022,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1134,7 +1134,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1234,7 +1234,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1313,7 +1313,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1391,7 +1391,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1469,7 +1469,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +@@ -1546,7 +1546,7 @@ + "cpu": "x86-64", + "display_attached": "1", + "gpu": "8086:3e9b", +- "os": "Mac-11.5.2" ++ "os": "Mac-11.5.2|Mac-12.4" + } + ], + "idempotent": false, +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0049-Incrementing-VERSION-to-102.0.5005.144.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0049-Incrementing-VERSION-to-102.0.5005.144.patch new file mode 100644 index 000000000000..172984f63848 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0049-Incrementing-VERSION-to-102.0.5005.144.patch @@ -0,0 +1,28 @@ +From 19d4541ceec6c61cd3bd08fd278e581405e4670a Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Wed, 29 Jun 2022 01:00:35 +0000 +Subject: [PATCH 49/59] Incrementing VERSION to 102.0.5005.144 + +Change-Id: I4ddfb72f2b40983b5e57923433184f7466bbc0b8 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3732614 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1208} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 915e8754e191..ea7e63ff5099 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=143 ++PATCH=144 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0050-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0050-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..ddc031a1c7f1 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0050-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,348 @@ +From b3d9ead9f7dc9567fab1461dbb888cf924ee9062 Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Wed, 29 Jun 2022 14:28:46 +0000 +Subject: [PATCH 50/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: I9b6be6fee2205db4a5aa0fc442bee884fa3a1ff2 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3735342 +Auto-Submit: Ben Mason +Commit-Queue: Rubber Stamper +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1209} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/app/resources/chromium_strings_te.xtb | 6 +++--- + chrome/app/resources/generated_resources_hi.xtb | 2 +- + chrome/app/resources/generated_resources_hy.xtb | 2 +- + chrome/app/resources/generated_resources_te.xtb | 16 ++++++++-------- + .../app/resources/google_chrome_strings_te.xtb | 6 +++--- + .../strings/accessibility_strings_hy.xtb | 2 +- + .../strings/accessibility_strings_te.xtb | 4 ++-- + .../translations/android_chrome_strings_hy.xtb | 2 +- + .../translations/android_chrome_strings_te.xtb | 2 +- + components/strings/components_strings_hy.xtb | 4 ++-- + components/strings/components_strings_te.xtb | 12 ++++++------ + .../translations/ui_chromeos_strings_te.xtb | 2 +- + 12 files changed, 30 insertions(+), 30 deletions(-) + +diff --git a/chrome/app/resources/chromium_strings_te.xtb b/chrome/app/resources/chromium_strings_te.xtb +index 60311af40a97..6cd93063385f 100644 +--- a/chrome/app/resources/chromium_strings_te.xtb ++++ b/chrome/app/resources/chromium_strings_te.xtb +@@ -105,7 +105,7 @@ + ChromiumOS సిస్టమ్ + - Chromium + ChromiumOSతో సహాయాన్ని పొందండి +-Chromiumను అనుకూలీకరించండి మరియు నియంత్రించండి. మీరు గమనించాల్సిన విషయం ఒకటి ఉంది - వివరాల కోసం క్లిక్ చేయండి. ++Chromiumను అనుకూలంగా మార్చండి మరియు నియంత్రించండి. మీరు గమనించాల్సిన విషయం ఒకటి ఉంది - వివరాల కోసం క్లిక్ చేయండి. + Chromiumను తెరిచి, బ్రౌజింగ్‌ను ప్రారంభించడానికి మీ పేరును క్లిక్ చేయండి. + ఇప్పటికే ఈ Chromium ప్రొఫైల్‌కు సైన్ ఇన్ చేశారు. మీరు బ్రౌజ్ చేసిన వాటిని విడిగా ఉంచడానికి, Chromium మీ కోసం మీ సొంత ప్రొఫైల్‌ను క్రియేట్ చేయగలదు. + పాస్‌వర్డ్‌లను కాపీ చేయడానికి Chromium ప్రయత్నిస్తోంది. దీన్ని అనుమతించడానికి మీ Windows పాస్‌వర్డ్‌ను టైప్ చేయండి. +@@ -124,7 +124,7 @@ + మీరు ఈ పరికరాన్ని ఉపయోగించడానికి ముందు సర్వీస్ నియమాలను చదివి, అంగీకరించాలని కోరుతోంది. ఈ నియమాలు ChromiumOS నియమాలను విస్తరింపజేయవు, సవరించవు లేదా పరిమితం చేయవు. + ఏదేమైనా Chromium నుండి నిష్క్రమించాలా? + బ్యాక్‌గ్రౌండ్‌లో అమలయ్యేందుకు Chromiumని అనుమతించండి +-Chromiumను అనుకూలీకరించండి మరియు నియంత్రించండి ++Chromiumను అనుకూలంగా మార్చండి మరియు నియంత్రించండి + ఫిషింగ్, అలాగే మాల్‌వేర్‌ను బ్లాక్ చేయడానికి మెరుగుపరచిన రక్షణ మరింత చేయగలదు + మీ పరికరం అప్‌డేట్ అయ్యి ఉందో లేదో చూడటానికి, ChromiumOS సెట్టింగ్‌లు ఆప్షన్‌కు వెళ్లండి + Chromiumకు స్వాగతం; కొత్త బ్రౌజర్ విండో తెరవబడింది +@@ -181,7 +181,7 @@ + Chromiumకు జోడించబడింది + ఈ బ్రౌజర్‌కు వర్క్ ప్రొఫైల్‌ను జోడించండి + సైన్ ఇన్ చేయడంలో ఎర్రర్ కారణంగా Chromium మీ డేటాను సింక్ చేయలేకపోయింది. +-Chromiumను అనుకూలీకరించండి మరియు నియంత్రించండి. అప్‌డేట్ అందుబాటులో ఉంది. ++Chromiumను అనుకూలంగా మార్చండి మరియు నియంత్రించండి. అప్‌డేట్ అందుబాటులో ఉంది. + Chromium ఈ పాస్‌వర్డ్‌ను మీ Google ఖాతాలో సేవ్ చేస్తుంది. మీరు దీనిని గుర్తుంచుకోవాల్సిన అవసరం లేదు. + హానికరం, కావున Chromium దాన్ని బ్లాక్ చేసింది. + సురక్షిత బ్రౌజింగ్ ఆఫ్ చేయబడింది. దాన్ని ఆన్ చేయమని Chromium సిఫార్సు చేస్తోంది. +diff --git a/chrome/app/resources/generated_resources_hi.xtb b/chrome/app/resources/generated_resources_hi.xtb +index 2f6119a1b1d2..cf6ff3a75c3c 100644 +--- a/chrome/app/resources/generated_resources_hi.xtb ++++ b/chrome/app/resources/generated_resources_hi.xtb +@@ -7282,7 +7282,7 @@ + खोजकर्ता में &दिखाएं + k + आपने जो पिन डाले हैं, वे बेमेल हैं +-एक्सटेंशन प्रबंधित करें ++एक्सटेंशन मैनेज करें + वैकल्पिक — इस डिवाइस के साथ जोड़ी जाने वाली नई जानकारी डालें या मौजूदा जानकारी को अपडेट करें. + क्या आपका मतलब खोज की सुविधा देने वाली कंपनी बदलने से था? + की स्थिति +diff --git a/chrome/app/resources/generated_resources_hy.xtb b/chrome/app/resources/generated_resources_hy.xtb +index 29de27efcc0b..12042eeafec4 100644 +--- a/chrome/app/resources/generated_resources_hy.xtb ++++ b/chrome/app/resources/generated_resources_hy.xtb +@@ -2509,7 +2509,7 @@ + Քարտեզներ + Jump to Selection + Հավաստագրման կենտրոնի թողարկողներ՝ +-Չափը՝ ++Չափսը՝ + Ձեր դիտարկիչը կառավարվում է -ի կողմից + Կենդանի ենթագրեր – + Միշտ ցույց տալ ամբողջական URL-ները +diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb +index a810b57ffadf..ccce07a85680 100644 +--- a/chrome/app/resources/generated_resources_te.xtb ++++ b/chrome/app/resources/generated_resources_te.xtb +@@ -1384,7 +1384,7 @@ + debugd ద్వారా సేకరించబడిన అన్ని లాగ్ ఫైళ్లను వేరుగా ఆర్కైవ్ లాగా చేర్చండి. + PCIe + సైట్‌లో ఫైల్ అందుబాటులో లేదు +-ను అనుకూలీకరించండి మరియు నియంత్రించండి ++ను అనుకూలంగా మార్చండి మరియు నియంత్రించండి + ఎక్స్‌టెన్ష‌న్‌ మూలం డైరెక్టరీ చెల్లదు. + షేర్ చేసిన ట్యాబ్ + డీబగ్గింగ్ ఫీచర్‌లు +@@ -1513,7 +1513,7 @@ + Wi-Fi సింక్ + ప్రామాణిక ఫాంట్ + కోసం మీ తల్లి/తండ్రి సెట్ చేసిన సమయ పరిమితిని మీరు చేరుకున్నారు. +-సక్రియం చేయి ++యాక్టివేట్ చేయండి + మీ Chromebookలో ను సెటప్ చేయండి + Google ChromeOS Flex నియమాల కంటెంట్‌లు + మీ ఎంటర్‌ప్రైజ్ నిర్వహణ కోసం విజయవంతంగా నమోదు చేయబడింది, కానీ దాని లక్షణ మరియు స్థాన సమాచారాన్ని పంపడంలో విఫలమైంది. దయచేసి ఈ పరికరం కోసం ఈ సమాచారాన్ని మీ నిర్వాహక కన్సోల్ నుండి మాన్యువల్‌గా నమోదు చేయండి. +@@ -2091,7 +2091,7 @@ + మీ స్క్రీన్‌లలో అదనపు డాక్యుమెంట్‌లను లేదా ఫుల్ స్క్రీన్ కంటెంట్‌ను చూపడానికి సైట్‌లు సాధారణంగా విండోలను తెరిచి, ఉంచుతాయి + Android Messages + వేచి ఉంది... +-ఈ పేజీని అనుకూలీకరించండి ++ఈ పేజీని అనుకూలంగా మార్చండి + వినియోగం & విశ్లేషణల డేటాను పంపండి. సమస్య విశ్లేషణ, పరికరం, యాప్ వినియోగ డేటాను Googleకి ఆటోమేటిక్‌గా పంపడం ద్వారా మీ Android అనుభవాన్ని మెరుగుపరచడంలో సహాయపడండి. ఇది సిస్టమ్, యాప్ స్థిరత్వానికి, అలాగే ఇతర మెరుగుదలలకు సహాయపడుతుంది. కొంత సముదాయ డేటా కూడా Google యాప్‌లకు, అలాగే Android డెవలపర్‌ల లాంటి భాగస్వాములకు సహాయపడుతుంది. మీ అదనపు వెబ్ & యాప్ యాక్టివిటీ సెట్టింగ్‌ను ఆన్ చేసినట్లయితే, ఈ డేటా మీ Google ఖాతాలో సేవ్ చేయబడవచ్చు. మరింత తెలుసుకోండి + ఫైల్స్‌కు వెళ్లండి + కనెక్షన్‌ని జోడించండి +@@ -5753,7 +5753,7 @@ + మీరు మీ సమీప షేరింగ్ విజిబిలిటీ సెట్టింగ్‌ను 'కనిపించు'కు సెట్ చేసేంత వరకు మీతో ఎవరూ షేర్ చేయలేరు.మీ సెట్టింగ్‌ను తాత్కాలికంగా 'కనిపించు'గా ఉంచడానికి స్టేటస్ ప్రాంతాన్ని తెరిచి, ఆపై సమీప విజిబిలిటీని ఆన్ చేయండి. + నెట్‌వర్క్ కనెక్షన్‌ను ఏర్పాటు చేయడం సాధ్యపడలేదు. మీ నెట్‌వర్క్ కనెక్షన్‌ను చెక్ చేసి, మళ్లీ ట్రై చేయండి. + యజమాని ఈ ఫీచర్‌ను, సెట్టింగ్‌లు > అధునాతనం > సమస్య విశ్లేషణ, వినియోగ డేటాను ఆటోమేటిక్‌గా Googleకు పంపు ఎంపిక ద్వారా నియంత్రించవచ్చు. +-వచనం-నుండి-ప్రసంగం వాయిస్‌లను ఎంచుకోండి మరియు అనుకూలీకరించండి ++వచనం-నుండి-ప్రసంగం వాయిస్‌లను ఎంచుకోండి మరియు అనుకూలంగా మార్చండి + కింద మరిన్ని సెట్టింగ్‌లను అన్వేషించండి లేదా ఇప్పుడే పూర్తి చేయండి + SQLite మెమరీ + తెరిచి ఉన్న ట్యాబ్ +@@ -6337,7 +6337,7 @@ + కింద లిస్ట్ చేయబడిన యాప్‌లు ప్రోటోకాల్ లింక్‌లను కూడా హ్యాండిల్ చేయగలవు. ఇతర యాప్‌లు అనుమతి కోసం అడుగుతాయి. + స్క్రీన్ లాక్ మరియు సైన్ ఇన్ + &విండోను రీస్టోర్ చేయండి +-మీ వచన పరిమాణాన్ని అనుకూలీకరించండి ++మీ వచన పరిమాణాన్ని అనుకూలంగా మార్చండి + మీ ఫోన్ నోటిఫికేషన్‌లను చూడండి, విస్మరించండి, వాటికి రిప్లయి చేయండి + పేరు మార్చడం విఫలమైంది + ‌ ఇమేజ్ సెర్చ్ +@@ -7424,7 +7424,7 @@ + అదనంగా మీ చిన్నారి కోసం వెబ్ & యాప్ యాక్టివిటీ సెట్టింగ్‌ను ఆన్ చేసినట్లయితే, ఈ డేటా వారి Google ఖాతాలో నిల్వ చేయబడవచ్చు. ఈ సెట్టింగ్‌ల గురించి, వీటిని సర్దుబాటు చేయడం గురించి families.google.comలో మరింత తెలుసుకోండి. + చెల్లని క్లయింట్ సర్టిఫికెట్ + హోమ్ బటన్‌ను చూపు +-మీరు టెక్స్ట్‌ను కుడి క్లిక్ చేసినప్పుడు లేదా తాకి, నొక్కి ఉంచినప్పుడు నిర్వచనాలు, అనువాదాలు, లేదా యూనిట్ మార్పిడులను పొందండి. వెబ్‌సైట్ భాషలలో అనువాద భాషలను అనుకూలీకరించండి. ++మీరు టెక్స్ట్‌ను కుడి క్లిక్ చేసినప్పుడు లేదా తాకి, నొక్కి ఉంచినప్పుడు నిర్వచనాలు, అనువాదాలు, లేదా యూనిట్ మార్పిడులను పొందండి. వెబ్‌సైట్ భాషలలో అనువాద భాషలను అనుకూలంగా మార్చండి. + తల్లిదండ్రులారా, తర్వాత కొన్ని దశలు మీ కోసం. ఖాతాను సెటప్ చేసిన తర్వాత మీరు ను చిన్నారికి తిరిగి ఇవ్వవచ్చు. + చిత్రాన్ని డౌన్‌లోడ్ చేయి + "మరిన్ని సాధనాలు" మెనూలోని ఎక్స్‌టెన్షన్‌లను క్లిక్ చేయడం ద్వారా మీ ఎక్స్‌టెన్షన్‌లను నిర్వహించండి. +@@ -7672,7 +7672,7 @@ + ప్రశ్నలు ఏమైనా ఉన్నాయా? మీ ప్రొఫైల్‌ను పర్యవేక్షించే వ్యక్తిని సంప్రదించండి. + పరికరంలో తక్కువ స్థలం ఉంది + చిత్రం కాష్ +-టచ్ బార్‌ని అనుకూలీకరించండి ++టచ్ బార్‌ని అనుకూలంగా మార్చండి + ఫుల్-స్క్రీన్‌ మాగ్నిఫయర్‌ను ప్రారంభించండి + ఎగువ-అడ్డు వరుసలోని కీల ప్రవర్తనను మార్చడానికి శోధన కీని నొక్కి ఉంచండి + మీ Chromebookకు సైన్ ఇన్ చేయడానికి మీరు మీ Google ఖాతాను ఉపయోగిస్తారు – Gmail, Drive, YouTube మరిన్నింటి కోసం మీరు ఉపయోగించే అదే ఖాతా. +@@ -8106,7 +8106,7 @@ + ఎస్కేప్ + దయచేసి Google సర్వర్‌ల నుండి డౌన్‌లోడ్‌లను ఫైర్‌వాల్ బ్లాక్ చేయడం లేదని నిర్ధారించుకోవడానికి మీ నెట్‌వర్క్ నిర్వాహకుడిని సంప్రదించండి. + జూమ్ స్థాయిని తీసివేయి +-మీరు మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలీకరించవచ్చు. ఈ యాక్సెస్ చేయగల ఫీచర్లను సెట్టింగ్స్‌లో తర్వాత మార్చవచ్చు. ++మీరు మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలంగా మార్చవచ్చు. ఈ యాక్సెస్ చేయగల ఫీచర్లను సెట్టింగ్స్‌లో తర్వాత మార్చవచ్చు. + కనెక్షన్ సమస్య కారణంగా గమ్యస్థాన ఫైల్ సంపూర్ణంగా లేదు. + క్వారెంటైన్ సేవ + మీరు అందుకునే ఇమెయిల్‌లలోని లింక్‌ను క్లిక్ చేయడం ద్వారా ఎప్పుడైనా సబ్‌స్క్రిప్షన్‌ను తీసివేయవచ్చు. +diff --git a/chrome/app/resources/google_chrome_strings_te.xtb b/chrome/app/resources/google_chrome_strings_te.xtb +index 04519bc7b312..6945de13ae9e 100644 +--- a/chrome/app/resources/google_chrome_strings_te.xtb ++++ b/chrome/app/resources/google_chrome_strings_te.xtb +@@ -2,7 +2,7 @@ + + + ఇన్‌స్టాలర్ ఆర్కైవ్ పాడైంది లేదా చెల్లదు. దయచేసి Google Chromeను మ‌ళ్లీ డౌన్‌లోడ్ చేయండి. +-Google Chromeను అనుకూలీకరించండి మరియు నియంత్రించండి. అప్‌డేట్ అందుబాటులో ఉంది. ++Google Chromeను అనుకూలంగా మార్చండి మరియు నియంత్రించండి. అప్‌డేట్ అందుబాటులో ఉంది. + మీ కంప్యూటర్‌లో మీ భద్రతకు హాని కలిగించే సాఫ్ట్‌వేర్‌ ఉంది. మీ బ్రౌజర్‌ని మళ్లీ సాధారణంగా పని చేసేలా చేయడానికి Chrome దానిని తీసివేసి, మీ సెట్టింగ్‌లను పునరుద్ధరించి, ఎక్స్‌టెన్షన్‌లను నిలిపివేయగలదు. + మీ ప్రాధాన్యతలు చదవబడలేవు. కొన్ని లక్షణాలు అందుబాటులో ఉండకపోవచ్చు మరియు ప్రాధాన్యతలకు మార్పులు సేవ్ చేయబడకపోవచ్చు. + మునుపు Chromeని ఉపయోగించింది +@@ -148,7 +148,7 @@ + Google Chromeను అన్‌ఇన్‌స్టాల్ చేయండి + అప్‌డేట్‌ను వర్తింపచేయడానికి ChromeOSను రీస్టార్ట్ చేయాలి. + ముఖ్యమైన భద్రతా మెరుగుదలలు మరియు కొత్త ఫీచర్‌లు తాజా వెర్షన్‌లో అందుబాటులో ఉన్నాయి. +-Google Chromeను అనుకూలీకరించండి మరియు నియంత్రించండి ++Google Chromeను అనుకూలంగా మార్చండి మరియు నియంత్రించండి + Chrome మీ సమాచారాన్ని తక్కువగా ఉపయోగిస్తూ అదే బ్రౌజింగ్ అనుభవాన్ని అందించడానికి సైట్‌లను అనుమతించే కొత్త ఫీచర్‌ల కోసం అన్వేషిస్తోంది + మీ కొత్త Chrome ప్రొఫైల్‍ని సెట్ అప్ చేయండి + మీరు నిర్వహించబడే ఖాతాతో సైన్ ఇన్ చేస్తున్నారు. దీని నిర్వాహకునికి మీ Google Chrome ప్రొఫైల్‌పై నియంత్రణను అందిస్తున్నారు. మీ యాప్‌లు, బుక్‌మార్క్‌లు, చరిత్ర, పాస్‌వర్డ్‌లు, ఇతర సెట్టింగ్‌ల వంటి మీ Chrome డేటా శాశ్వతంగా కు అనుబంధించబడుతుంది. మీరు Google ఖాతాల డ్యాష్‌బోర్డ్ ద్వారా ఈ డేటాను తొలగించవచ్చు. కానీ ఈ డేటాను మరో ఖాతాతో అనుబంధించలేరు. +@@ -213,7 +213,7 @@ + Google Chrome (mDNS-In) + హానికరం కావచ్చు, కావున Chrome దాన్ని బ్లాక్ చేసింది. + {COUNT,plural, =0{ఈ అప్‌డేట్‌ను వర్తింపజేయడం కోసం మీరు Chromeను పునఃప్రారంభించాలని మీ నిర్వాహకుడు కోరుతున్నారు}=1{ఈ అప్‌డేట్‌ను వర్తింపజేయడం కోసం మీరు Chromeను పునఃప్రారంభించాలని మీ నిర్వాహకుడు కోరుతున్నారు. మీ అజ్ఞాత విండో మళ్లీ తెరవబడదు.}other{ఈ అప్‌డేట్‌ను వర్తింపజేయడం కోసం మీరు Chromeను పునఃప్రారంభించాలని మీ నిర్వాహకుడు కోరుతున్నారు. మీ # అజ్ఞాత విండోలు మళ్లీ తెరవబడవు.}} +-Google Chromeను అనుకూలీకరించండి, నియంత్రించండి. మీరు గమనించాల్సిన విషయం ఒకటి ఉంది - వివరాల కోసం క్లిక్ చేయండి. ++Google Chromeను అనుకూలంగా మార్చండి, నియంత్రించండి. మీరు గమనించాల్సిన విషయం ఒకటి ఉంది - వివరాల కోసం క్లిక్ చేయండి. + Google LLC + {SECONDS,plural, =1{Google Chrome 1 సెకనులో పునఃప్రారంభమవుతుంది}other{Google Chrome # సెకన్లలో పునఃప్రారంభమవుతుంది}} + Chrome ర్యాండమ్‌గా మిమ్మల్ని యాక్టివ్‌గా ఉన్న ఒక ట్రయల్‌లో ఉంచినట్లయితే, మీ బ్రౌజింగ్ హిస్టరీ మీరు చూసే యాడ్‌లను, దిగువున అంచనా వేసిన ఆసక్తులపై ప్రభావం చూపుతుంది. మీ గోప్యతను రక్షించడానికి, Chrome ప్రతి నెలా దశల వారీగా మీ ఆసక్తులను తొలగిస్తుంది. ఆసక్తులు మీరు తీసివేస్తే మినహా, రిఫ్రెష్ అవుతూనే ఉంటాయి. +diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_hy.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_hy.xtb +index 04475afeca6a..e9c14d42d529 100644 +--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_hy.xtb ++++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_hy.xtb +@@ -145,7 +145,7 @@ + Միջին գարնանային կանաչ + Ցույց տալ վերնագրերի ցանկը + #ed +-Չափը՝ ++Չափսը՝ + համադրություն՝ + Միջին խոլորձագույն + Նախորդ խմբագրելի տեքստային դաշտ չկա +diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb +index ff870ab0ced5..0e0e58bdf2ef 100644 +--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb ++++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb +@@ -299,7 +299,7 @@ Chrome బ్రౌజర్ మెనూను తెరవడానికి, + సూచన: మీరు ఈ ట్యుటోరియల్‌ను నిష్క్రమించాలనుకుంటే కుడి నుండి ఎడమ వైపునకు రెండు వేళ్లతో స్వైప్ చేయండి. + మునుపటి అక్షరం + స్వర స్థాయి తగ్గించండి +-Search + O, తర్వాత S. వాయిస్‌లను ఇన్‌స్టాల్, మేనేజ్ చేయడానికి, అనుకూలీకరించడానికి ఉపయోగించండి. ++Search + O, తర్వాత S. వాయిస్‌లను ఇన్‌స్టాల్, మేనేజ్ చేయడానికి, అనుకూలంగా మార్చడానికి ఉపయోగించండి. + @ed 8dot + మెనూ అంశం రేడియో బటన్ + {COUNT,plural, =1{సంగ్రాహక గుర్తు}other{# సంగ్రాహక గుర్తులు}} +@@ -652,7 +652,7 @@ Chrome బ్రౌజర్ మెనూను తెరవడానికి, + మెనూలలో వెతకండి + ఇయర్‌కాన్ లాగింగ్‌ను ప్రారంభించు + {COUNT,plural, =1{న్యూన గుర్తు}other{# న్యూన గుర్తులు}} +-(సక్రియంగా ఉంది) ++(యాక్టివ్‌గా ఉంది) + చుక్కలు + తర్వాత స్థాయి 1 శీర్షిక లేదు + బహుమానపూర్వకం +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb +index 6663afcb91f4..49deb5d99c82 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb +@@ -450,7 +450,7 @@ + Privacy Sandbox-ի փորձնական տարբերակներ + Բացել էջանիշների կառավարիչը + Նախաբեռնվում են ավելի շատ էջեր։ Նախաբեռնումը կարող է կատարվել Google-ի սերվերների կողմից այլ կայքերի հարցումով։ +-Չափը՝ ++Չափսը՝ + Ընտրեք, թե երբ պետք է կողմնակի քուքիները արգելափակվեն + Ապահովում է ձեր անվտանգությունը Chrome-ում և Google հավելվածներում, երբ մտել եք ձեր հաշիվ + Փորձնական գործառույթներն անջատված են +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb +index 8b0bd7668111..67bd8de6300c 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb +@@ -636,7 +636,7 @@ + వెబ్‌పేజీ షార్ట్‌క‌ట్‌లు + రిజిస్ట్రేషన్ విజయవంతమైంది + కనెక్షన్ లేదు +-Chrome తగిన ఆటోమేటిక్ సెట్టింగ్‌లను అందిస్తుంది, కానీ మీరు మీ బ్రౌజింగ్ అలవాట్లకు తగినట్లుగా మీరు దీన్ని అనుకూలీకరించవచ్చు ++Chrome తగిన ఆటోమేటిక్ సెట్టింగ్‌లను అందిస్తుంది, కానీ మీరు మీ బ్రౌజింగ్ అలవాట్లకు తగినట్లుగా మీరు దీన్ని అనుకూలంగా మార్చవచ్చు + పాస్‌వర్డ్‌ను దాచిపెట్టు + నిర్వాహిత ఖాతాకు సైన్ ఇన్ చేయండి + మరొక వెరిఫికేషన్ ఆప్షన్‌ను ట్రై చేయండి +diff --git a/components/strings/components_strings_hy.xtb b/components/strings/components_strings_hy.xtb +index 5047d682da0c..a3210464e997 100644 +--- a/components/strings/components_strings_hy.xtb ++++ b/components/strings/components_strings_hy.xtb +@@ -901,7 +901,7 @@ + Կապը, որի միջոցով բեռնվել է այս կայքը, օգտագործում է TLS-ի 1.0 կամ 1.1 տարբերակները, որոնք հնացած են և չեն աջակցվի ապագայում։ Անջատվելուց հետո այցելուները այլևս չեն կարողանա դիտել այս կայքը։ Սերվերը պետք է ակտիվացնի TLS-ի 1.2 կամ ավելի բարձր տարբերակ։ + Հարմարեցնել տառատեսակները + Կառավարել անվտանգության կարգավորումները +-Չափը՝ ++Չափսը՝ + Ձեր վերբեռնած կամ կցած ֆայլերը ուղարկվում են Google Cloud կամ գործընկեր կազմակերպություններին՝ վերլուծության նպատակով։ Օրինակ, դրանցում կարող է ստուգվել խիստ անձնական տվյալների կամ վնասագրերի առկայությունը։ + Փակեք մյուս ծրագրերը՝ տարածք ազատելու համար: + -ը ներկայումս անհասանելի է: +@@ -1460,7 +1460,7 @@ + A5-Extra + Ընդարձակել ցանկը + Առողջության ապահովագրություն +-Այս հավելվածը նախատեսված է բջջային սարքերի համար։ Չափը փոխելուց հետո հավելվածը կարող է սխալներով աշխատել։ ++Այս հավելվածը նախատեսված է բջջային սարքերի համար։ Չափսը փոխելուց հետո հավելվածը կարող է սխալներով աշխատել։ + Ջնջել տեսագրությունը + + Երկու անցք վերևում +diff --git a/components/strings/components_strings_te.xtb b/components/strings/components_strings_te.xtb +index 27f1afd0deae..b6930dce3e96 100644 +--- a/components/strings/components_strings_te.xtb ++++ b/components/strings/components_strings_te.xtb +@@ -834,7 +834,7 @@ + మీ పరికరం, బ్రౌజర్‌ల వెర్షన్ సమాచారం + కార్డ్ CVCని నమోదు చేయండి + ఈ సైట్‌లో ఎప్పుడూ ముఖ్యమైన కంటెంట్‌ను గుర్తించు +-, మీ బ్రౌజర్ రూపాన్ని అనుకూలీకరించడానికి 'Tab'ను నొక్కి, ఆపై 'Enter'ను నొక్కండి ++, మీ బ్రౌజర్ రూపాన్ని అనుకూలంగా మార్చడానికి 'Tab'ను నొక్కి, ఆపై 'Enter'ను నొక్కండి + సురక్షితమైన పేమెంట్ ఆధారానికి సంబంధించిన మ్యాచ్ అయ్యే ఆధారాల షీట్ ఏదీ తెరవబడలేదు + “” లింక్‌లు బ్లాక్ చేయబడ్డాయి + మీకు యాడ్‌లను చూపడానికి ఇతర సైట్‌లు ఉపయోగించగల ఆసక్తులను ఈ సైట్ నిర్వచిస్తుంది. మీకు మరింత సందర్భోచితమైన యాడ్‌లను చూపడానికి ఈ సైట్ మీ ఆసక్తులను Chrome నుండి కూడా పొందుతుంది. +@@ -1132,7 +1132,7 @@ + ట్రే 14 + ముందున్న సైట్ మోసపూరితమైనది + గోప్యమైన కంటెంట్ కనిపిస్తునప్పుడు, మీ స్క్రీన్‌ను తో షేర్ చేయడాన్ని అడ్మినిస్ట్రేటర్ పాలసీ సిఫార్సు చేయదు: +-, Chromeలో ఫాంట్ సైజ్‌లను, టైప్‌ఫేస్‌లను అనుకూలీకరించడానికి Tabను నొక్కి, ఆపై Enterను నొక్కండి ++, Chromeలో ఫాంట్ సైజ్‌లను, టైప్‌ఫేస్‌లను అనుకూలంగా మార్చడానికి Tabను నొక్కి, ఆపై Enterను నొక్కండి + టెక్స్ట్, గ్రాఫిక్స్ + డెస్క్‌టాప్ పబ్లిషింగ్ + పరికరం క్రమ సంఖ్య చెల్లదు +@@ -1621,7 +1621,7 @@ + యాప్ బ్లాక్ చేయబడింది + NFC పరికరాలు + ఈ పేజీ మీకు డబ్బు ఛార్జీ చేయడానికి ప్రయత్నించవచ్చు +-'Chromeలో ఫాంట్‌లను అనుకూలీకరించండి' బటన్, Chromeలో ఫాంట్ సైజ్‌లను, టైప్‌ఫేస్‌లను అనుకూలీకరించడానికి Enterను నొక్కండి ++'Chromeలో ఫాంట్‌లను అనుకూలంగా మార్చండి' బటన్, Chromeలో ఫాంట్ సైజ్‌లను, టైప్‌ఫేస్‌లను అనుకూలంగా మార్చడానికి Enterను నొక్కండి + యొక్క ప్రమాణపత్రం రద్దు చేయబడినందున మీరు ప్రస్తుతం దీన్ని సందర్శించలేరు. నెట్‌వర్క్ లోపాలు మరియు దాడులు సాధారణంగా తాత్కాలికమే, కనుక ఈ పేజీ తర్వాత పని చేయవచ్చు. + ఎర్రబారిన ముఖం + విజువల్ ఆర్ట్ & డిజైన్ +@@ -2464,7 +2464,7 @@ + ప్రామాణికం + ఈ సైట్ అనుచితమైన లేదా తప్పుదారి పట్టించే యాడ్‌లను చూపుతుంది. + హానికరమైన కంటెంట్ బ్లాక్ చేయబడింది. +-Chromeలో ఫాంట్ సైజ్‌లను, టైప్‌ఫేస్‌లను అనుకూలీకరించండి ++Chromeలో ఫాంట్ సైజ్‌లను, టైప్‌ఫేస్‌లను అనుకూలంగా మార్చండి + నిర్వహించడం లేదు + ప్రైమరీ రోల్ + డాయ్-పా-కాయ్ +@@ -2595,7 +2595,7 @@ + మ్యూట్ చేసినవి + పేమెంట్ ఆప్షన్‌ + డెస్క్‌టాప్ కంప్యూటర్‌లు +-'Chromeను అనుకూలీకరించండి' బటన్, మీ బ్రౌజర్ రూపాన్ని అనుకూలీకరించడానికి 'Enter'ను నొక్కండి ++'Chromeను అనుకూలంగా మార్చండి' బటన్, మీ బ్రౌజర్ రూపాన్ని అనుకూలంగా మార్చడానికి 'Enter'ను నొక్కండి + అడ్వెంచర్ ట్రావెల్ + మీ కంప్యూటర్ లేదా నెట్‌వర్క్‌లో "" సరిగ్గా ఇన్‌స్టాల్ కాలేదు. ఈ సమస్యను పరిష్కరించమని మీ IT నిర్వాహకులను కోరండి. + నిర్ధారించు +@@ -2834,7 +2834,7 @@ + ఇటీవల మూసివేసినవి + ఒకే క్రమంలో ఉన్న ఫేస్ డౌన్ + గోప్యమైన ఫైల్‌ను ప్రింట్ చేయాలా? +-మీ బ్రౌజర్ రూపాన్ని అనుకూలీకరించండి ++మీ బ్రౌజర్ రూపాన్ని అనుకూలంగా మార్చండి + చెల్లుబాటు అయ్యే కార్డ్ నంబర్‌ను నమోదు చేయండి + సరదా గేమ్‌లు + చేపలు పట్టడం +diff --git a/ui/chromeos/translations/ui_chromeos_strings_te.xtb b/ui/chromeos/translations/ui_chromeos_strings_te.xtb +index 99a921b42aa5..7093b4618657 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_te.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_te.xtb +@@ -166,7 +166,7 @@ + ఫైళ్లు ఎంచుకోబడ్డాయి + ప్రాక్సీ కనెక్షన్ రకం + బర్మీస్/మయన్మార్ +-సక్రియం చేయి ++యాక్టివేట్ చేయండి + అందుబాటులో ఉంది + మొత్తం ఫైల్ పరిమాణం + ఐటెమ్‌లను కు కాపీ చేస్తోంది +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0051-Incrementing-VERSION-to-102.0.5005.145.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0051-Incrementing-VERSION-to-102.0.5005.145.patch new file mode 100644 index 000000000000..29afc7820bd3 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0051-Incrementing-VERSION-to-102.0.5005.145.patch @@ -0,0 +1,28 @@ +From fb7ed04a21de2cc9d55e005130acc00b4bf5b238 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Thu, 30 Jun 2022 01:00:51 +0000 +Subject: [PATCH 51/59] Incrementing VERSION to 102.0.5005.145 + +Change-Id: Idbdf4eb7c9ccb83bb8bd1f61c0fa42af164014fa +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3736004 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1210} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index ea7e63ff5099..48b95fdd910e 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=144 ++PATCH=145 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0052-Disable-IntegrationTest.SelfUpdateFromOldReal-in-M10.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0052-Disable-IntegrationTest.SelfUpdateFromOldReal-in-M10.patch new file mode 100644 index 000000000000..34d444d94f46 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0052-Disable-IntegrationTest.SelfUpdateFromOldReal-in-M10.patch @@ -0,0 +1,33 @@ +From 4d069862995f5b414fa3a06c4fd2b71e16defc26 Mon Sep 17 00:00:00 2001 +From: Sorin Jianu +Date: Thu, 30 Jun 2022 03:34:17 +0000 +Subject: [PATCH 52/59] Disable IntegrationTest.SelfUpdateFromOldReal in M102. + +Bug: 1340482 +Change-Id: I1dc7d99a84880867c3afca5281edd80f0d41d4ed +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3732396 +Reviewed-by: Joshua Pawlicki +Commit-Queue: Sorin Jianu +Cr-Commit-Position: refs/branch-heads/5005@{#1211} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/updater/test/integration_tests.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/chrome/updater/test/integration_tests.cc b/chrome/updater/test/integration_tests.cc +index d2d02dd04e7b..ca176f6016cc 100644 +--- a/chrome/updater/test/integration_tests.cc ++++ b/chrome/updater/test/integration_tests.cc +@@ -620,7 +620,8 @@ TEST_F(IntegrationTest, UnregisterUnownedApp) { + #if BUILDFLAG(CHROMIUM_BRANDING) || BUILDFLAG(GOOGLE_CHROME_BRANDING) + // TODO(crbug.com/1268555): Even on Windows, component builds do not work. + #if !defined(COMPONENT_BUILD) +-TEST_F(IntegrationTest, SelfUpdateFromOldReal) { ++// TODO(crbug.com/1340482) - disable the test on branches because it is flaky. ++TEST_F(IntegrationTest, DISABLED_SelfUpdateFromOldReal) { + ScopedServer test_server(test_commands_); + + // TODO(crbug.com/1308856): Current versions of the updater do not send an +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0053-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0053-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..3cfd0144570e --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0053-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,2077 @@ +From 36caed1408759cc70fa9e4f7e5d37aeb8108b196 Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Thu, 30 Jun 2022 16:07:48 +0000 +Subject: [PATCH 53/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: Ibbba0c0cd79a592cbcc0496e573df65845ce07ee +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3736826 +Auto-Submit: Ben Mason +Commit-Queue: Rubber Stamper +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1212} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + .../strings/shortcut_viewer_strings_fa.xtb | 2 +- + .../strings/shortcut_viewer_strings_kk.xtb | 16 ++-- + ash/strings/ash_strings_fa.xtb | 12 +-- + ash/strings/ash_strings_kk.xtb | 8 +- + ash/strings/ash_strings_no.xtb | 10 +-- + .../android_keyboard_accessory_strings_kk.xtb | 2 +- + .../android_chrome_vr_strings_kk.xtb | 2 +- + chrome/app/resources/chromium_strings_fa.xtb | 14 +-- + .../app/resources/generated_resources_fa.xtb | 56 ++++++------ + .../app/resources/generated_resources_kk.xtb | 88 +++++++++---------- + .../app/resources/generated_resources_no.xtb | 14 +-- + .../resources/google_chrome_strings_fa.xtb | 14 +-- + .../strings/accessibility_strings_fa.xtb | 2 +- + .../strings/accessibility_strings_kk.xtb | 6 +- + .../android_chrome_strings_fa.xtb | 50 +++++------ + .../android_chrome_strings_kk.xtb | 28 +++--- + chromeos/strings/chromeos_strings_fa.xtb | 2 +- + .../translations/browser_ui_strings_kk.xtb | 6 +- + .../omnibox_pedal_synonyms_fa.xtb | 2 +- + .../omnibox_pedal_synonyms_te.xtb | 6 +- + components/strings/components_strings_fa.xtb | 20 ++--- + components/strings/components_strings_kk.xtb | 52 +++++------ + .../resources/ios_chromium_strings_fa.xtb | 4 +- + .../ios_google_chrome_strings_fa.xtb | 4 +- + .../app/strings/resources/ios_strings_fa.xtb | 8 +- + .../app/strings/resources/ios_strings_kk.xtb | 6 +- + .../accessibility_extensions_strings_kk.xtb | 2 +- + .../translations/ui_chromeos_strings_kk.xtb | 4 +- + ui/strings/translations/ax_strings_kk.xtb | 4 +- + 29 files changed, 222 insertions(+), 222 deletions(-) + +diff --git a/ash/shortcut_viewer/strings/shortcut_viewer_strings_fa.xtb b/ash/shortcut_viewer/strings/shortcut_viewer_strings_fa.xtb +index 800ab0ead629..6242e190c953 100644 +--- a/ash/shortcut_viewer/strings/shortcut_viewer_strings_fa.xtb ++++ b/ash/shortcut_viewer/strings/shortcut_viewer_strings_fa.xtb +@@ -136,7 +136,7 @@ + کم کردن نور صفحه‌کلید (فقط برای صفحه‌کلیدهایی که نور پس‌زمینه دارند) + حذف کلمه قبلی + نمایش یا پنهان کردن کنسول «ابزارهای برنامه‌نویس» +-صفحه حریم‌خصوصی را روشن یا خاموش کنید ++صفحه حریم خصوصی را روشن یا خاموش کنید + چرخاندن پنجره + گرفتن نماگرفت از تمام صفحه + پاک کردن نوشتار چارگوش جستجو +diff --git a/ash/shortcut_viewer/strings/shortcut_viewer_strings_kk.xtb b/ash/shortcut_viewer/strings/shortcut_viewer_strings_kk.xtb +index 8615099014f1..fa613c5620f8 100644 +--- a/ash/shortcut_viewer/strings/shortcut_viewer_strings_kk.xtb ++++ b/ash/shortcut_viewer/strings/shortcut_viewer_strings_kk.xtb +@@ -65,11 +65,11 @@ + Әзірлеуші құралдары панелін көрсету немесе жасыру + Толық экранды қосу/өшіру + Перне тіркесімдері +-Сөредегі келесі элементті бөлектеу +-Сөредегі іске қосу түймесін бөлектеу ++Сөредегі келесі элементті ерекшелеу ++Сөредегі іске қосу түймесін ерекшелеу + Ctrl + Мекенжай жолағына өту +-Сөредегі элементтің бөлектенуін өшіру ++Сөредегі элементтің ерекшеленуін өшіру + Ағымдағы терезені жабу + Белсенді терезені жоғары жылжыту + Тапсырма менеджерін ашу +@@ -86,7 +86,7 @@ + Сілтемені жаңа қойындыда ашу және жаңа қойындыға ауысу + Ағымдағы қойындыны жабу + Соңғы әрекетті қайтару +-Сөредегі бөлектелген элементті ашу ++Сөредегі ерекшеленген элементті ашу + 1-ден 8-ге дейін + Пернетақта жарықтығын арттыру (тек артқы жарығы бар пернетақталар үшін) + үтір +@@ -99,7 +99,7 @@ + Таңдалған мазмұнды буферге көшіру + Негізгі бетті ашу + Сілтемені бетбелгі ретінде сақтау +-Мекенжай жолағы бар жолды бөлектеу ++Мекенжай жолағы бар жолды ерекшелеу + немесе + Шолу режимі + Алдыңғы бетке өту +@@ -153,14 +153,14 @@ + + Жолдың соңына енгізілетін мәтінді таңдау + Сөредегі 1-8 арасындағы белгішелерді басу +-Сөредегі алдыңғы элементті бөлектеу ++Сөредегі алдыңғы элементті ерекшелеу + Қойындыны бастапқы орнына қайтару + Кішірейту (қондырылған НЕМЕСЕ толық экран ұлғайтқышы қосылған кезде) + Файлды таңдап, пернесін басыңыз + Calendar виджетін ашу немесе жабу. + Экранның бір бөлігінің скриншотын/жазбасын жасау + Ең ұзақ уақыт бойы пайдаланылмаған терезені ашу +-Бөлектелген элемент үшін контекстік мәзірді ашу ++Ерекшеленген элемент үшін контекстік мәзірді ашу + Іздеу нәтижелерінің келесі сәйкестігіне өту + немесе + Терезені сол жаққа бекіту +@@ -175,7 +175,7 @@ + Сәйкес нәтижелер табылмады + Келесі тақта + Дыбысын өшіру +-Бетбелгілер жолағын (көрсетіліп тұрса) ерекшелеу немесе бөлектеу ++Бетбелгілер жолағын (көрсетіліп тұрса) ерекшелеу немесе ерекшелеу + Мекенжай жолағына веб-мекенжайды енгізіп, пернелерін басыңыз. + Құрылғыны ұйқы (уақытша тоқтату) режиміне қою + Келесі енгізу әдісіне ауыстырады +diff --git a/ash/strings/ash_strings_fa.xtb b/ash/strings/ash_strings_fa.xtb +index c36debe1ef20..8bf45f97a06d 100644 +--- a/ash/strings/ash_strings_fa.xtb ++++ b/ash/strings/ash_strings_fa.xtb +@@ -454,7 +454,7 @@ + خاموش + مجاز کردن اعلان‌های منابع زیر + برای مرتبط کردن دستگاهتان، تنظیمات «بلوتوث» را باز کنید +-روشن/خاموش کردن صفحه حریم‌خصوصی. . ++روشن/خاموش کردن صفحه حریم خصوصی. . + به‌روزرسانی عقب‌افتاده + کاربر مدیریت‌شده + پاک کردن همه قلم‌های نشان‌گذاری +@@ -636,7 +636,7 @@ + درحال بارگیری + قفسه در پایین است + باز کردن قفل دستگاه با کد والدین +-صفحه حریم‌خصوصی خاموش است ++صفحه حریم خصوصی خاموش است + ‏کابل USB-C شما از USB4 پشتیبانی نمی‌کند. ممکن است عملکرد دستگاه محدود شود. + مکرراً استفاده‌شده + دسترسی ولی +@@ -699,7 +699,7 @@ + نمایش ماه بعدی + صفحه‌کلید دیگری متصل شد + قفل باز شد +-تنظیمات حریم‌خصوصی ++تنظیمات حریم خصوصی + سرعت خواندن + ذخیره میزکار به‌عنوان الگو + دستگاه‌های فرستادن موجود هستند +@@ -792,7 +792,7 @@ + بارگیری خطرناک + «گروه قفسه‌ها» خاموش است. + «نور شب» روشن است. +-صفحه حریم‌خصوصی ++صفحه حریم خصوصی + هم‌رسانی صفحه‌نمایش متوقف شود؟ + فایل‌های پین‌شده + ‏فایل‌های Play +@@ -925,7 +925,7 @@ + ، + ، قدرت سیگنال ، تحت‌مدیریت سرپرست + حالت ضبط صفحه‌نمایش انتخاب شد +-صفحه حریم‌خصوصی روشن است ++صفحه حریم خصوصی روشن است + اعلان‌های ، ، و اعلان‌های دیگر پنهان شده است، زیرا «محافظت دربرابر مشاهده» روشن است + Search+Shift+K + می‌خواهد از میکروفون استفاده کند +@@ -1134,7 +1134,7 @@ + خاموش + ظاهراً بلوتوث در شما خاموش است. لطفاً برای استفاده از «مرکز کنترل تلفن»، بلوتوث را روشن کنید. + {0,plural, =0{اکنون دستگاه را به نسخه قبلی تغییر دهید}=1{تا یک ثانیه دیگر دستگاه را به نسخه قبلی تغییر دهید}one{تا # ثانیه دیگر دستگاه را به نسخه قبلی تغییر دهید}other{تا # ثانیه دیگر دستگاه را به نسخه قبلی تغییر دهید}} +-تنظیمات حریم‌خصوصی را تنظیم کند ++تنظیمات حریم خصوصی را تنظیم کند + وقتی از سیستم خارج شوید، جلسه اینترنت پاک خواهد شد. + ‏Send an email (ایمیل ارسال کن) + نمی‌خواهم این فایل نشان داده شود +diff --git a/ash/strings/ash_strings_kk.xtb b/ash/strings/ash_strings_kk.xtb +index 1910e347eb4c..910ae20a3deb 100644 +--- a/ash/strings/ash_strings_kk.xtb ++++ b/ash/strings/ash_strings_kk.xtb +@@ -259,7 +259,7 @@ + Жабысқақ пернелер + CAPS LOCK қосулы + Профиль суретіңізді түртіңіз. +-Google Assistant әркімге қолжетімді сеанста жұмыс істемейді. ++Google Assistant баршаға ашық сеанста жұмыс істемейді. + бекітілген ұлғайтқыш + Параметрлерді басқару + құрылғысы қосылмады +@@ -416,7 +416,7 @@ + , , сигнал күші: + Сөре автоматты түрде жасырылған. + Телефон табылмады. Онда Bluetooth қосылып тұрғанына көз жеткізіңіз. +-Тінтуір курсорын бөлектеу ++Тінтуір курсорын ерекшелеу + басқаратын аккаунт + Күй жолағы, уақыты: , + +@@ -653,7 +653,7 @@ + Ажырату + Аккаунтқа кіру экраны + Автоматты түрде басу функциясын шынымен де өшіргіңіз келе ме? +-Нысанды пернетақта фокусымен бөлектеу ++Нысанды пернетақта фокусымен ерекшелеу + Ештеңе істемеу (кідірту) + Пернетақта мәзіріне кіру + файлын жүктеп алу үшін желі байланысын тексеріңіз. +@@ -709,7 +709,7 @@ + және қолданбалары қосылып, бір қалта жасалды. + , : , + {NUM_NOTIFICATIONS,plural, =1{Тағы 1 хабарландыру}other{Тағы # хабарландыру}} +-Мәтін курсорын бөлектеу ++Мәтін курсорын ерекшелеу + Қосулы + Шығу + Жабу +diff --git a/ash/strings/ash_strings_no.xtb b/ash/strings/ash_strings_no.xtb +index 2043ade3b7f1..44f96ce78dac 100644 +--- a/ash/strings/ash_strings_no.xtb ++++ b/ash/strings/ash_strings_no.xtb +@@ -138,7 +138,7 @@ Her er noen ting du kan prøve til å begynne med. + Deaktiverer profil. Vent i noen minutter. + F + Direkteteksting er på. +-Slå på Wi-Fi-synkronisering ++Slå på wifi-synkronisering + «» er synlig for Bluetooth-enheter. + Ikke gjenkjent + Inndatametoder konfigureres av administratoren din. +@@ -287,7 +287,7 @@ Her er noen ting du kan prøve til å begynne med. + Opp + Hvit + Nattlys +-Telefonen må ha mobildata for å kunne tilby en Wi-Fi-sone ++Telefonen må ha mobildata for å kunne tilby en wifi-sone + Svar + Tilkoblet laveffektslader. Batteriladingen kan være upålitelig. + – +@@ -433,7 +433,7 @@ Her er noen ting du kan prøve til å begynne med. + Wi-Fi er slått av + Festet + Markørtegneverktøy +-Slå på Wi-Fi-sone ++Slå på wifi-sone + Åpnet nå nettopp + Konfigurer + Endre tilbake til (krever omstart) +@@ -505,7 +505,7 @@ Her er noen ting du kan prøve til å begynne med. + Lim inn + Lydinnstillinger + Trykk for å fullføre konfigureringen +-Kobler til Wi-Fi-sone … ++Kobler til wifi-sone … + Logg på + Forrige spor + Av +@@ -936,7 +936,7 @@ Nylig installert + Bluetooth-enheten «» ber om tillatelse til å koble til. Skriv inn denne tilgangskoden på den aktuelle enheten: + Passord + gi nettsteder, apper og utvidelser tillatelse til å bruke posisjonstjenester, enhetens mikrofon, kamera eller andre funksjoner +-Koble til telefonens Wi-Fi-sone, demp og finn enheten, og se nylige Chrome-faner som er åpne på telefonen ++Koble til telefonens wifi-sone, demp og finn enheten, og se nylige Chrome-faner som er åpne på telefonen + Skrivebord 3 + Kopiér bildet + Kan ikke låse opp Chromebooken +diff --git a/chrome/android/features/keyboard_accessory/internal/java/strings/translations/android_keyboard_accessory_strings_kk.xtb b/chrome/android/features/keyboard_accessory/internal/java/strings/translations/android_keyboard_accessory_strings_kk.xtb +index 6e6d7bd72575..cc739eab0ed4 100644 +--- a/chrome/android/features/keyboard_accessory/internal/java/strings/translations/android_keyboard_accessory_strings_kk.xtb ++++ b/chrome/android/features/keyboard_accessory/internal/java/strings/translations/android_keyboard_accessory_strings_kk.xtb +@@ -26,5 +26,5 @@ + Төлеу әдістерін көрсету + Қолжетімді құпия сөздер + Құпия сөз жоқ +-Қауіпсіздікті арттыру үшін виртуалды картаны пайдаланыңыз. ++Қауіпсіздікті арттыру үшін виртуалдық картаны пайдаланыңыз. + +\ No newline at end of file +diff --git a/chrome/android/features/vr/java/strings/translations/android_chrome_vr_strings_kk.xtb b/chrome/android/features/vr/java/strings/translations/android_chrome_vr_strings_kk.xtb +index 3daf91e995ee..a62f505a62b0 100644 +--- a/chrome/android/features/vr/java/strings/translations/android_chrome_vr_strings_kk.xtb ++++ b/chrome/android/features/vr/java/strings/translations/android_chrome_vr_strings_kk.xtb +@@ -7,5 +7,5 @@ + Google VR Services жаңартылсын ба? + Google VR Services орнатылсын ба? + Жаңарту +-Виртуалды шындық мазмұнын көру ++Виртуалдық шындық мазмұнын көру + +\ No newline at end of file +diff --git a/chrome/app/resources/chromium_strings_fa.xtb b/chrome/app/resources/chromium_strings_fa.xtb +index bf78789ead31..763b7244df8f 100644 +--- a/chrome/app/resources/chromium_strings_fa.xtb ++++ b/chrome/app/resources/chromium_strings_fa.xtb +@@ -15,7 +15,7 @@ + ‏Chromium برای ایجاد نقشه سه‌بعدی محیط شما باید اجازه دسترسی به دوربین داشته باشد + ‏Chromium این فایل را مسدود کرد زیرا برای بررسی امنیتی بسیار بزرگ است. با فایل‌هایی که حداکثر ۵۰ مگابایت باشد دوباره امتحان کنید + {COUNT,plural, =0{‏سرپرست سیستم لازم می‌داند برای اعمال به‌روزرسانی، Chromium را راه‌اندازی مجدد کنید}=1{‏سرپرست سیستم لازم می‌داند برای اعمال به‌روزرسانی، Chromium را راه‌اندازی مجدد کنید. پنجره ناشناس بازگشایی نمی‌شود.}one{‏سرپرست سیستم لازم می‌داند برای اعمال به‌روزرسانی، Chromium را راه‌اندازی مجدد کنید. # پنجره ناشناس بازگشایی نمی‌شود.}other{‏سرپرست سیستم لازم می‌داند برای اعمال به‌روزرسانی، Chromium را راه‌اندازی مجدد کنید. # پنجره ناشناس بازگشایی نمی‌شود.}} +-‏مرور کنترل‌های اصلی امنیت و حریم‌خصوصی در Chromium ++‏مرور کنترل‌های اصلی امنیت و حریم خصوصی در Chromium + ‏اگر می‌خواهید فقط یک‌بار از این حساب استفاده کنید، می‌توانید از حالت مهمان در مرورگر Chromium استفاده کنید. اگر می‌خواهید برای شخص دیگری حساب اضافه کنید، به خود شخص جدیدی اضافه کنید. + + اجازه‌هایی که قبلاً به وب‌سایت‌ها و برنامه‌ها داده‌اید ممکن است در این حساب اعمال شود. می‌توانید «حساب‌های Google» خود را در بخش تنظیمات مدیریت کنید. +@@ -68,7 +68,7 @@ + ‏Chromium نمی‌تواند گذرواژه‌هایتان را بررسی کند. بعداً دوباره امتحان کنید. + ‏افزودن به Chromium… + ‏با ارسال گزارش‌های خرابی و به Google، به بهبود Google کمک کنید +-‏سابقه مرور شما بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم‌خصوصی شما، Chromium علایقتان را هر ماه به‌طور خودکار و چرخشی حذف می‌کند. ممکن است علایق بازآوری شود، مگر اینکه آن‌ها را بردارید. ++‏سابقه مرور شما بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم خصوصی شما، Chromium علایقتان را هر ماه به‌طور خودکار و چرخشی حذف می‌کند. ممکن است علایق بازآوری شود، مگر اینکه آن‌ها را بردارید. + ‏نصب‌کننده در خارج کردن بایگانی از حالت فشرده ناموفق بود. لطفاً دوباره Chromium را بارگیری کنید. + ‏Chromium درحال استفاده از میکروفون شما است. + ‏اجرای مجدد Chromium +@@ -91,7 +91,7 @@ + ‏این کار مورد را از این دستگاه حذف می‌کند. برای بازیابی داده‌هایتان در فرصتی دیگر، با به سیستم Chromium وارد شوید. + ‏با می‌توانید بین نمایه‌های Chromium جابه‌جا شوید + ‏لطفاً همه پنجره‌های Chromium را ببندید و دوباره سعی کنید. +-‏برای محافظت از حریم‌خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشند به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. یا می‌توانید علایقی را که نمی‌خواهید Chromium مدنظر قرار دهد حذف کنید. ++‏برای محافظت از حریم خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشند به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. یا می‌توانید علایقی را که نمی‌خواهید Chromium مدنظر قرار دهد حذف کنید. + ‏سابقه مرور شما، سابقه سایت‌هایی که بااستفاده از Chromium در این دستگاه از آن‌ها بازدید کرده‌اید. + ‏نرم‌افزار مضری در رایانه‌تان وجود دارد. Chromium می‌تواند آن را بردارد، تنظیمات را بازیابی کند و افزونه‌ها را غیرفعال کند تا عملکرد مرورگرتان دوباره عادی شود. + ‏داده‌های محصول مرور این کاربر از این دستگاه حذف می‌شود. برای بازیابی داده‌ها، با نام به سیستم Chromium وارد شوید. +@@ -154,7 +154,7 @@ + ‏گذرواژه ذخیره‌شده‌ای وجود ندارد. Chromium زمانی می‌تواند گذرواژه‌هایتان را بررسی کند که آن‌ها را ذخیره کرده باشید. + ‏ قبلاً به سیستم این نمایه Chromium وارد شده است. با این کار، نمایه Chromium جدیدی برای ایجاد خواهد شد + ‏برای اعمال تغییراتتان، Chromium را راه‌اندازی مجدد کنید +-‏اگر نسخه آزمایشی روشن باشد و Chromium به‌طور تصادفی نسخه آزمایشی را برایتان فعال کرده باشد، سابقه مرورتان بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم‌خصوصی شما، Chromium علایقتان را هر ماه به‌طور چرخشی حذف می‌کند. ++‏اگر نسخه آزمایشی روشن باشد و Chromium به‌طور تصادفی نسخه آزمایشی را برایتان فعال کرده باشد، سابقه مرورتان بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم خصوصی شما، Chromium علایقتان را هر ماه به‌طور چرخشی حذف می‌کند. + ‏شما با حساب مدیریت‌شده وارد سیستم می‌شوید و به سرپرست آن اجازه کنترل بر نمایه Chromium خود را می‌دهید. داده‌های Chromium شما شامل برنامه‌ها، نشانک‌ها، سابقه، گذرواژه‌ها و سایر تنظیمات برای همیشه به مرتبط خواهد شد. می‌توانید این داده‌ها را از طریق داشبورد حساب‌های Google حذف کنید اما نمی‌توانید این داده‌ها را به حساب دیگری مرتبط سازید. + ‏درحال به‌روزرسانی Chromium () + ‏مجاز کردن ورود به سیستم Chromium +@@ -162,7 +162,7 @@ + ‏تنظیم Chromium به عنوان مرورگر پیش‌فرضتان + - Chromium Beta + ‏Chromium برای هم‌رسانی مکانتان با این سایت باید به مکان شما دسترسی داشته باشد +-‏برای محافظت از حریم‌خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشند به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. و اگر Chromium به‌اشتباه علاقه‌ای را اضافه کند یا شما نخواهید آگهی‌های مشخصی را ببینید، می‌توانید آن علاقه را بردارید. ++‏برای محافظت از حریم خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشند به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. و اگر Chromium به‌اشتباه علاقه‌ای را اضافه کند یا شما نخواهید آگهی‌های مشخصی را ببینید، می‌توانید آن علاقه را بردارید. + ‏وقتی Chromium جدیدترین به‌روزرسانی‌های سیستم را نصب می‌کند، لطفاً صبر کنید. + ‏Chromium می‌خواهد گذرواژه‌ها را ویرایش کند. برای اینکه اجازه دهید این کار انجام شود، گذرواژه Windows خود را تایپ کنید. + ‏باز کردن فایل‌های PDF در Chromium +@@ -174,7 +174,7 @@ + ‏Chromium متوجه شده است که این موارد حاوی بدافزار هستند: + راه‌اندازی مجدد + - ورود به سیستم شبکه +-‏اگر Chromium به‌طور تصادفی نسخه آزمایشی را برایتان فعال کرده باشد، سابقه مرورتان بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم‌خصوصی شما، Chromium علایقتان را هر ماه به‌طور چرخشی حذف می‌کند. ممکن است علایق بازآوری شود، مگر اینکه آن‌ها را بردارید. ++‏اگر Chromium به‌طور تصادفی نسخه آزمایشی را برایتان فعال کرده باشد، سابقه مرورتان بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم خصوصی شما، Chromium علایقتان را هر ماه به‌طور چرخشی حذف می‌کند. ممکن است علایق بازآوری شود، مگر اینکه آن‌ها را بردارید. + ‏به‌روزرسانی Chromium برای شروع همگام‌سازی + ‏امری عادی است که سایت‌هایی که بازدید می‌کنید برای شخصی کردن تجربه‌تان، علایق شما را به‌خاطر آورند. به‌علاوه، سایت‌ها می‌توانند بااستفاده از Chromium اطلاعاتی درباره علایقتان ذخیره کنند. + ‏نسخه جدیدی از Chromium وجود دارد که سریع‌تر از همیشه است. +@@ -277,7 +277,7 @@ Chromium قادر به بازیابی تنظیمات شما نیست. - Chromium Canary + ‏درحال‌حاضر یک نمایه Chromium با این حساب در این دستگاه وجود دارد + ‏Chromium به جدیدترین نسخه به‌روزرسانی نشد، بنابراین قابلیت‌های جدید و رفع اشکال‌های امنیتی را ندارید. +-‏چگونه می‌توانید داده‌هایتان را مدیریت کنید: برای محافظت از حریم‌خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشد به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. یا می‌توانید علایقی را که نمی‌خواهید Chromium مدنظر قرار دهد حذف کنید. ++‏چگونه می‌توانید داده‌هایتان را مدیریت کنید: برای محافظت از حریم خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشد به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. یا می‌توانید علایقی را که نمی‌خواهید Chromium مدنظر قرار دهد حذف کنید. + ‏شما بعنوان وارد سیستم Chromium شده‌اید. لطفاً برای ورود به سیستم مجدد از همان حساب استفاده کنید. + ‏این نصب ثانویه Chromium است و نمی‌تواند مرورگر پیش‌فرضتان شود. + ‏اگر تنظیمی در این صفحه نشان داده نمی‌شود، در +diff --git a/chrome/app/resources/generated_resources_fa.xtb b/chrome/app/resources/generated_resources_fa.xtb +index 05d479b3f7ee..262eccfeac75 100644 +--- a/chrome/app/resources/generated_resources_fa.xtb ++++ b/chrome/app/resources/generated_resources_fa.xtb +@@ -777,11 +777,11 @@ + آبی روشن + افزونه‌ها در محدوده زمانی تعیین‌شده بار نشدند. لطفاً با سرپرست تماس بگیرید. + ممکن است نتواند خود را به‌روز نگه دارد +-درباره «جعبه ایمنی حریم‌خصوصی» ++درباره «جعبه ایمنی حریم خصوصی» + متوجه شدم. به‌طور پیش‌فرض، سایت‌های جدیدی را که بازدید کرده‌اید برایتان اعلان نمی‌فرستند. + کاوش + اشکال پرونده +-دوره آزمایشی «جعبه ایمنی حریم‌خصوصی» هنوز در مرحله توسعه فعال است و در مناطق منتخب دردسترس است. درحال‌حاضر، ممکن است سایت‌ها همچنان که از فناوری‌های کوکی‌های شخص ثالث استفاده می‌کنند، «جعبه ایمنی حریم‌خصوصی» را نیز امتحان کنند. ++دوره آزمایشی «جعبه ایمنی حریم خصوصی» هنوز در مرحله توسعه فعال است و در مناطق منتخب دردسترس است. درحال‌حاضر، ممکن است سایت‌ها همچنان که از فناوری‌های کوکی‌های شخص ثالث استفاده می‌کنند، «جعبه ایمنی حریم خصوصی» را نیز امتحان کنند. + شارژ تطبیقی + سفارشی + ادامه +@@ -1313,7 +1313,7 @@ + این فایل دارای یک مجوز است، که وارد نشده است: + &اطلاعات بیشتر + فعالیت برنامه و وب +-راهنمای حریم‌خصوصی ++راهنمای حریم خصوصی + ‏همگام‌سازی و سرویس‌های Google + کوکی‌های شخص ثالث مسدود شده‌اند + داده‌های حالت فرکانس +@@ -1369,7 +1369,7 @@ + دکمه‌های پیمایش رایانه لوحی + هیچ مورد منطبقی پیدا نشد + ‏لطفاً را به‌عنوان یک کاربر معمولی راه‌اندازی کنید. اگر می‌خواهید آن را به‌عنوان ریشه برای طراحی اجرا کنید، با پرچم no-sandbox آن را دوباره اجرا کنید. +-حریم‌خصوصی صفحه‌نمایش ++حریم خصوصی صفحه‌نمایش + آیا می‌خواهید را نصب کنید؟ + مرور تنظیمات + نتیجه +@@ -2498,7 +2498,7 @@ + سینی خروجی تقریباً پر است + این فایل رمزگذاری شده است. از مالک بخواهید آن را رمزگشایی کند. + جزئیات برنامه +-دوره‌های آزمایشی «جعبه ایمنی حریم‌خصوصی» ++دوره‌های آزمایشی «جعبه ایمنی حریم خصوصی» + ‏تجزیه‌وتحلیل اسناد Chrome + محتوای صفحه ارسال نشد. + سایت‌هایی که مجاز هستند از شناسه‌ها برای پخش محتوای محافظت‌شده استفاده کنند +@@ -2832,7 +2832,7 @@ + درحال‌حاضر به‌عنوان به سیستم وارد شده‌اید + به سایت‌های بسته‌شده اجازه داده نشود ارسال و دریافت داده را تکمیل کنند + مرور قبل از اتمام بارگیری بسته شد. +-برای محافظت از حریم‌خصوصی شما، سایت‌های موجود در فهرست را که قدیمی‌تر از ۴ هفته باشند به‌طور خودکار حذف می‌کنیم. سایت‌هایی که مجدداً از آن‌ها بازدید می‌کنید ممکن است دوباره در فهرست نمایش داده شود. یا اگر نمی‌خواهید سایت خاصی هرگز به علایق شما پی ببرد می‌توانید آن سایت را از فهرست بردارید. ++برای محافظت از حریم خصوصی شما، سایت‌های موجود در فهرست را که قدیمی‌تر از ۴ هفته باشند به‌طور خودکار حذف می‌کنیم. سایت‌هایی که مجدداً از آن‌ها بازدید می‌کنید ممکن است دوباره در فهرست نمایش داده شود. یا اگر نمی‌خواهید سایت خاصی هرگز به علایق شما پی ببرد می‌توانید آن سایت را از فهرست بردارید. + جای‌گذاری و رفتن به + چاپگر از سرور چاپ پیدا شد + حساب باید به‌روزرسانی شود +@@ -2884,7 +2884,7 @@ + بازرسی صفحه &پس‌زمینه + باز کردن در پنجره &ناشناس + به سایت اجازه می‌دهید فایل‌ها را ویرایش کند؟ +-دکمه برگشت «راهنمای حریم‌خصوصی» ++دکمه برگشت «راهنمای حریم خصوصی» + اطلاعات دقیق ساخت + {NUM_DEVICES,plural, =1{‏ارتباط با یک دستگاه USB}one{‏ارتباط با # دستگاه USB}other{‏ارتباط با # دستگاه USB}} + ‏آیا به Google اجازه می‌دهید از سبد خریدتان برای پیدا کردن تخفیف‌های دردسترس استفاده کند؟ +@@ -2900,7 +2900,7 @@ + ‏گواهی سرور SSL + ارسال به دستگاه‌هایتان + سایت‌ها می‌توانند بارگیری خودکار چند فایل را درخواست کنند +-‏این افزونه حریم‌خصوصی «نت‌بازار Chrome» را نقض می‌کند. ++‏این افزونه حریم خصوصی «نت‌بازار Chrome» را نقض می‌کند. + دستگاه تلفن همراه فعال نشد + برنامه افزودنی فعال شد + بارگیری لغو شد. +@@ -3828,7 +3828,7 @@ + تبدیل به حروف کوچک + % (پیش‌فرض) + همگام‌سازی همه +- می‌خواهد به دوربین دسترسی داشته باشد. برای مجاز کردن دسترسی، کلید «حریم‌خصوصی دوربین» را خاموش کنید. ++ می‌خواهد به دوربین دسترسی داشته باشد. برای مجاز کردن دسترسی، کلید «حریم خصوصی دوربین» را خاموش کنید. + دستگاه نامشخص () + شناسه گزارش محلی: . + درحال برگرداندن این دستگاه را به نسخه قبلی است () +@@ -4263,7 +4263,7 @@ + ‏از نشانی IP برای تعیین مکان (پیش‌فرض) استفاده شود + ‏وقتی سایتی می‌خواهد به دستگاه‌های HID دسترسی پیدا کند سؤال شود (توصیه می‌شود) + ‏«خدمات مکان Google» از منابعی مانند Wi-Fi، شبکه‌های تلفن همراه، و حسگرها برای کمک به تخمین مکان دستگاهتان استفاده می‌کند. +-تنظیمات حریم‌خصوصی ++تنظیمات حریم خصوصی + ‏نام سرور SSL گواهی Netscape + فضای دیسک را آزاد کنید، در غیر این صورت ممکن است داده‌های انتخابی به‌صورت خودکار حذف شوند + فراموش کردن تلفن +@@ -4411,7 +4411,7 @@ + باید با نویسه حروف کوچک یا زیرخط شروع شود + ‏ از حسگر داخلی برای شناسایی افراد مقابل دستگاه استفاده می‌کند. همه داده‌ها بلافاصله در دستگاهتان پردازش و سپس حذف می‌شود. داده‌های حسگر هرگز به Google ارسال نمی‌شود. بیشتر بدانید + گذرواژه ذخیره شد. گذرواژه‌های ذخیره‌شده‌تان را در مشاهده و مدیریت کنید. +-وقتی فرد دیگری به صفحه‌نمایشتان نگاه کند، نماد چشم «حریم‌خصوصی» در پایین سمت چپ صفحه‌نمایش نشان داده می‌شود ++وقتی فرد دیگری به صفحه‌نمایشتان نگاه کند، نماد چشم «حریم خصوصی» در پایین سمت چپ صفحه‌نمایش نشان داده می‌شود + ایحاد زمینه توسط + ردیابی نشود + مشاهده و مدیریت گروه‌های برگه +@@ -5307,7 +5307,7 @@ + &کپی تصویر + بازنشانی به سطح بزرگ‌نمایی پیش‌فرض + کشور/منطقه +-کدهای اطمینان حریم‌خصوصی را در وب بهبود می‌بخشد و نمی‌توان از آن‌ها برای پی بردن به هویت شما استفاده کرد. ++کدهای اطمینان حریم خصوصی را در وب بهبود می‌بخشد و نمی‌توان از آن‌ها برای پی بردن به هویت شما استفاده کرد. + داده تلفن همراه درحال فعال شدن است + در ذخیره نشد - + درحال به‌روزرسانی مؤلفه +@@ -5559,7 +5559,7 @@ + اگر این تغییرات مدنظر شما نبود، می‌توانید تنظیمات قبلی‌تان را بازیابی کنید. + ایجاد میان‌بر دسک تاپ + کوکی‌ها +-تغییر تنظیمات مربوط به حریم‌خصوصی شما ++تغییر تنظیمات مربوط به حریم خصوصی شما + سایت یا صفحه + {NUM_PAGES,plural, =0{}=1{ و ۱ برگه دیگر}one{ و # برگه دیگر}other{ و # برگه دیگر}} + اگر عبارت عبورتان را فراموش کرده‌اید یا می‌خواهید این تنظیم را تغییر دهید، همگام‌سازی را بازنشانی کنید. +@@ -5952,7 +5952,7 @@ + ترجمه + برگه از گروه برداشته شد - + به مرورگری هوشمند و ایمن جابه‌جا شوید +-دوره آزمایشی «جعبه ایمنی حریم‌خصوصی» ++دوره آزمایشی «جعبه ایمنی حریم خصوصی» + «حالت تاریک» هنگام غروب آفتاب به‌طور خودکار روشن خواهد شد + برای به‌روزرسانی ، لطفاً به اینترنت وصل شوید. + خطای حذف مجوز +@@ -6160,7 +6160,7 @@ + صفحه اصلی شما تنظیم شد. + معرفی روشی جدید برای پیمایش با اشاره‌ها + مدیریت خدمات داده‌های تلفن همراه +-امنیت و حریم‌خصوصی ++امنیت و حریم خصوصی + {COUNT,plural, =0{باز کردن همه در پنجره ناشناس}=1{باز کردن در پنجره ناشناس}one{باز کردن همه ({COUNT}) در پنجره ناشناس}other{باز کردن همه ({COUNT}) در پنجره ناشناس}} + ‏Crostini نصب نشده است. لطفاً برای مشاهده اعتبارها، Crostini را نصب کنید. + گذرواژه‌ها +@@ -6253,7 +6253,7 @@ + اجازه دارد چند فایل را به‌طور خودکار بارگیری کند + اگر فکر می‌کنید آگهی‌های مربوط به این مورد برایتان مفید خواهد بود، علاقه یا سایت را اضافه کنید. + اختصاص دادن کلید به کنش «قبلی» +-با دوره‌های آزمایشی «جعبه ایمنی حریم‌خصوصی»، سایت‌ها می‌توانند تجربه مرور یکسانی را بااستفاده از اطلاعات شخصی کمتر ارائه دهند. به‌عبارت‌دیگر، حریم‌خصوصی‌تان بهبود می‌یابد و ردیابی بین‌سایتی کاهش پیدا می‌کند. هروقت دوره‌های آزمایشی جدیدی برای آزمایش کردن آماده شد، آن‌ها را اضافه می‌کنیم. ++با دوره‌های آزمایشی «جعبه ایمنی حریم خصوصی»، سایت‌ها می‌توانند تجربه مرور یکسانی را بااستفاده از اطلاعات شخصی کمتر ارائه دهند. به‌عبارت‌دیگر، حریم خصوصی‌تان بهبود می‌یابد و ردیابی بین‌سایتی کاهش پیدا می‌کند. هروقت دوره‌های آزمایشی جدیدی برای آزمایش کردن آماده شد، آن‌ها را اضافه می‌کنیم. + ‏حذف Crostini + سابقه بارگیری + وقتی اعلان‌ها مسدود شده‌اند، نشانگری در نوار نشانی نشان داده شود +@@ -6457,7 +6457,7 @@ + صفحه در + برای اجرای کلیک راست کنید + سایت‌ها می‌توانند برای اتصال به دستگاه‌های بلوتوث درخواست دهند +-راهنمای گزینه‌های حریم‌خصوصی ++راهنمای گزینه‌های حریم خصوصی + دسترسی درخواست شده + پخش محتوا… + انتخاب فایل +@@ -6614,7 +6614,7 @@ + درحال راه‌اندازی مدیریت + هویتتان را به‌تأیید برسانید + حذف نصب برنامه +-وقتی روشن باشد، سایت‌ها می‌توانند برای ارائه محتوا و سرویس‌هایشان از تکنیک‌های حفظ حریم‌خصوصی نشان داده‌شده در اینجا استفاده کنند. این تکنیک‌ها شامل روش‌های جایگزین برای ردیابی بین‌سایتی می‌شود. ممکن است در گذر زمان، دوره‌های آزمایشی بیشتری اضافه شود. ++وقتی روشن باشد، سایت‌ها می‌توانند برای ارائه محتوا و سرویس‌هایشان از تکنیک‌های حفظ حریم خصوصی نشان داده‌شده در اینجا استفاده کنند. این تکنیک‌ها شامل روش‌های جایگزین برای ردیابی بین‌سایتی می‌شود. ممکن است در گذر زمان، دوره‌های آزمایشی بیشتری اضافه شود. + کپی در دستگاه + بارگیری + افزودن تخصیص +@@ -6769,7 +6769,7 @@ + لغو + درهرصورت از «حالت ناشناس» خارج می‌شوید؟ + فقط گذرواژه‌های ذخیره‌شده در این دستگاه +-مشاهده «راهنمای حریم‌خصوصی» ++مشاهده «راهنمای حریم خصوصی» + مجاز به استفاده از این دستگاه نیستید. لطفاً برای دریافت اجازه ورود به سیستم با سرپرست تماس بگیرید. + روی یکی از برگه‌ها کلیک راست کنید و «افزودن برگه به گروه جدید» را انتخاب کنید + اجازه به سایت‌ها برای ذخیره کردن و خواندن داده‌های کوکی +@@ -7018,7 +7018,7 @@ + درحال بار کردن اطلاعات حساب… + {COUNT,plural, =1{یک مورد}one{# مورد}other{# مورد}} + سیم‌کارت داخلی +-در گشت با راهنمای مربوط به کنترل‌های اصلی امنیت و حریم‌خصوصی شرکت کنید. برای گزینه‌های بیشتر، به‌طور جداگانه به هر تنظیم بروید. ++در گشت با راهنمای مربوط به کنترل‌های اصلی امنیت و حریم خصوصی شرکت کنید. برای گزینه‌های بیشتر، به‌طور جداگانه به هر تنظیم بروید. + کپی‌برداری + موشواره بلوتوث مرتبط شد + تغییر زبان تایپ صوتی +@@ -7313,7 +7313,7 @@ + خطا در تنظیم اعتماد مجوز + با فعال کردن «زیرنویس ناشنوایان زنده» در تنظیمات، برای صدا و ویدیو زیرنویس ناشنوایان دریافت کنید + - ، +-‏Chrome بااستفاده از جعبه ایمنی حریم‌خصوصی درحال توسعه فناوری‌های جدیدی است که ضمن حفظ وبِ باز، از شما در برابر ردیابی بین‌سایتی محافظت می‌کند. ++‏Chrome بااستفاده از جعبه ایمنی حریم خصوصی درحال توسعه فناوری‌های جدیدی است که ضمن حفظ وبِ باز، از شما در برابر ردیابی بین‌سایتی محافظت می‌کند. + «حالت خواننده» برای صفحه‌های وب + {NUM_TABS,plural, =1{انتقال دادن برگه به پنجره جدید}one{انتقال دادن برگه‌ها به پنجره جدید}other{انتقال دادن برگه‌ها به پنجره جدید}} + ‏بازارسال درگاه Crostini +@@ -7343,7 +7343,7 @@ + تنظیمات دستگاه را بررسی کنید و برای ادامه، آن را روشن کنید + ‏برای ارسال محتوای صفحه، کد دسترسی نمایش داده‌شده در Chromecast یا تلویزیون را وارد کنید. + حساب‌های مدرسه +-جعبه ایمنی حریم‌خصوصی ++جعبه ایمنی حریم خصوصی + مدیریت برنامه‌ها، افزونه‌ها و طرح‌های زمینه + می‌خواهد محتوای صفحه‌نمایشتان را هم‌رسانی کند + دستگاه‌های شما · +@@ -7596,7 +7596,7 @@ + وارد کردن نشانک‌ها + میان‌بر + باز کردن همه ( مورد) در پنجره جدید +-مرور کنترل‌های اصلی امنیت و حریم‌خصوصی ++مرور کنترل‌های اصلی امنیت و حریم خصوصی + ‏برای صرفه‌جویی در حافظه، Chrome برخی محتوا را پاک کرد + مدیریت موتورهای جستجو و جستجوی سایت + واسط کاربر پیکربندی شبکه درخواست شد، لطفاً صبر کنید… +@@ -7623,7 +7623,7 @@ + دستگاه نامشخص از + ‏تأیید مجوز USB + ویژگی‌های آزمایشی روشن است +-برنامه‌ای می‌خواهد به دوربین دسترسی داشته باشد. برای مجاز کردن دسترسی، کلید «حریم‌خصوصی دوربین» را خاموش کنید. ++برنامه‌ای می‌خواهد به دوربین دسترسی داشته باشد. برای مجاز کردن دسترسی، کلید «حریم خصوصی دوربین» را خاموش کنید. + بزرگ‌نمایی + پیشنهادهای شخصی فقط در حساب شما نمایش داده می‌شوند + برنامه‌های کیوسک زیر «» به‌روز شده‌اند. لطفاً برای تکمیل فرآیند به‌روزرسانی دستگاه را مجدداً راه‌اندازی کنید. +@@ -7861,7 +7861,7 @@ + گذرواژه‌های بررسی‌شده + با کلیک کردن روی این نماد از این برنامه افزودنی استفاده کنید. + خواندن و تغییر سابقه مرورتان در همه دستگاه‌های وارد به سیستم خودتان +-تنظیمات بیشتر مرتبط با حریم‌خصوصی، امنیت و جمع‌آوری داده‌ها ++تنظیمات بیشتر مرتبط با حریم خصوصی، امنیت و جمع‌آوری داده‌ها + فعال کردن این تنظیم به برنامه‌های کیوسک اجازه می‌دهد تا به صورت خودکار در شروع به کار راه‌اندازی شوند. + مسدود کردن کوکی‌های شخص ثالث + وفتی به‌روزرسانی تمام شد، برای فعال کردن آن، صفحه را تازه‌سازی کنید +@@ -8025,7 +8025,7 @@ + فهرست مخاطبین بارگیری نشد. لطفاً اتصال شبکه‌تان را بررسی کنید یا دوباره امتحان کنید. + لطفاً دوباره امتحان کنید. برای پشتیبانی فنی، با تماس بگیرید. + فعال کردن شتاب‌دهنده صفحه لمسی +-چگونه می‌توانید داده‌هایتان را مدیریت کنید: برای محافظت از حریم‌خصوصی شما، سایت‌های موجود در فهرست را که قدیمی‌تر از ۴ هفته باشند به‌طور خودکار حذف می‌کنیم. سایت‌هایی که مجدداً از آن‌ها بازدید می‌کنید ممکن است دوباره در فهرست نمایش داده شود. یا اگر نمی‌خواهید سایت خاصی هرگز به علایق شما پی ببرد می‌توانید آن سایت را از فهرست بردارید. ++چگونه می‌توانید داده‌هایتان را مدیریت کنید: برای محافظت از حریم خصوصی شما، سایت‌های موجود در فهرست را که قدیمی‌تر از ۴ هفته باشند به‌طور خودکار حذف می‌کنیم. سایت‌هایی که مجدداً از آن‌ها بازدید می‌کنید ممکن است دوباره در فهرست نمایش داده شود. یا اگر نمی‌خواهید سایت خاصی هرگز به علایق شما پی ببرد می‌توانید آن سایت را از فهرست بردارید. + اکنون دستگاهتان ساعت قفل می‌شود. + وقتی ارتقا به پایان برسد، برنامه‌تان باز خواهد شد. ارتقا ممکن است چند دقیقه طول بکشد. + رنگ: +@@ -8183,7 +8183,7 @@ + گذرواژه به‌روزرسانی شود؟ + دسترسی به فایل‌های محلی موجود در دستگاهتان، توسط سرپرست شما غیرفعال شده است + این عملیات را نمی‌توان واگرد کرد +-حریم‌خصوصی و امنیت ++حریم خصوصی و امنیت + لطفاً گذرکلید "" را وارد کنید: + اتصال به شبکه انجام نشد: + فهرست خواندن به پانل کناری جدید منتقل شده است. آن را در اینجا امتحان کنید. +@@ -8334,7 +8334,7 @@ + رسانه و عکس‌های جدید تلفنتان را مشاهده کنید. برنامه‌های پیام‌رسانی تلفن را جاری‌سازی کنید. + درباره پشتیبان‌گیری از برنامه‌ها بیشتر بدانید + ‏استفاده از تلفن Android به‌عنوان کلید امنیتی +-برای خارج شدن از «راهنمای حریم‌خصوصی»، کلیک کنید. ++برای خارج شدن از «راهنمای حریم خصوصی»، کلیک کنید. + خواهد توانست فایل‌های را ویرایش کند + جستجوی + هرنوع داده آفلاینی حذف خواهد شد +diff --git a/chrome/app/resources/generated_resources_kk.xtb b/chrome/app/resources/generated_resources_kk.xtb +index 5ed778820855..b2704d9f371f 100644 +--- a/chrome/app/resources/generated_resources_kk.xtb ++++ b/chrome/app/resources/generated_resources_kk.xtb +@@ -179,7 +179,7 @@ + "" қойындысы "" үстеліне тиесілі. + ішінде ашылады… + файлында құпия немесе қауіпті деректер болуы мүмкін. Әкімші хабары: "". +-Нысан өзгерген кезде оны пернетақта арқылы бөлектеу ++Нысан өзгерген кезде оны пернетақта арқылы ерекшелеу + веб-сайты HID құрылғысына жалғанғысы келеді. + Екі бетіне басып шығару (күнтізбе) + Атын өзгерту +@@ -732,9 +732,9 @@ + Өнер + Файлды өңдеу + Cookie файлдарын пайдалана алмайтын сайттар +-Виртуалды картаны жою ++Виртуалдық картаны жою + Құпия сөздеріңіз жайлы уайымдамаңыз +-Сайттардың виртуалды шындық құрылғыларын немесе деректерді пайдалануына рұқсат бермеу ++Сайттардың виртуалдық шындық құрылғыларын немесе деректерді пайдалануына рұқсат бермеу + Бас әріпке өзгерту + Сайттардың дыбысты шығаруына рұқсат бермеу + Қауіпсіздік шарасы күні қолданылды. +@@ -1010,7 +1010,7 @@ + Бұл бет компьютеріңізде жұмыс істемейтін Native Client қолданбасын пайдаланады. + Барлығын жою + Стандартты қорғау +-Жылжытқан кезде, көрсеткіні бөлектеу ++Жылжытқан кезде, көрсеткіні ерекшелеу + Арнайы рұқсаттары жоқ. + WebRTC мәтіндік журналы () + Бейне режимі қосылды +@@ -1091,7 +1091,7 @@ + Құрылғыңыз бұрын орнатылған Chrome нұсқасына қайтарылады. Барлық пайдаланушы аккаунттары мен жергілікті деректер жойылады. Бұл әрекетті кері қайтару мүмкін емес. + Рамен + Құрылғының EID нөмірін көрсету +-Виртуалды құрылғы тексерілуде ++Виртуалдық құрылғы тексерілуде + Желілік трафигіңізге кіру + Контейнер басқарушысын іске қосу қатесі. Қайталап көріңіз. + Әрекет қолжетімді емес +@@ -1222,7 +1222,7 @@ + Қосымша функцияларды пайдалану үшін осы Chromebook құрылғысымен жұмыс істеуге арналған қондыру станциясын пайдаланыңыз. + Толық экраннан шығу + Бұл бет енді толық экранға ауысты. +-Бөлектелген мәтіннің сілтемесін көшіру ++Ерекшеленген мәтіннің сілтемесін көшіру + USB-C + Wi-Fi желісін қосу… + Синхрондау, сіз параметрлерден шыққан кезде, басталады. +@@ -1231,7 +1231,7 @@ + Қараңғы режимді қосу + , , және тағы 1 ауыстырғыш + Бұл құрылғыларды QR кодын сканерлеу арқылы байланыстырдыңыз. +-Әр элемент қанша уақыт бөлектеліп тұруы керектігін таңдаңыз ++Әр элемент қанша уақыт ерекшеленіп тұруы керектігін таңдаңыз + аәбвгғдеёжзийкқлмнңоөпрстуұүфхһцчшщъыіьэюя + Бәрібір кіру + Интернет байланысын тексеріңіз +@@ -1417,7 +1417,7 @@ + Аяқталу уақыты: + Сақталған Wi-Fi желілері + Құпия сөзді есте сақтау +-Виртуалды картаны өшіру ++Виртуалдық картаны өшіру + Құлыпты автоматты түрде ашу функциясын қосу үшін PIN кодын растаңыз. + Қолданбаны &қайта жүктеу + Қолданбаны қосу +@@ -1569,7 +1569,7 @@ + Бұл беттерді ашпасаңыз да, cookie файлдарын пайдаланып, параметрлерді сақтап қалады + Тамагочи + {NUM_TABS,plural, =1{ – 1 қойынды}other{ – # қойынды}} +-Виртуалды машина күйі ++Виртуалдық машина күйі + Ешқандай принтер сақталмаған. + Емлені тексеруді реттеу + Ортақ каталогтің URL мекенжайы +@@ -1653,7 +1653,7 @@ + Кеңейтімдер қолданатын процестер саны + Ешқандай ұялы байланыс желісі жоқ. + мына файлдар мен қалталарды көреді және өңдей алады. +-Виртуалды құрылғы кескіні тексерілуде ++Виртуалдық құрылғы кескіні тексерілуде + Бұл құрылғысын кім пайдаланады? + Синхрондау өшірілген + "Бастау" түймесін басып, кеңейтім әрекеттерін тыңдаңыз. +@@ -2043,7 +2043,7 @@ + Сайттарға cookie деректерін сақтауға және оқуға рұқсат беру (ұсынылған) + Әрекеттер журналын көру + Автоматты түрде сканерлеу +-Веб-бетте "Қойынды" түймесін басқанда, сілтемелер мен нысан өрістері бөлектеледі ++Веб-бетте "Қойынды" түймесін басқанда, сілтемелер мен нысан өрістері ерекшеленеді + Кеңейтімдерден іздеу + Параметрлерге өту + Бұл құрылғыны аккаунтыңыз кіретін ұйымға тіркеу мүмкін емес, себебі құрылғы басқа ұйым арқылы басқару үшін белгіленген. +@@ -2377,7 +2377,7 @@ + Терезе ретінде ашу + Google аккаунттарыңызды тексеріңіз + Таңдалған контактілер маңайда болған кезде, сізбен бөлісе алады. Сіз қабылдамайынша, тасымалдау басталмайды. +-Бұл процесс бірнеше минутқа созылуы мүмкін. Виртуалды құрылғы іске қосылуда. ++Бұл процесс бірнеше минутқа созылуы мүмкін. Виртуалдық құрылғы іске қосылуда. + Басқаша &сақтау… + Chrome браузерінде қалу + Кепілдік берілетін файлдар мен бағдарламалар: +@@ -2451,7 +2451,7 @@ + Пайдаланылатын жад көлемі + құрылғысымен жұптау мүмкін болмады; әрекетті қайталау үшін құрылғыны таңдаңыз. + Байланыс қатесі +-(виртуалды карта қосулы) ++(виртуалдық карта қосулы) + Аяқталған + Сертификат саясатының шектеулері + Басып шығару әрекеті сәтсіз аяқталды. Принтерді тексеріп, әрекетті қайталаңыз. +@@ -2499,7 +2499,7 @@ + Скринсейверді қосу + Қаріптерді реттеу + ... +-Виртуалды шындық құрылғыларын мен деректерін пайдалануға рұқсаты барлар ++Виртуалдық шындық құрылғыларын мен деректерін пайдалануға рұқсаты барлар + Тілді немесе енгізу әдісін көрсетіңіз + Бетбелгілер жолағын &көрсету + Maps +@@ -2561,7 +2561,7 @@ + Бұл – құрылғысына арналған бағдарламалық құрал мен қауіпсіздік жүйесінің жаңа нұсқасы. Бұдан кейін де жаңа нұсқаларын алғыңыз келсе, жаңа үлгіге өтіңіз. + Синхрондауды шифрлау құпия сөзі + &Кескінді жаңа қойындыда ашу +-Желідегі қатеге байланысты виртуалды құрылғы орнатылмады. Әрекетті қайталаңыз немесе әкімшіге хабарласыңыз. Қате коды: . ++Желідегі қатеге байланысты виртуалдық құрылғы орнатылмады. Әрекетті қайталаңыз немесе әкімшіге хабарласыңыз. Қате коды: . + Бөлісуден бас тартылмады + Басып шығару + Аккаунтыңыз Google Play Store дүкеніне кіре алуы үшін идентификатор провайдері арқылы аутентификациялаңыз. +@@ -2596,7 +2596,7 @@ + анонимді функция + Жүктеп алынуда… % + Балаңыздың аккаунты Family Link ата-ана бақылауы үшін реттелмеген. Реттеуді аяқтағаннан кейін, ата-ана бақылауын қоса аласыз. Ата-ана бақылауы туралы ақпаратты Explore қолданбасынан таба аласыз. +-VR сеанстарына кіре алуыңыз үшін, сайттар әдетте виртуалды шындық құрылғыларын және деректерді қолданады. ++VR сеанстарына кіре алуыңыз үшін, сайттар әдетте виртуалдық шындық құрылғыларын және деректерді қолданады. + Интернет байланысы керек. + Жарамдылық + Сайт бірінші файлдан кейін файлдарды автоматты түрде жүктеуге әрекет еткенде сұрау (ұсынылған) +@@ -2827,7 +2827,7 @@ + Негізгі бет + CUPS + Сіз және Google +-Виртуалды құрылғы қызметін іске қосу кезінде қате шықты. Кейінірек қайталап көріңіз. ++Виртуалдық құрылғы қызметін іске қосу кезінде қате шықты. Кейінірек қайталап көріңіз. + Қолжетімді WiFi желілері + Қалқымалы терезені тексеру + Бір рет қана +@@ -3129,7 +3129,7 @@ + Электрондық мекенжайды қамтымау + Демо режимі іске қосылмады + Бұл сайтқа қауіпсіздік кілтін көруге рұқсат етілсін бе? +-Бөлектелген мәтіннің сілтемесін көшіру ++Ерекшеленген мәтіннің сілтемесін көшіру + Жылдам жауаптар ұсынған анықтама + ChromeOS құрылғыларына автоматты түрде жасалған есептерді жіберуге рұқсат берсеңіз, бізге ChromeOS жүйесіндегі ақауларды жоюға және оны жетілдіруге қатысты басымдықтарды анықтауға көмектесесіз. Мұндай есептерде ChromeOS бұзылған кезде қолданыста болған функциялар және әдетте пайдаланылатын жад көлемі сияқты ақпарат қамтылуы мүмкін. + Chrome құрылғыңыздың параметрлері арқылы кез келген уақытта мұндай есептерді жіберуге рұқсат бере және тыйым сала аласыз. Егер домен әкімшісі болсаңыз, бұл параметрді әкімші консолі арқылы өзгерте аласыз. +@@ -3313,7 +3313,7 @@ + Тілдер + HID құрылғысы (:) + орнатылуда... +-Пернетақта фокусын бөлектеу ++Пернетақта фокусын ерекшелеу + Бұл профильді жою мүмкін емес + Бірден буынмен енгізу + Tap-to-click мүмкіндігін қосу +@@ -3574,7 +3574,7 @@ + Топты тарату + Реттелетін атау серверлері + қолданбасы үшін шектелген уақыт: +-Дауыстап оқылатын мазмұнды бөлектеп, "Іздеу + S" пернелерін басыңыз. Іздеу пернесін басып тұрыңыз немесе күй науасының жанындағы "Select-to-Speak" белгішесін түртіп, таңдау жасаңыз. ++Дауыстап оқылатын мазмұнды ерекшелеп, "Іздеу + S" пернелерін басыңыз. Іздеу пернесін басып тұрыңыз немесе күй науасының жанындағы "Select-to-Speak" белгішесін түртіп, таңдау жасаңыз. + Естеліктеріңізді осы жерден қараңыз + Ескертпелерде таңбаға дейін болуы мүмкін. + қалтасындағы файлдарды өңдей алады. +@@ -3859,7 +3859,7 @@ + Таңдалды, /-картадағы қосымша мазмұн + Билеттер + Суреттерді көрсетуге рұқсаты жоқтар +-Бөлектемеу ++Ерекшелемеу + Қолданбаларды жаңарту әдісі туралы ақпарат алу + {NUM_TABS,plural, =1{Сайттың дыбысын қосу}other{Сайттардың дыбысын қосу}} + Assistant қолданбасына "Ok Google" деу арқылы кіру +@@ -3948,7 +3948,7 @@ + Құпия сөз жаңартылды + Бейнені басқаша сақ&тау… + Бәрібір инкогнито режимінен шығасыз ба? +-Талап етілетін виртуалды машина жоқ. Жалғастыру үшін "" виртуалды машинасын орнатып көріңіз. ++Талап етілетін виртуалдық машина жоқ. Жалғастыру үшін "" виртуалдық машинасын орнатып көріңіз. + Бұл бет аутентификацияланбаған дереккөздерден сценарийлерді жүктеуге әрекет етуде. + Басқа пернетақталар + Қосымша қауіпсіздік үшін Google Құпия сөз менеджеріне сақтамас бұрын құрылғыдағы құпия сөздерді шифрлауға болады. +@@ -4084,7 +4084,7 @@ + Қауіпті веб-сайттардан, жүктеп алынған файлдардан және кеңейтімдерден жылдам әрі белсенді қорғау. Құпия сөздің қолды болғанын хабарлайды. Браузерді пайдалану деректерінің Google-ға жіберілуін талап етеді. + Принтер ақпаратын өзгерту + Құпия сөз дұрыс емес +-Сайттар виртуалды шындық құрылғыларын және деректерді пайдалануға рұқсат сұрай алады. ++Сайттар виртуалдық шындық құрылғыларын және деректерді пайдалануға рұқсат сұрай алады. + {NUM_TABS,plural, =1{Сайттың дыбысын өшіру}other{Сайттардың дыбысын өшіру}} + Қауіпсіздік тексерісі жүргізілді. Құжатыңыз басып шығарылады. + / +@@ -4103,7 +4103,7 @@ + Powerwash растау + Әкімшіңіз қолжетімді енгізу әдістерінің санын шектеді. + Реттелуде +-{NUM_VMS,plural, =0{"" виртуалды машиналары табылмады.}=1{1 "" виртуалды машинасы табылды: .}other{{NUM_VMS} "" виртуалды машинасы табылды: .}} ++{NUM_VMS,plural, =0{"" виртуалдық машиналары табылмады.}=1{1 "" виртуалдық машинасы табылды: .}other{{NUM_VMS} "" виртуалдық машинасы табылды: .}} + Интернет байланысы жоқ. + Қосулы + Мазаламау режимін қосу +@@ -4131,7 +4131,7 @@ + Электрондық пошта сертификаты + Кеңейтім қосу + Көшірмені өшіру +-Виртуалды машиналар тексерілмеді. ++Виртуалдық машиналар тексерілмеді. + Қолданбалар жүктеп алынуда + QR кодын жасау мүмкін емес. + Қозғалыс датчиктерін пайдалануға рұқсаты жоқтар +@@ -4305,7 +4305,7 @@ + "" сертификатын жою керек пе? + Сертификатты импорттау қатесі + {COUNT,plural, =1{Ұрланған құпия сөз өзгертілді. Тағы # құпия сөзіңіз ұрланған. Chrome осы құпия сөзді қазір тексеруге кеңес береді.}other{Ұрланған құпия сөз өзгертілді. Тағы # құпия сөзіңіз ұрланған. Chrome осы құпия сөздерді қазір тексеруге кеңес береді.}} +-Мәтін курсорын бөлектеу ++Мәтін курсорын ерекшелеу + жарамды ChromeOS құрылғысын пайдаланып жатқаныңызды тексергісі келеді. + аутентификация токенін сақтау + Ағымдағы сәтте ашық қойындылар бойынша іздеу үшін Chrome пайдаланушы интерфейсінің жоғарғы бөлігіндегі қалқымалы анықтаманы қосады. +@@ -4628,7 +4628,7 @@ + Синхрондауды жалғастыру үшін аккаунтқа қайта кіріңіз + Кеңейтімнің ескі нұсқасын орнатуға әрекет жасалды. + Басқа желіні таңдауыңызға да болады. +-Виртуалды машина атауы ++Виртуалдық машина атауы + Ғаламдық + үшін қажетті әрекеттер: + Фотосурет не бейне жойылсын ба? +@@ -4889,7 +4889,7 @@ + Сайттар төлем өңдегіштерін орната алады. + Қауіпсіздік кілтіңіз өшірілді. + құрылғысына қатысты кеңестерді, ұсыныстарды және жаңалықтарды алыңыз және пікірлер қалдырыңыз. +-Linux виртуалды машинасы: ++Linux виртуалдық машинасы: + Мақсатты файл соңғы жүктеуден кейін қысқартылды немесе жойылды. + Бүйірлік панельде іздеу бетін жабыңыз. Бүйірлік панельде іздеу беті ашық. + Параметрлер +@@ -5021,7 +5021,7 @@ + Сертификатқа қол қою сұрауы дайындалуда (сервер жауабы күтілуде) + "Қауіпсіз шолу" функциясын басқару + Қауіпсіздік бойынша жаңартылған нұсқа бар +-Виртуалды карта қосыңыз. ++Виртуалдық карта қосыңыз. + Қалпына келтіру + Таңбаша жасау мүмкін емес. + Перне анықталмады. үшін кез келген пернені басыңыз. +@@ -5861,7 +5861,7 @@ + Fast Pair функциясын қосу + Бағыттауға тыйым салынған + Ата-анаңыз әлі мақұлдаған жоқ +-Осылай бөлектеу үшін мәтінді таңдап, тінтуірдің оң жақ түймесін басыңыз. ++Осылай ерекшелеу үшін мәтінді таңдап, тінтуірдің оң жақ түймесін басыңыз. + себеттеріңіз + Тым кішкентай + &Іздеу жүйелерін басқару... +@@ -5879,8 +5879,8 @@ + Ойнату + қашықтан қосылды + Адам қосу… +-Шыққанда не жылжығанда, курсорды бөлектеу +-Автосканерлеу функциясы экрандағы элементтер арасында автоматты түрде жылжуға мүмкіндік береді. Элемент бөлектелген кезде, оны іске қосу үшін "Таңдау" пернесін басыңыз. ++Шыққанда не жылжығанда, курсорды ерекшелеу ++Автосканерлеу функциясы экрандағы элементтер арасында автоматты түрде жылжуға мүмкіндік береді. Элемент ерекшеленген кезде, оны іске қосу үшін "Таңдау" пернесін басыңыз. + Панда + Бір нәрсе дұрыс емес. + PIN коды бірнеше рет қате енгізілгендіктен, қауіпсіздік кілті құлыпталды. Қауіпсіздік кілтін бастапқы күйге қайтаруыңыз қажет. +@@ -5892,7 +5892,7 @@ + Жалпы параметрлер + Сенсорлық экранды калибрлеу + () +-"" виртуалды машинасы бар. ++"" виртуалдық машинасы бар. + хостынан клиент сертификатын импорттау үшін таңбалауышына кіріңіз. + жүйесінде RLZ бақылауын қосу. + Жалғастыру үшін қауіпсіздік кілтін салып, іске қосу түймесін түртіңіз. +@@ -5958,7 +5958,7 @@ + Жаңарту құралы ұйқы режимінде + Басқа қойындыларды жабу + Crostini қолданбалары мен файлдарының сақтық көшірмесін жасау және оларды қалпына келтіру +-Виртуалды шындық құрылғыларын немесе деректерді пайдалануға рұқсаты жоқтар ++Виртуалдық шындық құрылғыларын немесе деректерді пайдалануға рұқсаты жоқтар + Сенсорлық экран дәлдігін орнату және реттеу + Іске қосылса, барлық хабарландыру үнсіз болады. + Powerwash функциясын пайдаланбас бұрын, eSIM профильдерін өшіріңіз +@@ -6078,7 +6078,7 @@ + Debian 10 (Buster) нұсқасы қолжетімді + Егер Google әдепкі іздеу жүйесі болса, сізге тиімді, контекске сай ұсыныстар беріледі. + Офлайн демо режимі +-Linux виртуалды құрылғысын өшіру ++Linux виртуалдық құрылғысын өшіру + Іздеу жүйелері + Басқарылатын қонақ сеанстарын іске қосу және олардан шығу + Google Drive +@@ -6130,7 +6130,7 @@ + камераңызды пайдалануда. + Дереккөзді көру + Орнату сәтсіз аяқталды. +-Бөлектемеу ++Ерекшелемеу + Қайтадан "Ok Google" деп айтыңыз + Жаңа бет қосу + Терезе орнатылғаннан кейін режимді орнату мүмкін емес. +@@ -6355,7 +6355,7 @@ + Құрылғыны киоск режимінде немесе цифрлық тақтада тіркеу аяқталды + Бұл кіру қызметі доменінде орналасқан + Қолдау көрсетілетін сілтемелер әрдайым қолданбасында ашылсын ба? +-Виртуалды құрылғы орнатылмады. Әрекетті қайталаңыз немесе әкімшіге хабарласыңыз. Қате коды: . ++Виртуалдық құрылғы орнатылмады. Әрекетті қайталаңыз немесе әкімшіге хабарласыңыз. Қате коды: . + Саусақ ізінің басқа бөліктерін енгізу үшін саусағыңызды көтеріп тұрыңыз. + Бұл параметрді құрылғы иесі басқарады. + Nearby Share дерек трафигі +@@ -6451,7 +6451,7 @@ + Құрылғыдағы негізгі геодерек параметрін өшіру арқылы орналасқан жердің анықталуын өшіруге болады. Сонымен қатар Wi‑Fi мен мобильдік желілердің және сенсорлардың орынды анықтау үшін қолданылуын геодерек параметрлерінен өшіре аласыз. + қойындылар бекітілген қойынды еніне дейін кішірейеді + USB құрылғыларын басқару +-Тінтуір курсорын қозғалыс барысында бөлектеу ++Тінтуір курсорын қозғалыс барысында ерекшелеу + Осы сайтқа кіргеніңіз туралы жазба қауіпсіздік кілтінде сақталуы мүмкін. + Датчиктерді пайдалануға тыйым салуды тоқтатпау + Код арқылы қосылу +@@ -6777,7 +6777,7 @@ + Басқарылатын принтер бар. + Сенсорлық экранды калибрлеу + Сайт Bluetooth функциясын пайдалана алады +-Сайттар әдетте виртуалды шындық немесе фитнес-трекер сияқты функциялар үшін құрылғының қозғалыс датчиктерін пайдаланады. ++Сайттар әдетте виртуалдық шындық немесе фитнес-трекер сияқты функциялар үшін құрылғының қозғалыс датчиктерін пайдаланады. + Жалғастыру үшін "Жарайды" түймесін түртіп, электрондық пошта мекенжайыңыздың жаңа профилін жасау үшін "Адамды қосу" түймесін түртіңіз. + Әкімшіңіз орнатқан + Адаптивті портал арқылы кіру бетіне өту +@@ -6792,7 +6792,7 @@ + Қауіпсіздік кілтін бастапқы күйіне қайтару мүмкін емес. Қате: . + "Ok Google" + Crostini жүйесін жаңарту +-Бөлектеу құралы ++Ерекшелеу құралы + "" телефонында: + Бұл құжат қауіпсіздік тексерісін жүргізу үшін тым үлкен. 50 МБ-қа дейінгі құжаттарды басып шығаруға болады. + Кейбір элемент бөгелді +@@ -7016,7 +7016,7 @@ + Файлда осы сертификат беруші орталықтарды анықтайтын сертификаттарыңыз бар + Утилита: + Linux порттарын желідегі басқа құрылғыларға қолжетімді етіңіз. +-Ерекшеленген нысанды жақсырақ көрінетіндей бөлектеу ++Ерекшеленген нысанды жақсырақ көрінетіндей ерекшелеу + Кешіріңіз, сыртқы жад құрылғыңыздағы кемінде бір бөлімді орнату мүмкін емес. + Профиліңіздің атын өзгертіңіз. + Инкогнито режимінде жүктелген +@@ -7729,7 +7729,7 @@ + Сайттардың сізге хабарландырулар көрсету туралы сұрауына тыйым салынады. Сайт хабарландырулар жіберуге рұқсат сұраса, мекенжай жолағында тыйым салынғаны туралы индикатор пайда болады. + Бұған дейін сайтында ешқандай кеңейтімге рұқсат бермеуді таңдағансыз. + Соңғы іс-әрекеттер +-Бұдан былай виртуалды картаны Google Pay қызметінде пайдалана алмайтын боласыз. Виртуалды карта туралы толығырақ ++Бұдан былай виртуалдық картаны Google Pay қызметінде пайдалана алмайтын боласыз. Виртуалдық карта туралы толығырақ + Қайта жүктелуде… + Кеңейтімдер дайындалуда… + Сайттардың қалқымалы терезелерді жіберуіне немесе бағытты ауыстыру тәсілдерін пайдалануына рұқсат бермеу +@@ -7991,7 +7991,7 @@ + Мазмұн параметрлері + Жарамсыз киоск қолданбасының сыртқы жаңарту манифест файлы табылды. Киоск қолданбасын жаңарту сәтсіз аяқталды. USB картасын алып тастаңыз. + Қолданбадан ашу +-Cайтқа виртуалды шындық құрылғыларыңызды немесе деректерді пайдалануға рұқсат беру алдында сұрау (ұсынылады) ++Cайтқа виртуалдық шындық құрылғыларыңызды немесе деректерді пайдалануға рұқсат беру алдында сұрау (ұсынылады) + Қосылмаған + Келесі құрылғыға трансляциялау: + Linux жүйесін жаңарту +@@ -8139,7 +8139,7 @@ + Ортақ файлды орнату кезінде қате шықты. Ортақ қалтаның URL сілтемесін тексеріп, қайта орнатып көріңіз. + Белгілі бір сайтта жылдам іздеу немесе басқа іздеу жүйесіне өту үшін мекенжай жолағында таңбашалар пайдалана аласыз. + жүктеу +-Бұл процесс бірнеше минутқа созылуы мүмкін. Виртуалды құрылғы жүктелуде. ++Бұл процесс бірнеше минутқа созылуы мүмкін. Виртуалдық құрылғы жүктелуде. + Сілтемені жаңа &қойындыда ашу + Аккаунтыңызда Күшейтілген Safe Browsing функциясын өшірдіңіз. + Ұйымыңыз аккаунт үшін Google Play Store қызметін қоспаған. Қосымша ақпарат алу үшін әкімшіге хабарласыңыз. +diff --git a/chrome/app/resources/generated_resources_no.xtb b/chrome/app/resources/generated_resources_no.xtb +index 5315653a9912..c1b465958fc2 100644 +--- a/chrome/app/resources/generated_resources_no.xtb ++++ b/chrome/app/resources/generated_resources_no.xtb +@@ -1505,7 +1505,7 @@ Du kan administrere innstillingene for denne kontoen ved å installere Family Li + (gjeldende) + IP + Kan ikke koble til proxy-tjeneren – logg på på nytt +-Wi-Fi-synkronisering ++Wifi-synkronisering + Standardskrift + Du har nådd tidsgrensen som forelderen din har angitt for . + Aktiver +@@ -3023,7 +3023,7 @@ og Ctrl + Alt + lysstyrke ned for å zoome ut. + -tilkobling + Tar notater med + Denne informasjonen gir oss bedre forståelse av Assistent-problemet. Den lagres i opptil 90 dager, og bare relevante tekniske team og tilbakemeldingsteam får tilgang. +-Slå på Chrome-synkronisering for å bruke Wi-Fi-synkronisering ++Slå på Chrome-synkronisering for å bruke wifi-synkronisering + Tilordne bryter for «Neste» + For å slette data, lukk alle inkognitovinduer + lese og endre innstillingene for tilgjengelighet +@@ -3150,7 +3150,7 @@ og Ctrl + Alt + lysstyrke ned for å zoome ut. + Kopiér link + Velg tidssone + Importert +-Synkroniser , slik at preferansene dine er klare på alle enheter når du logger på med Google-kontoen din. Preferanser betyr blant annet apper, innstillinger, Wi-Fi-passord, språk, bakgrunnsbilde og hurtigtaster. ++Synkroniser , slik at preferansene dine er klare på alle enheter når du logger på med Google-kontoen din. Preferanser betyr blant annet apper, innstillinger, wifi-passord, språk, bakgrunnsbilde og hurtigtaster. + Dessverre er datamaskinen konfigurert med en feilformatert maskinvare-ID. Dette forhindrer ChromeOS Flex fra å ta i bruk de siste sikkerhetsoppdateringene, og datamaskinen kan være sårbar for skadelige angrep. + Lås opp telefonen, og hold den nærmere for å låse opp -enheten. + &Zoom +@@ -4435,7 +4435,7 @@ og Ctrl + Alt + lysstyrke ned for å zoome ut. + Navn + Denne enheten er merket for administrering av et annet domene. Fjern tilgangen og ressursene fra det domenet før du konfigurerer demomodus. + Funksjoner som krever varsler, kommer ikke til å virke +-Trykk på varselet på -enheten din for å konfigurere en mobil Wi-Fi-sone denne enheten kan bruke. ++Trykk på varselet på -enheten din for å konfigurere en mobil wifi-sone denne enheten kan bruke. + &Slett + Du har ingen sertifikater i denne kategorien + «» vil koble til +@@ -4717,7 +4717,7 @@ og Ctrl + Alt + lysstyrke ned for å zoome ut. + Andre søkemotorer + Vi har sendt et varsel til telefonen din for å bekrefte at det er deg. + {NUM_EXTENSIONS,plural, =1{Denne utvidelsen er blokkert}other{Disse utvidelsene er blokkert}} +-Wi-Fi-synkronisering – finn ut mer ++Wifi-synkronisering – finn ut mer + Trykk på de følgende tastene for å justere eller flytte beskjæringsområdet + Appen ser ut til å være ugyldig. + Bytt til kameramodus +@@ -5083,7 +5083,7 @@ og Ctrl + Alt + lysstyrke ned for å zoome ut. + &Bruk grunnleggende stavekontroll + Kontrollér passordene + {NUM_EXTENSIONS,plural, =1{Du har slått på igjen én potensielt skadelig utvidelse}other{Du har slått på igjen {NUM_EXTENSIONS} potensielt skadelige utvidelser}} +-Dette alternativet gjelder for Chromebook-enheter med dataabonnement- eller mobilnettverksdongler, eller ved bruk av delt internett fra en flyttbar Wi-Fi-sone ++Dette alternativet gjelder for Chromebook-enheter med dataabonnement- eller mobilnettverksdongler, eller ved bruk av delt internett fra en flyttbar wifi-sone + Overset&t til + For å sette sider som bokmerker, klikk på stjernen i adressefeltet + For å tillate en utvidelse, endre standardinnstillingen nedenfor. +@@ -8426,6 +8426,6 @@ Jeg tror ikke det er nødvendig å blokkere dette nettstedet. + YouTube + Etablerer sikker tilkobling ... + Se minner av favorittpersonene dine med mer +-Slå på Chrome-synkronisering for å bruke Wi-Fi-synkronisering. Finn ut mer ++Slå på Chrome-synkronisering for å bruke wifi-synkronisering. Finn ut mer + I&nspiser + +\ No newline at end of file +diff --git a/chrome/app/resources/google_chrome_strings_fa.xtb b/chrome/app/resources/google_chrome_strings_fa.xtb +index 50bc1c9057b9..ae485f912045 100644 +--- a/chrome/app/resources/google_chrome_strings_fa.xtb ++++ b/chrome/app/resources/google_chrome_strings_fa.xtb +@@ -32,7 +32,7 @@ + ‏ خطرناک است، بنابراین Chrome آن را مسدود کرده ست. + ‏برای بررسی اینکه از گذرواژه‌هایتان دربرابر نقض داده یا دیگر مشکلات امنیتی محافظت می‌شود، به سیستم Chrome وارد شوید. + ‏برای ایمن‌تر کردن Chrome، افزونه زیر را که در فهرست نشده است و ممکن است بدون اطلاع شما اضافه شده باشد، غیرفعال کردیم. +-‏چگونه می‌توانید داده‌هایتان را مدیریت کنید: برای محافظت از حریم‌خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشد به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. یا می‌توانید علایقی را که نمی‌خواهید Chrome مدنظر قرار دهد حذف کنید. ++‏چگونه می‌توانید داده‌هایتان را مدیریت کنید: برای محافظت از حریم خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشد به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. یا می‌توانید علایقی را که نمی‌خواهید Chrome مدنظر قرار دهد حذف کنید. + ‏دریافت کمک برای Chrome + ‏درباره ChromeOS Flex + ‏باز کردن پیوند در پنجره &ناشناس Chrome +@@ -58,7 +58,7 @@ + ‏این کار مورد را از این دستگاه حذف می‌کند. برای بازیابی داده‌هایتان در فرصتی دیگر، با وارد سیستم Chrome شوید. + ‏راه‌اندازی مجدد برای به‌روزرسانی Chrome + ‏با گزارش تنظیمات کنونی، به بهتر شدن Chrome کمک کنید +-‏برای محافظت از حریم‌خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشند به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. یا می‌توانید علایقی را که نمی‌خواهید Chrome مدنظر قرار دهد حذف کنید. ++‏برای محافظت از حریم خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشند به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. یا می‌توانید علایقی را که نمی‌خواهید Chrome مدنظر قرار دهد حذف کنید. + ‏بازراه‌اندازی ChromeOS + ‏لطفاً اکنون Chrome را بازراه‌اندازی کنید + ‏برای دسترسی به چیزهایتان در مرورگر Chrome در همه دستگاه‌هایتان، به سیستم وارد شوید، سپس همگام‌سازی را روشن کنید +@@ -183,7 +183,7 @@ + ‏این فایل ممکن است خطرناک باشد، بنابراین Chrome آن را مسدود کرده است. + ‏از همان غلط‌یاب املا استفاده می‌کند که در جستجوی Google استفاده می‌شود. نوشتاری که در مرورگر تایپ کرده‌اید برای Google ارسال می‌شود. هروقت بخواهید می‌توانید این رفتار را در تنظیمات تغییر دهید. + ‏ChromeOS Flex نتوانست داده‌هایتان را همگام‌سازی کند زیرا همگام‌سازی برای دامنه شما دردسترس نیست. +-‏مرور کنترل‌های اصلی امنیت و حریم‌خصوصی در Chrome ++‏مرور کنترل‌های اصلی امنیت و حریم خصوصی در Chrome + ‏اجازه به Google Chrome برای اجرا در پس‌زمینه + ‏باز کردن پیوند در &برگه جدید Chrome + ‏تنظیم Google Chrome به عنوان مرورگر پیش‌فرضتان +@@ -208,7 +208,7 @@ + ‏هم‌رسانی برگه Chrome + ‏سایت‌ها می‌توانند بااستفاده از Chrome اطلاعاتی درباره علایقتان ذخیره کنند. برای مثال، اگر برای خرید کفش مخصوص ماراتون از سایتی بازدید کنید، ممکن است آن سایت علاقه شما را به‌صورت دونده ماراتون مشخص کند. بعداً، اگر برای ثبت‌نام در مسابقه‌ای به سایتی دیگر مراجعه کردید، آن سایت می‌تواند براساس علایقتان آگهی‌ای برای کفش مخصوص دویدن به شما نشان دهد. + ‏فایل اولویت‌های شما خراب یا نامعتبر است. Google Chrome نمی‌تواند تنظیمات شما را بازیابی کند. +-‏اگر نسخه آزمایشی روشن باشد و Chrome به‌طور تصادفی نسخه آزمایشی را برایتان فعال کرده باشد، سابقه مرورتان بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم‌خصوصی شما، Chrome علایقتان را هر ماه به‌طور چرخشی حذف می‌کند. ++‏اگر نسخه آزمایشی روشن باشد و Chrome به‌طور تصادفی نسخه آزمایشی را برایتان فعال کرده باشد، سابقه مرورتان بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم خصوصی شما، Chrome علایقتان را هر ماه به‌طور چرخشی حذف می‌کند. + ‏Google Chrome می‌خواهد گذرواژه‌ها را نمایش دهد. + ‏Google Chrome (ورودی mDNS) + ‏ ممکن است خطرناک باشد، بنابراین Chrome آن را مسدود کرده است. +@@ -216,7 +216,7 @@ + ‏Google Chrome ‫را سفارشی و کنترل کنید. چیزی نیاز به رسیدگی دارد، برای اطلاعات بیشتر کلیک کنید. + Google LLC + {SECONDS,plural, =1{‏Google Chrome بعد از ۱ ثانیه بازراه‌اندازی می‌شود}one{‏Google Chrome بعد از # ثانیه بازراه‌اندازی می‌شود}other{‏Google Chrome بعد از # ثانیه بازراه‌اندازی می‌شود}} +-‏اگر Chrome به‌طور تصادفی نسخه آزمایشی را برایتان فعال کرده باشد، سابقه مرورتان بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم‌خصوصی شما، Chrome علایقتان را هر ماه به‌طور چرخشی حذف می‌کند. ممکن است علایق بازآوری شود، مگر اینکه آن‌ها را بردارید. ++‏اگر Chrome به‌طور تصادفی نسخه آزمایشی را برایتان فعال کرده باشد، سابقه مرورتان بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم خصوصی شما، Chrome علایقتان را هر ماه به‌طور چرخشی حذف می‌کند. ممکن است علایق بازآوری شود، مگر اینکه آن‌ها را بردارید. + ‏اگر سایتی تلاش کند گذرواژه شما را به‌سرقت ببرد، یا وقتی فایل مخربی بارگیری می‌کنید، Chrome ممکن است نشانی‌های وب را نیز به‌همراه بخش‌های کوچکی از محتوای صفحه، به «مرور ایمن» ارسال کند + ‏درحال‌حاضر یک نمایه Chrome با این حساب در این دستگاه وجود دارد + ‏Chrome این فایل را مسدود کرد زیرا برای بررسی امنیتی بسیار بزرگ است. با فایل‌هایی که حداکثر ۵۰ مگابایت باشد دوباره امتحان کنید +@@ -351,7 +351,7 @@ + ‏تقریباً به‌روزرسانی شده است! برای تکمیل به‌روزرسانی، Chrome را راه‌اندازی مجدد کنید. + ‏Google Chrome نمی‌تواند مرورگر پیش‌فرض را تعیین یا تنظیم کند + ‏نسخه Chrome قدیمی است +-‏برای محافظت از حریم‌خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشند به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. و اگر Chrome به‌اشتباه علاقه‌ای را اضافه کند یا شما نخواهید آگهی‌های مشخصی را ببینید، می‌توانید آن علاقه را بردارید. ++‏برای محافظت از حریم خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشند به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. و اگر Chrome به‌اشتباه علاقه‌ای را اضافه کند یا شما نخواهید آگهی‌های مشخصی را ببینید، می‌توانید آن علاقه را بردارید. + ‏Google Chrome می‌خواهد گذرواژه‌ها را ویرایش کند. برای اینکه اجازه دهید این کار انجام شود، گذرواژه Windows خود را تایپ کنید. + ‏این برنامه همچنین صفحه‌ای را که هنگام راه‌اندازی Chrome یا کلیک کردن روی دکمه صفحه اصلی نشان داده می‌شود، کنترل می‌کند. + شما حقوق لازم برای نصب در سطح سیستم را ندارید. دوباره به‌عنوان سرپرست نصب‌کننده را اجرا کنید. +@@ -359,7 +359,7 @@ + ‏برای ارسال شماره از به تلفن Android خود، در هر دو دستگاه به سیستم Chrome وارد شوید. + ‏«مرور ایمن پیشرفته» را در حسابتان روشن کرده‌اید. اکنون آن را برای Chrome دریافت کنید. + با این کار، نمایه کاری را به این مرورگر اضافه می‌کنید و فقط کنترل نمایه کاری را دراختیار سرپرست قرار می‌دهید. +-‏سابقه مرور شما بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم‌خصوصی شما، Chrome علایقتان را هر ماه به‌طور خودکار و چرخشی حذف می‌کند. ممکن است علایق بازآوری شود، مگر اینکه آن‌ها را بردارید. ++‏سابقه مرور شما بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم خصوصی شما، Chrome علایقتان را هر ماه به‌طور خودکار و چرخشی حذف می‌کند. ممکن است علایق بازآوری شود، مگر اینکه آن‌ها را بردارید. + {0,plural, =0{‏به‌روزرسانی Chrome دردسترس است}=1{‏به‌روزرسانی Chrome دردسترس است}one{‏به‌روزرسانی Chrome از # روز پیش دردسترس است}other{‏به‌روزرسانی Chrome از # روز پیش دردسترس است}} + ‏سیستم ChromeOS Flex + ‏Google Chrome به Windows 7 یا بالاتر نیاز دارد. +diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_fa.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_fa.xtb +index 38e6ff918c4b..4ae0e4e09b3f 100644 +--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_fa.xtb ++++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_fa.xtb +@@ -314,7 +314,7 @@ + پیمایش به‌عقب + فاقد بازگویی تایپ + نت +-این کار با خاموش کردن صفحه‌نمایش و پنهان کردن آن از دید دیگران، حریم‌خصوصی را بهبود می‌بخشد. همیشه می‌توانید با فشار دادن کلید «جستجو + افزایش روشنایی» صفحه‌نمایش را دوباره روشن کنید. ++این کار با خاموش کردن صفحه‌نمایش و پنهان کردن آن از دید دیگران، حریم خصوصی را بهبود می‌بخشد. همیشه می‌توانید با فشار دادن کلید «جستجو + افزایش روشنایی» صفحه‌نمایش را دوباره روشن کنید. + اعلام اعلان‌های بارگیری + grp + نشانگر مکانی بعدی +diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_kk.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_kk.xtb +index 4cbab644fad3..c49dc28de22f 100644 +--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_kk.xtb ++++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_kk.xtb +@@ -150,7 +150,7 @@ + Орташа күлгін + Алдыңғы өзгертілетін мəтін өрісі жоқ. + Келесі нысан +-Айтылған әр сөзді бөлектеу ++Айтылған әр сөзді ерекшелеу + ChromeVox + ChromeVox мәзірлерінде Брайль пәрмендерін көрсету + {COUNT,plural, =1{сол жақ тік жақша}other{# сол жақ тік жақша}} +@@ -984,11 +984,11 @@ + Навигацияның басқару элементтерін іске қосу + Пернетақта + Кейбір тыныс белгілері +-Виртуалды Браиль дисплейі ++Виртуалдық Браиль дисплейі + Қоңыр + sldr + Келесі 2-деңгей тақырыбы жоқ. +-Бөлектеу ++Ерекшелеу + Таңдалмаған + Уақытты бақылау + таңдауға қосылды +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb +index 3b4e03ca8817..a666d06b8b35 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb +@@ -28,7 +28,7 @@ + ترجمه این سایت‌ها پیشنهاد نشود + حذف داده‌های موجود. + ‏VR را وارد کنید +-مهم‌ترین کنترل‌های امنیتی و حریم‌خصوصی در یک‌جا گردآوری شده‌اند ++مهم‌ترین کنترل‌های امنیتی و حریم خصوصی در یک‌جا گردآوری شده‌اند + ماه انقضا + ‏ در Chrome باز می‌شود. درصورت ادامه دادن، با شرایط خدمات Google و شرایط خدمات تکمیلی Google Chrome و ChromeOS موافقت می‌کنید. + صفحه به‌صورت آفلاین دردسترس نیست +@@ -121,8 +121,8 @@ + + براساس تعاملتان با سایت‌ها، مثلاً ورود به سیستم مداوم در حسابی خاص، این سایت‌ها می‌توانند کد اطمینان به مرورگرتان صادر کنند. بعداً، اگر سایت‌های دیگری که از آن‌ها بازدید می‌کنید کد اطمینان معتبری را جستجو و پیدا کنند، احتمال اینکه با شما مثل یک انسان (و نه ربات) برخورد کنند بیشتر است. + +-کدهای اطمینان حریم‌خصوصی را در وب افزایش می‌دهد و نمی‌توان از آن‌ها برای پی بردن به هویت شما استفاده کرد. +-‏چگونه می‌توانید داده‌هایتان را مدیریت کنید: برای محافظت از حریم‌خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشد به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. یا می‌توانید علایقی را که نمی‌خواهید Chrome مدنظر قرار دهد حذف کنید. ++کدهای اطمینان حریم خصوصی را در وب افزایش می‌دهد و نمی‌توان از آن‌ها برای پی بردن به هویت شما استفاده کرد. ++‏چگونه می‌توانید داده‌هایتان را مدیریت کنید: برای محافظت از حریم خصوصی شما، علایقی را که قدیمی‌تر از ۴ هفته باشد به‌طور خودکار حذف می‌کنیم. وقتی به مرور کردن ادامه می‌دهید، ممکن است علاقه‌ای مجدداً به فهرست اضافه شود. یا می‌توانید علایقی را که نمی‌خواهید Chrome مدنظر قرار دهد حذف کنید. + {NUM_SELECTED,plural, =1{حذف ۱ مورد انتخاب‌شده}one{حذف # مورد انتخاب‌شده}other{حذف # مورد انتخاب‌شده}} + ‏محتوای جدید را در صفحه اصلی Chrome کاوش کنید + مرور ایمن +@@ -140,7 +140,7 @@ + ساعت قبل + برای ویرایش گذرواژه‌تان، قفل صفحه را باز کنید + ‏وقتی Chrome صفحاتی را که فکر می‌کند ممکن است بازدید کنید پیش‌بارگیری می‌کند، می‌توانید سریع‌تر مرور و جستجو کنید. +-درباره «جعبه ایمنی حریم‌خصوصی» ++درباره «جعبه ایمنی حریم خصوصی» + کاوش + همگام‌سازی نشانک‌ها + بازکردن برگه‌ها +@@ -275,7 +275,7 @@ + سرپرستتان همگام‌سازی را غیرفعال کرده است + ‏وضعیت ورود به سیستم ، داده‌های محصول مرور، و داده‌های سایت را در Chrome خواهید دید + زبان‌های محتوا +-‏برای تنظیمات بیشتر مرتبط با حریم‌خصوصی، امنیت و جمع‌آوری داده‌ها، همگام‌سازی و سرویس‌های Google را ببینید ++‏برای تنظیمات بیشتر مرتبط با حریم خصوصی، امنیت و جمع‌آوری داده‌ها، همگام‌سازی و سرویس‌های Google را ببینید + اسکن + ‏نشانی وب صفحه‌هایی را که بازدید می‌کنید برای Google ارسال می‌کند + با لحاظ کردن بخش بیشتری از نوشتار صفحه، ممکن است نتایج بهتری دریافت کنید +@@ -304,7 +304,7 @@ + اتصال ممکن است سرعت بارگیری شما را کاهش دهد + افزودن زبان + مرورگرتان توسط مدیریت می‌شود +-شرح «راهنمای حریم‌خصوصی» بسته شده است ++شرح «راهنمای حریم خصوصی» بسته شده است + فایل دوباره بارگیری شود؟ + {FILE_COUNT,plural, =1{# فایل صوتی}one{# فایل صوتی}other{# فایل صوتی}} + پیش‌بارگیری استاندارد +@@ -322,7 +322,7 @@ + روشن شدن زمینه تیره وقتی زمینه تیره دستگاه یا «بهینه‌سازی باتری» روشن است + هم‌اکنون + با وارد سیستم شد. +-‏برای تنظیمات بیشتر مرتبط با حریم‌خصوصی، امنیت، و جمع‌آوری داده، سرویس‌های Google را ببینید. ++‏برای تنظیمات بیشتر مرتبط با حریم خصوصی، امنیت، و جمع‌آوری داده، سرویس‌های Google را ببینید. + ثانیه باقی‌مانده است + انجام نشد + ۱ ثانیه باقی‌مانده است +@@ -334,7 +334,7 @@ + برای اینکه نشانک‌هایتان را در همه دستگاه‌ها داشته باشید، به سیستم وارد شوید و همگام‌سازی را روشن کنید + منوی کارت فید تا نیمه باز شد + محتوای بریده‌دان پنهان شد +-شرح «راهنمای حریم‌خصوصی» به‌صورت نیمه باز شده است ++شرح «راهنمای حریم خصوصی» به‌صورت نیمه باز شده است + دنبال کردن لغو شد + {TAB_COUNT,plural, =1{ برگه ناشناس بسته خواهد شد}one{ برگه ناشناس بسته خواهد شد}other{ برگه ناشناس بسته خواهد شد}} + {NUM_DAYS,plural, =1{آخرین بررسی: ۱ روز قبل}one{آخرین بررسی: # روز قبل}other{آخرین بررسی: # روز قبل}} +@@ -376,7 +376,7 @@ + ‏وقتی یک سایت Google برای پیش‌بارگیری خصوصی پیوندها در صفحه‌اش درخواست می‌کند، Chrome صفحات را بدون کوکی‌ها ازطریق سرورهای Google رمزگذاری و پیش‌بارگیری می‌کند. با این کار هویتتان از سایت پیش‌بارگیری‌شده پنهان می‌شود. + پیش‌از اینکه رویدادهای خطرناک اتفاق بیفتد درباره آن‌ها به شما هشدار می‌دهد + هیچ داده مصرفی وجود ندارد +-راهنمای حریم‌خصوصی ++راهنمای حریم خصوصی + مطمئن شوید این دستگاه به اینترنت متصل باشد + لحاظ کردن پیوند + گزینه پیش‌بارگیری وجود ندارد +@@ -447,7 +447,7 @@ + اشتراک‌گذاری تصویر + به‌دلیل خطاهای سیستم فایل، بارگیری انجام نشد. + نوشتار خیلی بزرگ است +-دوره‌های آزمایشی «جعبه ایمنی حریم‌خصوصی» ++دوره‌های آزمایشی «جعبه ایمنی حریم خصوصی» + باز کردن مدیر نشانک‌ها + ‏صفحات بیشتری پیش‌بارگیری می‌شوند. اگر درخواست ازطرف سایت‌های دیگر انجام شود، ممکن است صفحات ازطریق سرورهای Google پیش‌بارگیری شوند. + اندازه: +@@ -806,7 +806,7 @@ + توسط سرپرست این دستگاه غیرفعال شده است + برای مشاهده گذرواژه‌تان، قفل صفحه را باز کنید + نشانک، سابقه، گذرواژه و تنظیمات دیگری از دارید. +-‏اگر نسخه آزمایشی روشن باشد و Chrome به‌طور تصادفی نسخه آزمایشی را برایتان فعال کرده باشد، سابقه مرورتان بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم‌خصوصی شما، Chrome علایقتان را هر ماه به‌طور چرخشی حذف می‌کند. ++‏اگر نسخه آزمایشی روشن باشد و Chrome به‌طور تصادفی نسخه آزمایشی را برایتان فعال کرده باشد، سابقه مرورتان بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم خصوصی شما، Chrome علایقتان را هر ماه به‌طور چرخشی حذف می‌کند. + هدایت کردن مسدود شد. + بررسی ایمنی + انتخاب ویژگی حفاظتی «مرور ایمن» +@@ -838,7 +838,7 @@ + رفتن به برگه + برگه‌های اخیر + بزرگ‌تر کردن همه‌چیز در صفحه +-‏اگر Chrome به‌طور تصادفی نسخه آزمایشی را برایتان فعال کرده باشد، سابقه مرورتان بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم‌خصوصی شما، Chrome علایقتان را هر ماه به‌طور چرخشی حذف می‌کند. ممکن است علایق بازآوری شود، مگر اینکه آن‌ها را بردارید. ++‏اگر Chrome به‌طور تصادفی نسخه آزمایشی را برایتان فعال کرده باشد، سابقه مرورتان بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم خصوصی شما، Chrome علایقتان را هر ماه به‌طور چرخشی حذف می‌کند. ممکن است علایق بازآوری شود، مگر اینکه آن‌ها را بردارید. + به برگه‌های استاندارد تغییر یافت + ‏Chrome برای بارگیری فایل‌ها باید به حافظه دسترسی داشته باشد. + خاموش توصیه نمی‌شود +@@ -899,9 +899,9 @@ + دستگاه‌های شما + گذرواژه پیشنهادی + این دوره آزمایشی فقط در برخی مناطق فعال است. +-‏Chrome بااستفاده از جعبه ایمنی حریم‌خصوصی درحال توسعه فناوری‌های جدیدی است که ضمن حفظ وبِ باز، از شما در برابر ردیابی بین‌سایتی محافظت می‌کند. ++‏Chrome بااستفاده از جعبه ایمنی حریم خصوصی درحال توسعه فناوری‌های جدیدی است که ضمن حفظ وبِ باز، از شما در برابر ردیابی بین‌سایتی محافظت می‌کند. + +-دوره آزمایشی «جعبه ایمنی حریم‌خصوصی» هنوز در مرحله توسعه فعال است و در مناطق منتخب دردسترس است. درحال‌حاضر، ممکن است سایت‌ها همچنان که از فناوری‌های کوکی‌های شخص ثالث استفاده می‌کنند، «جعبه ایمنی حریم‌خصوصی» را نیز امتحان کنند. ++دوره آزمایشی «جعبه ایمنی حریم خصوصی» هنوز در مرحله توسعه فعال است و در مناطق منتخب دردسترس است. درحال‌حاضر، ممکن است سایت‌ها همچنان که از فناوری‌های کوکی‌های شخص ثالث استفاده می‌کنند، «جعبه ایمنی حریم خصوصی» را نیز امتحان کنند. + رفتن به برگه بعدی + بستن + خودکار +@@ -909,10 +909,10 @@ + به‌دلیل خطایی ناشناس، بارگیری انجام نشد. + سال + داستان‌ها و فعالیت خود را اینجا کنترل کنید +-مرور تنظیمات حریم‌خصوصی و امنیت ++مرور تنظیمات حریم خصوصی و امنیت + ‏درحال تماس با بانک\u2026 + تعیین چگونگی اتصال به وب‌سایت‌ها ازطریق اتصالی ایمن +-با دوره‌های آزمایشی «جعبه ایمنی حریم‌خصوصی»، سایت‌ها می‌توانند تجربه مرور یکسانی را با مصرف داده‌های شخصی کمتر ارائه دهند. یعنی حریم‌خصوصی شما افزایش و ردیابی بین‌سایتی کاهش پیدا می‌کند. هروقت دوره‌های آزمایشی جدیدی برای آزمایش کردن آماده شد، آن‌ها را اضافه می‌کنیم. ++با دوره‌های آزمایشی «جعبه ایمنی حریم خصوصی»، سایت‌ها می‌توانند تجربه مرور یکسانی را با مصرف داده‌های شخصی کمتر ارائه دهند. یعنی حریم خصوصی شما افزایش و ردیابی بین‌سایتی کاهش پیدا می‌کند. هروقت دوره‌های آزمایشی جدیدی برای آزمایش کردن آماده شد، آن‌ها را اضافه می‌کنیم. + ساعت باقی‌مانده است + ‏اگر موتور جستجوی پیش‌فرضتان هم Google باشد، پیشنهادهای بهتر و مرتبط‌تری درباره موضوع خواهید دید + تنظیم در حال انجام است... +@@ -964,7 +964,7 @@ + + براساس تعاملتان با یک سایت (مثلاً مرتباً وارد شدن به سیستم حسابی خاص)، این سایت می‌تواند کد اطمینان برای مرورگرتان صادر کنند. بعداً، اگر سایت‌های دیگری که از آن‌ها بازدید می‌کنید کد اطمینان معتبری را جستجو و پیدا کند، احتمال اینکه با شما مثل یک انسان (و نه ربات) برخورد کند بیشتر است. + +-کدهای اطمینان حریم‌خصوصی را در وب بهبود می‌بخشد و نمی‌توان از آن‌ها برای پی بردن به هویت شما استفاده کرد. ++کدهای اطمینان حریم خصوصی را در وب بهبود می‌بخشد و نمی‌توان از آن‌ها برای پی بردن به هویت شما استفاده کرد. + پیوند + دوباره آنلاین شدید + در +@@ -1022,7 +1022,7 @@ + ویرایش پوشه + باز کردن قفل «حالت ناشناس» + در بخش زیر تنظیمات بیشتری را کاوش کنید یا همین‌حالا کارتان را به‌پایان برسانید +-‏برای تنظیمات بیشتر مرتبط با حریم‌خصوصی، امنیت، و جمع‌آوری داده، همگام‌سازی و سرویس‌های Google را ببینید. ++‏برای تنظیمات بیشتر مرتبط با حریم خصوصی، امنیت، و جمع‌آوری داده، همگام‌سازی و سرویس‌های Google را ببینید. + ‏برای کمک به بهبود برنامه، Chrome داده‌های استفاده و ازکارافتادگی را به Google ارسال می‌کند. مدیریت + همیشه مسدود شود + برداشتن +@@ -1063,7 +1063,7 @@ + CVC + ، برگه، انتخاب‌شده + توقف پیگیری قیمت +-دوره آزمایشی «جعبه ایمنی حریم‌خصوصی» ++دوره آزمایشی «جعبه ایمنی حریم خصوصی» + درحال بارگیری… + بارگیری هنوز درحال انجام است + برگه بسته شد +@@ -1125,7 +1125,7 @@ + ‏وقتی به سیستم وارد شده باشید، امنیت شما را در Chrome حفظ می‌کند و ممکن است برای بهبود امنیت شما در برنامه‌های دیگر Google استفاده شود. + فهرست پوشه‌های نشانک به‌صورت کامل باز شد + برگه در پس‌زمینه باز شد. +-شرح «راهنمای حریم‌خصوصی» به‌صورت کامل باز شده است ++شرح «راهنمای حریم خصوصی» به‌صورت کامل باز شده است + واکنش جابه‌جا شد + هم‌رسانی محدود میان سایت‌ها + {FILE_COUNT,plural, =1{۱ بارگیری در انتظار}one{# بارگیری در انتظار}other{# بارگیری در انتظار}} +@@ -1310,7 +1310,7 @@ + به چه زبانی مطالعه می‌کنید؟ + محتوا + فایل باقی مانده است +-جعبه ایمنی حریم‌خصوصی ++جعبه ایمنی حریم خصوصی + ۱ روز باقی‌مانده است + دستگاه‌های شما · + ازسرگیری +@@ -1362,7 +1362,7 @@ + رمزگذاری داده‌های همگام‌سازی‌شده با گذرعبارت همگام‌سازی خودتان + مطمئن شوید به اینترنت متصل باشد + نشانی‌ها و سایر موارد +-‏وقتی روشن باشد، سایت‌ها می‌توانند برای ارائه محتوا و سرویس‌هایشان از تکنیک‌های حفظ حریم‌خصوصی نشان داده‌شده در اینجا استفاده کنند. این تکنیک‌ها شامل روش‌های جایگزین برای ردیابی بین‌سایتی می‌شود. ممکن است در گذر زمان، دوره‌های آزمایشی بیشتری اضافه شود. ++‏وقتی روشن باشد، سایت‌ها می‌توانند برای ارائه محتوا و سرویس‌هایشان از تکنیک‌های حفظ حریم خصوصی نشان داده‌شده در اینجا استفاده کنند. این تکنیک‌ها شامل روش‌های جایگزین برای ردیابی بین‌سایتی می‌شود. ممکن است در گذر زمان، دوره‌های آزمایشی بیشتری اضافه شود. + + تبلیغ‌کنندگان و ناشران می‌توانند از FLoC استفاده کنند. + +@@ -1371,7 +1371,7 @@ + + باز کردن صفحه سابقه + آزاد کردن فضا +-شرح «راهنمای حریم‌خصوصی» ++شرح «راهنمای حریم خصوصی» + هنوز… چیزی برای دیدن وجود ندارد + ‏گذرواژه‌های Chrome + نام کاربری +@@ -1466,14 +1466,14 @@ + در پوشه پیش‌فرض بارگیری شود؟ + مدیریت تنظیمات پیش‌دید ویدیو + واکنش اضافه شد +-‏سابقه مرور شما بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم‌خصوصی شما، Chrome علایقتان را هر ماه به‌طور خودکار و چرخشی حذف می‌کند. ممکن است علایق بازآوری شود، مگر اینکه آن‌ها را بردارید. ++‏سابقه مرور شما بر آگهی‌هایی که می‌بینید و علایقتان که در زیر برآورد شده است تأثیر می‌گذارد. برای محافظت از حریم خصوصی شما، Chrome علایقتان را هر ماه به‌طور خودکار و چرخشی حذف می‌کند. ممکن است علایق بازآوری شود، مگر اینکه آن‌ها را بردارید. + باز کردن برگه جدیدی در حالت ناشناس + انتخاب ارائه‌دهنده دیگر + ‏هم‌اکنون درحال ورود به سیستم با یک حساب مدیریت‌شده توسط و ارائه کنترل داده‌های Chrome خودتان به سرپرست این حساب هستید. داده‌هایتان به‌طور دائم به این حساب مرتبط می‌شوند. با خروج از Chrome، داده‌هایتان از این دستگاه حذف می‌شوند اما همچنان در حساب Google شما باقی می‌ماند. + اغلب از آن‌ها بازدید شده است + برای هم‌رسانی بین دستگاه‌ها، «همگام‌سازی» را روشن کنید + {FILE_COUNT,plural, =1{# ویدیو}one{# ویدیو}other{# ویدیو}} +-حریم‌خصوصی و امنیت ++حریم خصوصی و امنیت + گذرعبارت + خاموش کردن درخواست سایت رایانه‌ای + ویرایش +diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kk.xtb +index b4cc67822180..af6d8c46b8b8 100644 +--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kk.xtb ++++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kk.xtb +@@ -18,7 +18,7 @@ + Chrome браузерін жақсартуға көмектесесіз бе? + Экранды жазып алу + Тарихты синхрондау +-Бөлектеу қысқартылды. ++Ерекшелеу қысқартылды. + Басқа құрылғыларда сақталған бетбелгілер осы жерде шығады. + Қарапайым көріністі көрсету + Интернетте тапсырмалар орындауда көмек алыңыз +@@ -74,7 +74,7 @@ + + Барлық немесе белгілі бір сайттағы браузерді қолдану тарихын жойған кезде, оған қатысты өлшем ақпараты да жойылады. Браузерді қолдану тарихын қараңыз. + Google Chrome функциясының пернелер тіркесімі +-Бөлектелген мәтінге сілтеме қосыңыз. ++Ерекшеленген мәтінге сілтеме қосыңыз. + Әрекетті басқару + Шығып, синхрондауды өшіру керек пе? + Таңдалған мазмұнды жүктеу үшін жад жеткіліксіз. +@@ -221,7 +221,7 @@ + Кескін сипаттамалары өшірулі. + Терезені жабу керек пе? + QR коды +-Виртуалды карта қолданыстағы картаны алаяқтықтан қорғауға көмектеседі. Виртуалды карталар туралы толығырақ ақпарат алыңыз. ++Виртуалдық карта қолданыстағы картаны алаяқтықтан қорғауға көмектеседі. Виртуалдық карталар туралы толығырақ ақпарат алыңыз. + Бөлісу + Қызығушылық өшірілді. + Ескеретін жайттар +@@ -475,7 +475,7 @@ + Тарихтан іздеу + Контактілерге енгізу + Буфердегі мазмұн көрсетіледі +-Chrome виртуалды шындықты әлі дайындап жатыр. Chrome браузерін кейінірек қайта қосыңыз. ++Chrome виртуалдық шындықты әлі дайындап жатыр. Chrome браузерін кейінірек қайта қосыңыз. + Қойындыларды барлық құрылғылардан пайдалану үшін аккаунтқа кіріп, синхрондау функциясын қосыңыз + Телефонды қауіпсіздік кілті ретінде пайдалану + Бірдеңе дұрыс болмады. Қайталап көріңіз. +@@ -603,11 +603,11 @@ + – жүктеп алынуда… + Бетбелгілер жоқ + Мына қалтаға жылжыту… +-Виртуалды картаны жою керек пе? ++Виртуалдық картаны жою керек пе? + Іздеу жүйесі — . Қажет болса, ондағы іздеу тарихын жою туралы нұсқауларды қараңыз. + Google аккаунтын басқару + Баға бақылануда. Қандай да бір сайтта баға төмендесе, сізге хабарланады. +-Бұдан былай виртуалды картаны Google Pay қызметінде пайдалана алмайтын боласыз. Виртуалды карталар туралы толығырақ ақпарат алыңыз. ++Бұдан былай виртуалдық картаны Google Pay қызметінде пайдалана алмайтын боласыз. Виртуалдық карталар туралы толығырақ ақпарат алыңыз. + Жарнаманы жекелендіру + Google-дан алынған іздеу нәтижелері. + қойындысын жабу +@@ -664,10 +664,10 @@ Google аккаунтының шолу тарихы басқа Google қызме + Chrome браузерін жақсартуға көмектесіңіз. Сауалнамаға қатысыңыз + Жиі пайдаланатын сайттарды көру + Stack Unwinder +-Виртуалды карта ++Виртуалдық карта + Соңғы синхрондалған уақыты: + Мекенжай жолағында жақсартылған ұсыныстар аласыз. +-Бөлектемеу ++Ерекшелемеу + Жаңа қойынды ашу + Тек кескін бөлісу + Жүктеп алынғандар +@@ -713,7 +713,7 @@ Google аккаунтының шолу тарихы басқа Google қызме + Құпия сөздеріңіз мәтіндік файл түрінде экспортталады және жүктеп алынады. Олар тиісті қалтаға өту мүмкіндігімен барлық пайдаланушыларға және қолданбаларға көрінеді. + Сіз басқаратын аккаунттан шығып бара жатқандықтан, Chrome браузеріңіздегі деректер осы құрылғыдан жойылады. Ол Google аккаунтыңызда сақталады. + Дауыспен іздеу үшін микрофон белгішесін түртіңіз. +-Виртуалды шындық ++Виртуалдық шындық + Нәтижесіз + Бір Google аккаунтына кіргенде басқа құрылғылар бұл телефонды қауіпсіздік кілті ретінде пайдалана алады. + Толығырақ… +@@ -949,7 +949,7 @@ Privacy Sandbox сынақ нұсқалары әлі де әзірленіп ж + Веб-қолданбалар (дыбыссыз) + Android: қолдау көрсетілмейді + Таңбашаны өзгерту +-Бөлектелген мәтіннің сілтемесі жасалмады. ++Ерекшеленген мәтіннің сілтемесі жасалмады. + ( қатесі) + арқылы бөлісу + Шифрлау +@@ -1197,7 +1197,7 @@ Privacy Sandbox сынақ нұсқалары әлі де әзірленіп ж + Операциялық жүйе + Синхрондау жұмыс істемейді + Google жүйесіне келесі пайдаланушы атымен кірген: +-Бөлектеу үшін үлгіні таңдаңыз. ++Ерекшелеу үшін үлгіні таңдаңыз. + Желідегі ақаулықтар себебінен жүктелмеді. + Chrome жүйесіне қош келдіңіз + Провайдердің URL мекенжайы +@@ -1257,7 +1257,7 @@ Privacy Sandbox сынақ нұсқалары әлі де әзірленіп ж + Картаның қысқа аты + Мәзірді ашу + Құпия сөздер қолды болған жағдайда, сізге бұл туралы хабарлайды. +-Бөлектелген мәтін үшін стильденген карта жасау ++Ерекшеленген мәтін үшін стильденген карта жасау + ескірген. + Sync жеке басыңызды растау керек + Қабылдау және кіру +@@ -1422,9 +1422,9 @@ Privacy Sandbox сынақ нұсқалары әлі де әзірленіп ж + Түсінікті + Әрекетті қайталау + Дайын +-Бөлектелген мәтінді бөлісу ++Ерекшеленген мәтінді бөлісу + Мазмұны жасырылған +-Осыған ұқсас бөлектелген сілтеме жасалсын ба? ++Осыған ұқсас ерекшеленген сілтеме жасалсын ба? + Сұрау өңделуде + Навигация тарихы жабық. + Соңғы жабылған қойындыны қайта ашу +diff --git a/chromeos/strings/chromeos_strings_fa.xtb b/chromeos/strings/chromeos_strings_fa.xtb +index 6a2438d2865b..515426fba692 100644 +--- a/chromeos/strings/chromeos_strings_fa.xtb ++++ b/chromeos/strings/chromeos_strings_fa.xtb +@@ -224,7 +224,7 @@ + ‏شبکه Wi-Fi با پروتکل ضعیف WEP 802.1x ایمن شده است + ‏تأخیر بالا در وب‌سایت‌های HTTPS + ورودی +-پنهان/ نمایان کردن صفحه حریم‌خصوصی ++پنهان/ نمایان کردن صفحه حریم خصوصی + آزمایش + در حال بارکردن… + قبلاً متصل‌شده +diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_kk.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_kk.xtb +index 01fd59ae8849..329503647ddd 100644 +--- a/components/browser_ui/strings/android/translations/browser_ui_strings_kk.xtb ++++ b/components/browser_ui/strings/android/translations/browser_ui_strings_kk.xtb +@@ -145,11 +145,11 @@ + браузері микрофонды пайдалануы үшін, Android параметрлерінде оны да қосыңыз. + Мәліметтер + Ата-ана басқарады +-Виртуалды шындық ++Виртуалдық шындық + Қозғалыс не жарық датчиктері + Сайт сіз құрылғыңызды қашан белсенді пайдаланатыныңыз туралы білгісі келгенде, рұқсат сұралады. + Басқарылатын параметрлер бастапқы күйге қайтарылмайды. +-Cайттарға виртуалды шындық құрылғыңызды немесе деректерді пайдалануға рұқсат беру алдында сұрау (ұсынылады) ++Cайттарға виртуалдық шындық құрылғыңызды немесе деректерді пайдалануға рұқсат беру алдында сұрау (ұсынылады) + Құрылғыға арналған барлық рұқсаттардың күші жойылсын. + Алға өту + Cоңғы кіру: +@@ -223,7 +223,7 @@ + Діріл + Тазарту және қалпына келтіру + Толық экраннан шығу +-Сайттардың виртуалды шындық құрылғыңызды және деректеріңізді пайдалануына тыйым салу ++Сайттардың виртуалдық шындық құрылғыңызды және деректеріңізді пайдалануына тыйым салу + Cookie файлдары + Бөлісу + Bluetooth құрылғыларын іздеу +diff --git a/components/omnibox/resources/translations/omnibox_pedal_synonyms_fa.xtb b/components/omnibox/resources/translations/omnibox_pedal_synonyms_fa.xtb +index 7e44e04af172..f664a6ede22a 100644 +--- a/components/omnibox/resources/translations/omnibox_pedal_synonyms_fa.xtb ++++ b/components/omnibox/resources/translations/omnibox_pedal_synonyms_fa.xtb +@@ -45,7 +45,7 @@ + دیدن سابقه Chrome، مشاهده سابقه مرور + مدیریت بارگیری‌های Chrome، مشاهده بارگیری‌ها + نظرسنجی، فرم‌ها، فرم، آزمون +-تغییر تنظیمات حریم‌خصوصی Google، مدیریت حریم‌خصوصی Google ++تغییر تنظیمات حریم خصوصی Google، مدیریت حریم خصوصی Google + پیوندها همیشه در chrome باز شود، همیشه از chrome استفاده شود، chrome پیش‌فرض شود، مرورگر پیش‌فرض، حذف safari، چگونه chrome را مرورگر پیش‌فرض کنم، مرورگر اصلی، پیش‌فرض کردن chrome، قرار دادن chrome به‌عنوان مرورگر پیش‌فرض، چطور chrome مرورگر پیش‌فرضم باشد، باز کردن پیوندها در chrome، انتخاب chrome به‌عنوان مرورگر پیش‌فرض، مرورگر اول، پاک کردن safari، جستجو در chrome، تنظیم chrome به‌عنوان پیش‌فرض، تنظیم chrome به‌عنوان مرورگر پیش‌فرض، مرورگر استاندارد، باز شدن پیوندها در chrome، پیش‌فرض شدن chrome، می‌خواهم chrome مرورگر پیش‌فرض باشد، chrome پیش‌فرض + بستن پنجره ناشناس، خروج از حالت ناشناس + نهایت استفاده، درک کردن، کاوش، آشنایی، بازدید، دیدن +diff --git a/components/omnibox/resources/translations/omnibox_pedal_synonyms_te.xtb b/components/omnibox/resources/translations/omnibox_pedal_synonyms_te.xtb +index 3185300fce4b..fb375e060e92 100644 +--- a/components/omnibox/resources/translations/omnibox_pedal_synonyms_te.xtb ++++ b/components/omnibox/resources/translations/omnibox_pedal_synonyms_te.xtb +@@ -7,7 +7,7 @@ + మీటింగ్, ఆహ్వానించండి, ఈవెంట్ + కంట్రోల్ చేయండి, మేనేజ్ చేయండి, సర్దుబాటు చేయండి, తొలగించండి, మార్చండి, స్టోర్ చేయండి, ఎడిట్ చేయండి, జోడించండి + chrome సెట్టింగ్‌లను మార్చండి, సెట్టింగ్‌లను మేనేజ్ చేయండి +-Chrome రూపాన్ని అనుకూలీకరించండి, Chrome రూపాలను మేనేజ్ చేయండి ++Chrome రూపాన్ని అనుకూలంగా మార్చండి, Chrome రూపాలను మేనేజ్ చేయండి + వర్క్ స్పేస్, బ్రౌజర్, g suite, google, chrome, keep + google chrome, బ్రౌజింగ్, బ్రౌజర్, chrome, google, బ్రౌజ్ చేయండి, మార్చండి, మేనేజ్ చేయండి + సింక్ సెట్టింగ్‌లు, సింక్ +@@ -18,7 +18,7 @@ + వర్క్ స్పేస్, browser, g suite, google, chrome + కంట్రోల్ చేయండి, మేనేజ్ చేయండి, సర్దుబాటు చేయండి, పరిష్కరించండి + google ఖాతా +-Chrome యాక్సెసిబిలిటీని అనుకూలీకరించండి, యాక్సెసిబిలిటీ సెట్టింగ్‌లను మేనేజ్ చేయండి ++Chrome యాక్సెసిబిలిటీని అనుకూలంగా మార్చండి, యాక్సెసిబిలిటీ సెట్టింగ్‌లను మేనేజ్ చేయండి + కొత్త chrome ఫీచర్‌లు, chrome చిట్కాల కేంద్రం, chrome ఫీచర్‌లు, chrome చిట్కాలు + google chrome, బ్రౌజర్, chrome, google + వర్క్ స్పేస్, క్యాలెండర్, బ్రౌజర్, g suite, google, chrome, కాల్ +@@ -41,7 +41,7 @@ + స్ప్రెడ్‌షీట్, sheets, షీట్, ట్రిక్స్ + బ్రౌజర్, chrome, google + google ఖాతా పాస్‌వర్డ్, gmail ఖాతా పాస్‌వర్డ్, google పాస్‌వర్డ్, gmail పాస్‌వర్డ్ +-chromeos యాక్సెసిబిలిటీని అనుకూలీకరించండి, యాక్సెసిబిలిటీ సెట్టింగ్‌లను మేనేజ్ చేయండి ++chromeos యాక్సెసిబిలిటీని అనుకూలంగా మార్చండి, యాక్సెసిబిలిటీ సెట్టింగ్‌లను మేనేజ్ చేయండి + Chrome హిస్టరీని చూడండి, బ్రౌజింగ్ హిస్టరీని చూడండి + Chrome డౌన్‌లోడ్‌లను మేనేజ్ చేయండి, డౌన్‌లోడ్‌లను చూడండి + సర్వే, ఫారమ్‌లు, ఫారమ్, క్విజ్ +diff --git a/components/strings/components_strings_fa.xtb b/components/strings/components_strings_fa.xtb +index 6e5c5880f302..e7cb75762bb5 100644 +--- a/components/strings/components_strings_fa.xtb ++++ b/components/strings/components_strings_fa.xtb +@@ -71,7 +71,7 @@ + مستند تلویزیونی و غیرتخیلی + می‌خواهید به اجازه دهید از کوکی‌ها و داده‌های سایت در استفاده کند؟ + +-اگر اجازه ندهید، تنظیمات حریم‌خصوصی مانع از این دسترسی می‌شود. این اجازه کمک می‌کند محتوایی که با آن تعامل داشته‌اید درست کار کند، اما می‌تواند به هم اجازه دهد فعالیت شما را ردیابی کند. ++اگر اجازه ندهید، تنظیمات حریم خصوصی مانع از این دسترسی می‌شود. این اجازه کمک می‌کند محتوایی که با آن تعامل داشته‌اید درست کار کند، اما می‌تواند به هم اجازه دهد فعالیت شما را ردیابی کند. + &چاپ... + سه منگنه در راست + مرورگر وب +@@ -177,7 +177,7 @@ + باز کردن همه + سه منگنه در بالا + بازی‌های اکشن و سکویی +-خطای حریم‌خصوصی ++خطای حریم خصوصی + پیش‌دبستانی + می‌تواند برای پیدا کردن دستگاه‌های بلوتوث اطراف درخواست دهد + بله +@@ -338,7 +338,7 @@ + JIS B0 + برگه‌های بازتان در اینجا نشان داده می‌شوند + Google Smart Lock +-‏؛ برای مدیریت اطلاعات، حریم‌خصوصی، و امنیت در «حساب Google»، کلید «جهش» و سپس «ورود» را فشار دهید ++‏؛ برای مدیریت اطلاعات، حریم خصوصی، و امنیت در «حساب Google»، کلید «جهش» و سپس «ورود» را فشار دهید + ‏، چند کنش دردسترس است، برای جابه‌جایی بین آن‌ها، کلید Tab را فشار دهید + B9 + تغذیه سالم +@@ -551,7 +551,7 @@ + قدیمی + این سرور نتوانست اثبات کند که این است؛ ممکن است گواهی امنیتی آن باطل شده باشد. ممکن است علت این موضوع پیکربندی اشتباه باشد یا مهاجمی اتصال شما را قطع کرده است. + تاریک +-‏مدیریت «حساب Google»؛ برای مدیریت اطلاعات، حریم‌خصوصی، و امنیت در «حساب Google»، کلید «ورود» را فشار دهید ++‏مدیریت «حساب Google»؛ برای مدیریت اطلاعات، حریم خصوصی، و امنیت در «حساب Google»، کلید «ورود» را فشار دهید + به امکان داده شود همه پیوندهای را باز کند؟ + چهار سوراخ در راست + لوازم جانبی متصل به این دستگاه در مدت ورود به سیستم +@@ -1110,7 +1110,7 @@ + دسترسی به فضای ذخیره‌سازی مجاز شود؟ + {COUNT,plural, =1{‏سند PDF {COUNT} صفحه دارد}one{‏سند PDF {COUNT} صفحه دارد}other{‏سند PDF {COUNT} صفحه دارد}} + از آنجایی‌که این فرم درحال ارسال ازطریق اتصال ناامنی است، دیگران می‌توانند اطلاعات شما را ببینند. +-‏دکمه «مدیریت تنظیمات حریم‌خصوصی Google»؛ برای رفتن به تنظیمات حریم‌خصوصی «حساب Google»، کلید «ورود» را فشار دهید ++‏دکمه «مدیریت تنظیمات حریم خصوصی Google»؛ برای رفتن به تنظیمات حریم خصوصی «حساب Google»، کلید «ورود» را فشار دهید + &واگرد افزودن + دانشکده و دانشگاه + سپیا +@@ -1489,7 +1489,7 @@ + باغبانی + اندازه قلم + اجازه دادن +-حریم‌خصوصی ++حریم خصوصی + پیوندی که کپی کرده‌اید + ‏گذرواژه‌ای که اکنون استفاده کردید در سرقت اطلاعات شبکه پیدا شده است. «دستیار Google» می‌تواند گذرواژه‌تان را به‌طور خودکار تغییر دهد. + گذرواژه نادرست +@@ -1826,7 +1826,7 @@ + برنامه پرداخت باز نشد + ‏سرور پروکسی ثابت و URL اسکریپت pac. تعیین نشده‌اند. + ‏تاخوردگی Z شکل مهندسی +-‏مدیریت اطلاعات، حریم‌خصوصی، و امنیت در «حساب Google» ++‏مدیریت اطلاعات، حریم خصوصی، و امنیت در «حساب Google» + نتیجه برای «» + کلاسيک + ‏ترتیب N تا ۱ +@@ -2144,7 +2144,7 @@ + بازنشانی همه + هاكی + به نظر می‌رسد که گواهی سرور جعلی باشد. +-‏مدیریت تنظیمات حریم‌خصوصی Google در «حساب Google» ++‏مدیریت تنظیمات حریم خصوصی Google در «حساب Google» + شغل و تحصیلات + بیمه مسکن + می‌تواند برای استفاده از قلم‌های نصب‌شده در دستگاه درخواست دهد +@@ -2178,7 +2178,7 @@ + گذرواژه‌ها + گواهی معتبر نیست + ‏برنامه‌های Google Play که نصب کرده‌اید +-‏؛ برای مدیریت تنظیمات حریم‌خصوصی «حساب Google» خود، کلید «جهش» و سپس «ورود» را فشار دهید ++‏؛ برای مدیریت تنظیمات حریم خصوصی «حساب Google» خود، کلید «جهش» و سپس «ورود» را فشار دهید + تلاش کردید به دامنه بروید اما گواهینامه‌ای که سرور ارائه کرد، دارای یک تاریخ اعتبار بسیار طولانی است و مورداعتماد نیست. + {NUM_CARDS,plural, =1{درحال‌حاضر این کارت ذخیره نمی‌شود}one{درحال‌حاضر این کارت‌ها ذخیره نمی‌شوند}other{درحال‌حاضر این کارت‌ها ذخیره نمی‌شوند}} + مسدود کردن +@@ -2268,7 +2268,7 @@ + توصیه می‌شود + آبی پررنگ + بالا +-‏مدیریت تنظیمات حریم‌خصوصی «حساب Google» ++‏مدیریت تنظیمات حریم خصوصی «حساب Google» + شروع آهسته‌تر + همگام‌سازی پس‌زمینه + دستگاه به‌زودی بازراه‌اندازی خواهد شد +diff --git a/components/strings/components_strings_kk.xtb b/components/strings/components_strings_kk.xtb +index 7802f1b9b36d..533aed732187 100644 +--- a/components/strings/components_strings_kk.xtb ++++ b/components/strings/components_strings_kk.xtb +@@ -425,7 +425,7 @@ + Пошта индексі + {COUNT,plural, =1{1 ұсыныс}other{# ұсыныс}} + Нәрестелер мен сәбилер +-Бұл нөмір виртуалды карта нөмірі үшін жарамсыз. ++Бұл нөмір виртуалдық карта нөмірі үшін жарамсыз. + Сіз әдетте хабарландыруларға рұқсат бермейтін болғандықтан, олар автоматты түрде бөгелді. + Сән және стиль + Қайтару +@@ -701,7 +701,7 @@ + Интернет провайдерлері + сайтындағы шабуылдаушылар ақпаратыңызды (мысалы, құпия сөздер, хабарлар немесе несиелік карталар) ұрлауға әрекет етуі мүмкін.Толығырақ + Бұл сайтта мазалайтын немесе жалған ақпаратты жарнамалар көрсетіледі. +-Виртуалды карта қолданыстағы картаны алаяқтықтан қорғауға көмектеседі. ++Виртуалдық карта қолданыстағы картаны алаяқтықтан қорғауға көмектеседі. + Ақ ниетті + Фильмдер + Сыртқы қолданба арқылы төлеу үшін инкогнито режимінен шығасыз. Жалғастыру керек пе? +@@ -841,7 +841,7 @@ + француз + Зейнетке шығу және зейнетақы + , Google Calendar-да жылдам жаңа іс-шара жасау үшін Tab, содан кейін Enter пернесін басыңыз. +-Виртуалды карта туралы толығырақ ++Виртуалдық карта туралы толығырақ + Chrome параметрлерін басқару түймесі, Chrome параметрлеріне өту үшін Enter пернесін басыңыз. + Мән (қарама-қайшы) + Ашық қойындылар +@@ -864,7 +864,7 @@ + Төлем мекенжайын қосу + Қызыл күрең + Қанықтық +-Виртуалды карта үшін жарамсыз ++Виртуалдық карта үшін жарамсыз + Қауіпсіз + Жүгіру және жүру + Бұлт (Ash) +@@ -875,7 +875,7 @@ + Төлем өңдегіш парағы + Экология және қоршаған орта + Бұл саясат ескі саясатынан автоматты түрде көшірілді. Орнына осы саясатты пайдаланғаныңыз жөн. +-Сайт () виртуалды шындық құрылғысын және деректерді пайдалануға рұқсат сұрайды. ++Сайт () виртуалдық шындық құрылғысын және деректерді пайдалануға рұқсат сұрайды. + Карталарды көру + Сағат қатесі + Автобөлшектер мен керек-жарақтар +@@ -922,7 +922,7 @@ + Өлшемін өзгертуге болады + Number-11 (Envelope) + беті буферге көшірілген мәтін мен кескіндерді көргісі келеді +-Бөлектеу құралы ++Ерекшелеу құралы + Кеңейтілген мәліметті жасыру + Химия + Карта иесінің аты қажет +@@ -967,7 +967,7 @@ + Қолданбаны әкімші бөгеген + Беру бағыты + Үйге арналған тауарлар +- виртуалды картасы ++ виртуалдық картасы + Өлшемі: 2 + "" тізім жазбасы: тіл белгісіз немесе оған қолдау көрсетілмейді. + . Chrome параметрлерінен қауіпсіздік тексерісін іске қосу үшін Tab, сосын Enter пернесін басыңыз. +@@ -1174,7 +1174,7 @@ + сайты үшін сұрауыңызды орындай алмайды. Сайттың қауіпсіздік параметрлері мен + басқа сипаттарын конфигурациялау үшін сайт операторлары түпнұсқа саясаттарын қолдануы мүмкін. + Растау кодының мерзімі өткен, жаңа код сұраңыз. +-Виртуалды шындық құрылғыларын және деректерді пайдалану ++Виртуалдық шындық құрылғыларын және деректерді пайдалану + Анимациялық фильмдер + Бодибилдинг + кіру экраны профилі +@@ -1206,7 +1206,7 @@ + Жоқ + Ескертпе + Енгізілген өзгертулер сақталмауы мүмкін. +-Қауіпсіздік виртуалды картамен күшейтілсін бе? ++Қауіпсіздік виртуалдық картамен күшейтілсін бе? + Қолтаңба жарамсыз + Қорғалған құжаттарға аннотация қосу мүмкін емес. + Әкімші рұқсат берген +@@ -1348,13 +1348,13 @@ + Қуат және коммуналдық кәсіпорындар + Фармацевтика және биотехнология + , +-Виртуалды шындық ++Виртуалдық шындық + Динозавр ойыны, ойнау + Бұл сервер өзінің екенін дәлелдей алмады; оның қауіпсіздік сертификатында қателер бар. Бұл дұрыс конфигурацияланбағаннан немесе зиянды бағдарламаның байланысқа кедергі келтіргенінен болуы мүмкін. + арнайы мүмкіндіктер оқиғаларына жауап бергісі келеді + Google Slides + Бет аударылсын ба? +-Виртуалды карта нөмірін көру ++Виртуалдық карта нөмірін көру + Architecture-A (Envelope) + Іздеу жүйелері + +@@ -1374,7 +1374,7 @@ + құрылғыңыздың орналасқан жер деректерін пайдаланғысы келеді + Моторлы көліктер + Chromium браузерін қайта іске қосу +-Виртуалды карта ++Виртуалдық карта + Жаңарту + Ұсынылатын сұрау: + Құпия сөздерді басқару... +@@ -1518,7 +1518,7 @@ + Төлеу әдістерін басқару + A5 + 18-науа +-виртуалды шындық ++виртуалдық шындық + European-Edp + Шектелген басқарылатын қонақ сеансын қайта анықтау + (64 биттік) +@@ -1531,7 +1531,7 @@ + Гүлдер + Мекенжайларды басқару... + Дұрыс код енгізіңіз. +-Қазір виртуалды карта қолжетімсіз. Банкіңізге хабарласыңыз. ++Қазір виртуалдық карта қолжетімсіз. Банкіңізге хабарласыңыз. + Жию + Қате коды саясат жауабында көрсетіледі + сайты үшін хабарландырулар бөгелді +@@ -1746,13 +1746,13 @@ + Көлік сатып алу + Мотоцикл жарысы + Орналасқан жеріңізді сұрай алады +-{NUM_CARDS,plural, =1{Осы карта үшін виртуалды нөмірді пайдаланыңыз}other{Картаны таңдаңыз}} ++{NUM_CARDS,plural, =1{Осы карта үшін виртуалдық нөмірді пайдаланыңыз}other{Картаны таңдаңыз}} + Антиперспиранттар, дезодоранттар және денеге арналған спрейлер + Үй жануарлары мен аңдар + Камераны пайдалану және жылжыту + Дұрыс электрондық пошта мекенжайын енгізіңіз + Жеткізу әдістері мен талаптарын көру үшін мекенжайды таңдаңыз +-Виртуалды карта нөмірі толтырылмаған ба? ++Виртуалдық карта нөмірі толтырылмаған ба? + Басымдық + Эксперимент қосылды. + Қою сары +@@ -1806,7 +1806,7 @@ + Үй және бақша + Сайтта мазалайтын не жалған ақпаратты жарнамалар көрсетіледі + Бет аударылды. +-Виртуалды карта қосыңыз. ++Виртуалдық карта қосыңыз. + Troy + ашылуда… + Тұтынушының аккаунтымен тіркеу мүмкін емес (лицензия пакеті бар). +@@ -1821,7 +1821,7 @@ + Құпия сөздерді тексеру + Index-3x5 + Камераның ылғалдылығы +-Кеңейтілген және виртуалды шындық ++Кеңейтілген және виртуалдық шындық + Төлем қолданбасы ашылмайды + Бекітілген прокси серверлері де, .pac сценарий URL мекенжайы да көрсетілмеген. + Z тәрізді етіп жиі бүктеу +@@ -2057,7 +2057,7 @@ + Қаріп өлшемі сұралды + Актерлік шеберлік және театр + Жаңарту… +-Қазір виртуалды карта қолжетімсіз. Кейінірек қайталап көріңіз. ++Қазір виртуалдық карта қолжетімсіз. Кейінірек қайталап көріңіз. + Қара нүктені сығуға қатысты + Сіз аккаунтқа кіргендіктен, Chrome браузері карталарыңызды Google аккаунтына сақтауды ұсынып отыр. Мұны "Параметрлер" бөлімінен өзгертуіңізге болады. Карта иесінің аты-жөнін аккаунтыңыздан алынады. + . Google аккаунтында құрылғыңызды табу үшін Tab, сосын Enter пернесін басыңыз. +@@ -2105,7 +2105,7 @@ + Аудару + Қауіпсіз әрі жылдамырақ төлеу үшін карта мен төлем туралы ақпаратты Google аккаунтына сақтаңыз + Аудан +-Виртуалды карта нөмірін пайдалану... ++Виртуалдық карта нөмірін пайдалану... + Қолданба қайта жүктелсін бе? + Тұтыну ресурстары + Бұл картаны дәл қазір растау мүмкін емес +@@ -2119,7 +2119,7 @@ + Chrome бұл режимде беттің оқылуын жеңілдетті. Chrome браузерінде бастапқы бет қорғалмаған байланыс арқылы алынды. + Локацияны пайдалануға рұқсат берілсін бе? + Саясат деңгейіне қолдау көрсетілмеген. +-Виртуалды нөмір: ++Виртуалдық нөмір: + Картаңыз расталды + Пайдаланушы агенті + Ұйым (O) +@@ -2278,7 +2278,7 @@ + &Қайта ретке келтіруді қайталау + Камераңызды қолдануға рұқсат сұрай алады + Жолдарды көбірек көрсету +-Виртуалды карта нөмірі толтырылмаған ба? Көшірілетін карта мәліметтерін басыңыз. ++Виртуалдық карта нөмірі толтырылмаған ба? Көшірілетін карта мәліметтерін басыңыз. + Сіздің платформаңызда қолжетімді емес. + Сервер сертификаты Сертификат айқындығы саясатымен ашылмады. + Жүрілген көліктер +@@ -2535,7 +2535,7 @@ + Edp + Биге арналған және электрондық музыка + Келесімен байланыстырылды: +-Виртуалды шындық құрылғыларын және деректерді пайдалануға рұқсат сұрай алады. ++Виртуалдық шындық құрылғыларын және деректерді пайдалануға рұқсат сұрай алады. + Кроссоверлер + Қазір сайтына кіру мүмкін емес, себебі веб-сайт Chrome өңдей алмайтын шифрланған есептік деректерді жіберді. Желі қателері мен шабуылдары әдетте уақытша болғандықтан, бұл бет кейінірек жұмыс істеуі мүмкін. + +@@ -2666,7 +2666,7 @@ + Кеш + хабарландырулар + сайтына кіруге тыйым салынған +-Бөлектеу ++Ерекшелеу + тіліндегі беттер аударылмайды + / + Қауіп-қатерлерді түсінсеңіз, зиянды бағдарламалар жойылмай жатып, осы сайтқа кіруіңізге болады. +@@ -2740,7 +2740,7 @@ + Chromium басқа сайттарда пайдаланылған құпия сөзін қайта орнатуды ұсынады. + Карталарыңызды жылдам растау үшін Touch ID пайдаланыңыз. + Үй кинотеатры жүйелері +-Виртуалды карта қолжетімсіз ++Виртуалдық карта қолжетімсіз + Телефон нөмірін қосу + Ең жақсы сапа + Тек осы жолы +@@ -2817,7 +2817,7 @@ + Басқа бетбелгілер + Жөнелту мекенжайы + Қайтарып алу механизмі табылмады. +-Қауіпсіздікті арттыру үшін виртуалды картаны пайдаланыңыз. ++Қауіпсіздікті арттыру үшін виртуалдық картаны пайдаланыңыз. + Микроавтомобильдер және екі есікті шағын автомобильдер + Теннис + Би +diff --git a/ios/chrome/app/strings/resources/ios_chromium_strings_fa.xtb b/ios/chrome/app/strings/resources/ios_chromium_strings_fa.xtb +index b5b5bbea4bd2..f35c4654216a 100644 +--- a/ios/chrome/app/strings/resources/ios_chromium_strings_fa.xtb ++++ b/ios/chrome/app/strings/resources/ios_chromium_strings_fa.xtb +@@ -46,7 +46,7 @@ + ‏برای اینکه بیشترین بهره را از Chromium ببرید، با «حساب Google» به سیستم Chromium وارد شوید. + ‏Chromium زمانی می‌تواند گذرواژه‌هایتان را بررسی کند که با «حساب Google» خود به سیستم وارد شوید. + ‏ از Chromium استفاده می‌کرده است و نشانک‌ها، گذرواژه‌ها، و تنظیمات دیگری در این دستگاه ذخیره کرده است. +-‏Chromium به عکس‌ها یا ویدیوهای شما دسترسی ندارد. با رفتن به تنظیمات iOS > حریم‌خصوصی > عکس‌ها دسترسی را فعال کنید. ++‏Chromium به عکس‌ها یا ویدیوهای شما دسترسی ندارد. با رفتن به تنظیمات iOS > حریم خصوصی > عکس‌ها دسترسی را فعال کنید. + گذرواژه‌ها فقط در «مدیر گذرواژه» در این دستگاه ذخیره می‌شوند. + ‏در «Chromium بتا» پشتیبانی نمی‌شود + ‏وقتی این قابلیت روشن است، Chromium ترجمه صفحات نوشته‌شده به سایر زبان‌ها را با استفاده از ترجمه Google پیشنهاد می‌دهد. بیشتر بدانید +@@ -99,7 +99,7 @@ + گذرواژه‌تان در «مدیر گذرواژه» برای ذخیره خواهد شد. + ‏استفاده از Chromium در همه‌جا + ‏گذرواژه‌تان به‌دلیل نقض داده لو رفته است. Chromium توصیه می‌کند همین‌حالا گذرواژه را تغییر دهید. +-‏Settings (تنظیمات) > Privacy (حریم‌خصوصی) > Camera (دوربین) > Chromium را باز کنید و دوربین را روشن کنید. ++‏Settings (تنظیمات) > Privacy (حریم خصوصی) > Camera (دوربین) > Chromium را باز کنید و دوربین را روشن کنید. + ‏نکته Chromium. بعضی از دکمه‌ها مثل Back (برگشت)، Forward (به جلو) و Search (جستجو) اکنون در پایین صفحه هستند. + ‏از Chromium به‌عنوان مرورگر پیش‌فرض استفاده کنید تا دربرابر سایت‌های خطرناک از شما محافظت شود و امنیت گذرواژه‌هایتان حفظ شود + ‏هم‌اکنون درحال تغییر حساب‌های همگام‌سازی از به هستید. داده‌های موجود Chromium شما توسط مدیریت می‌شوند. با این کار، داده‌هایتان از این دستگاه حذف می‌شود اما همچنان در باقی می‌ماند. +diff --git a/ios/chrome/app/strings/resources/ios_google_chrome_strings_fa.xtb b/ios/chrome/app/strings/resources/ios_google_chrome_strings_fa.xtb +index 94c7e6b36fb2..f1a9c4e962d2 100644 +--- a/ios/chrome/app/strings/resources/ios_google_chrome_strings_fa.xtb ++++ b/ios/chrome/app/strings/resources/ios_google_chrome_strings_fa.xtb +@@ -46,7 +46,7 @@ + ‏Google Chrome اکنون نمی‌تواند از دوربین استفاده کند + ‏هم‌اکنون حساب‌های همگام‌سازی را از به تغییر می‌دهید. داده‌های موجود Chrome شما توسط مدیریت می‌شود. با این کار، داده‌هایتان از این دستگاه حذف می‌شود اما همچنان در باقی می‌ماند. + ‏سازمانتان از شما می‌خواهد خارج از سیستم Chrome باقی بمانید. +-‏Google Chrome به عکس‌ها یا ویدیوهای شما دسترسی ندارد. با رفتن به تنظیمات iOS > حریم‌خصوصی > عکس‌ها دسترسی را فعال کنید. ++‏Google Chrome به عکس‌ها یا ویدیوهای شما دسترسی ندارد. با رفتن به تنظیمات iOS > حریم خصوصی > عکس‌ها دسترسی را فعال کنید. + ‏‫با ارسال آمار کاربرد و گزارش‌های خرابی به Google، به بهتر شدن Chrome کمک کنید. + ‏در Chrome Canary پشتیبانی نمی‌شود + ‏به سیستم این سایت و Chrome وارد شوید. می‌توانید بعداً همگام‌سازی را روشن کنید. +@@ -64,7 +64,7 @@ + ‏نسخه Chrome قدیمی است. اگر به‌روزرسانی‌ای در فروشگاه برنامه دردسترس نیست، احتمالاً دستگاهتان نسخه‌های جدید Chrome را دیگر پشتیبانی نمی‌کند. + ‏Google Chrome نمی‌تواند از دوربین استفاده کند زیرا برنامه دیگری از آن استفاده می‌کند + ‏۴. Chrome را انتخاب کنید +-‏Settings (تنظیمات) > Privacy (حریم‌خصوصی) > Camera (دوربین) > Google Chrome را باز کنید و دوربین را روشن کنید. ++‏Settings (تنظیمات) > Privacy (حریم خصوصی) > Camera (دوربین) > Google Chrome را باز کنید و دوربین را روشن کنید. + ‏Google Chrome نمی‌تواند از دوربین درحالت «نمای تقسیم‌شده» استفاده کند + Google LLC + ‏آفلاین هستید، Chrome نمی‌تواند به‌روزرسانی‌ها را بررسی کند. +diff --git a/ios/chrome/app/strings/resources/ios_strings_fa.xtb b/ios/chrome/app/strings/resources/ios_strings_fa.xtb +index bbc039d98ae2..fcf439987a59 100644 +--- a/ios/chrome/app/strings/resources/ios_strings_fa.xtb ++++ b/ios/chrome/app/strings/resources/ios_strings_fa.xtb +@@ -501,7 +501,7 @@ + نمایش + ذخیره + روشن کردن همگام‌سازی +-‏برای تنظیمات بیشتر مرتبط با حریم‌خصوصی، امنیت، و جمع‌آوری داده، سرویس‌های Google را ببینید. ++‏برای تنظیمات بیشتر مرتبط با حریم خصوصی، امنیت، و جمع‌آوری داده، سرویس‌های Google را ببینید. + سایت‌هایی را که دنبال کرده‌اید اینجا خواهید دید + بازکردن تصویر + صرف‌نظر کردن از تغییرات +@@ -534,7 +534,7 @@ Handoff باید در بخش عمومی تنظیمات نیز فعال شود و + دسترسی به دوربین مجاز است + ورود به سیستم ممکن نیست. + آخرین فعالیت: ۱ روز قبل +-‏برای تنظیمات بیشتری که با حریم‌خصوصی، امنیت و جمع‌آوری داده مرتبط هستند، همگام‌سازی و سرویس‌های Google را ببینید. ++‏برای تنظیمات بیشتری که با حریم خصوصی، امنیت و جمع‌آوری داده مرتبط هستند، همگام‌سازی و سرویس‌های Google را ببینید. + برای مرور خصوصی وب، برگه جدیدی اضافه کنید + متأسفیم، مشکلی در ورود به حساب شما وجود داشت. + گذرواژه‌ها در برنامه‌های دیگر +@@ -644,7 +644,7 @@ Handoff باید در بخش عمومی تنظیمات نیز فعال شود و + پیام ارسال شد. + کوکی‌ها + بررسی هرگز انجام نشده است. +-‏برای تنظیمات بیشتر مربوط به حریم‌خصوصی، امنیت، و جمع‌آوری داده، همگام‌سازی و سرویس‌های Google را ببینید. ++‏برای تنظیمات بیشتر مربوط به حریم خصوصی، امنیت، و جمع‌آوری داده، همگام‌سازی و سرویس‌های Google را ببینید. + در برگه ناشناس جدید + سایت‌ها می‌توانند از کوکی‌ها برای بهبود تجربه مرورتان استفاده کنند، مثلاً برای اینکه شما را درحالت واردشده به سیستم نگه دارند یا موارد موجود در سبد خریدتان را به‌خاطر بسپارند. + +@@ -810,7 +810,7 @@ Handoff باید در بخش عمومی تنظیمات نیز فعال شود و + سابقه جستجو ( مورد پیدا شد) + ‏برای محافظت از حریم‌خصوصی‌تان، Chrome از ویژگی تکمیل خودکار برای این فیلد استفاده نخواهد کرد. + سازمانتان به شما اجازه نمی‌دهد همه چیز را همگام‌سازی کنید. +-حریم‌خصوصی و امنیت ++حریم خصوصی و امنیت + اگر گذرواژه‌ها به‌دلیل نقض داده لو رفته باشد، به شما هشدار می‌دهد. + FaceTime + صادر کردن گذرواژه‌ها… +diff --git a/ios/chrome/app/strings/resources/ios_strings_kk.xtb b/ios/chrome/app/strings/resources/ios_strings_kk.xtb +index ca5e3576f7da..ac82256d6e3e 100644 +--- a/ios/chrome/app/strings/resources/ios_strings_kk.xtb ++++ b/ios/chrome/app/strings/resources/ios_strings_kk.xtb +@@ -151,7 +151,7 @@ + Нақтылау + Chrome-да сақталған құпия сөздерді құрылғыңыздағы басқа қолданбаларда пайдаланыңыз. + "Тағы" мәзірі +-Бөлектелген мәтін ++Ерекшеленген мәтін + Құрылғыдағы құпия сөздер Google Құпия сөздер реттегішіне сақтамас бұрын шифрланады. + Құпия сөзді веб-сайтта өзгерту + Ұсынылған құпия сөзді қолдану +@@ -445,7 +445,7 @@ + Cookie файлдары, сайт деректері + {count,plural, =0{{domain}}=1{{domain} және тағы 1}other{{domain} және тағы {count}}} + Үшінші тарапты бөгеу +-Бөлектелген мәтінді бөлісу ++Ерекшеленген мәтінді бөлісу + Оқылды деп белгілеу + Соңғы қойындылар қолжетімді емес + Қолданыс статистикасын және жаңылыс туралы есептерді Google-ға автоматты түрде жібереді. +@@ -567,7 +567,7 @@ Handoff функциясы параметрлердің жалпы бөлімі + Бұл суреттерді жинаққа сақтауға мүмкіндік береді. + Офлайн нұсқаны көру + Қосымша опциялар +-Бөлектелген мәтіннің сілтемесін жасау мүмкін емес. ++Ерекшеленген мәтіннің сілтемесін жасау мүмкін емес. + Жүйеге кірдіңіз + Құпия сөздерді іздеу + Бар деректерді электрондық поштасына енгізіңіз. +diff --git a/ui/accessibility/extensions/strings/accessibility_extensions_strings_kk.xtb b/ui/accessibility/extensions/strings/accessibility_extensions_strings_kk.xtb +index 95b31fe8b7fa..251bd32b3d84 100644 +--- a/ui/accessibility/extensions/strings/accessibility_extensions_strings_kk.xtb ++++ b/ui/accessibility/extensions/strings/accessibility_extensions_strings_kk.xtb +@@ -27,7 +27,7 @@ + Image Alt Text Viewer + Ұзын сипаттамасын көру үшін "longdesc" немесе "aria-describedat" төлсипаты бар кез келген нәрседе оң жақ түймені басыңыз. + Көрсеткі пернелерімен веб-беттер мәтінін шолу. +-Курсор орнын жылдам жарқыл арқылы бөлектеу. ++Курсор орнын жылдам жарқыл арқылы ерекшелеу. + Өшіру + Кескіндер олардың "Alt" мәтіндеріне ауыстырылған. + Әсерлерсіз, курсорды ғана көрсету. +diff --git a/ui/chromeos/translations/ui_chromeos_strings_kk.xtb b/ui/chromeos/translations/ui_chromeos_strings_kk.xtb +index c3396d18770b..bafb0d93069f 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_kk.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_kk.xtb +@@ -548,9 +548,9 @@ + Тыңдау + Жаңа PIN кодын енгізіңіз + Linux қолданбасы терминалда қолжетімді болады және Launcher қолданбасында белгіше көрсетіледі. +-Мұрағаттан немесе виртуалды дискіден ажырату мүмкін емес ++Мұрағаттан немесе виртуалдық дискіден ажырату мүмкін емес + +- Мұрағаттағы немесе виртуалды дискідегі барлық файлдарды жауып, әрекетті қайталаңыз. ++ Мұрағаттағы немесе виртуалдық дискідегі барлық файлдарды жауып, әрекетті қайталаңыз. + деген файл енді жоқ. + , Құлыпты ашу + Аудиофайл ақпараты +diff --git a/ui/strings/translations/ax_strings_kk.xtb b/ui/strings/translations/ax_strings_kk.xtb +index fab2d7740041..2768a0d81a0f 100644 +--- a/ui/strings/translations/ax_strings_kk.xtb ++++ b/ui/strings/translations/ax_strings_kk.xtb +@@ -75,7 +75,7 @@ + төменгі индекс + құсбелгіні алу + күн таңдағышы +-бөлектеу ++ерекшелеу + time + аннотация + түйме +@@ -109,7 +109,7 @@ + алғысөз + мәзірді ашатын қалқымалы түйме + мазмұн туралы ақпарат +-бөлектеу ++ерекшелеу + баған тақырыбы + алғыс сөз + түсіндірмелер +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0054-Incrementing-VERSION-to-102.0.5005.146.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0054-Incrementing-VERSION-to-102.0.5005.146.patch new file mode 100644 index 000000000000..af60b5376895 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0054-Incrementing-VERSION-to-102.0.5005.146.patch @@ -0,0 +1,28 @@ +From f200497260f693b91282be927a5f66454153e1ee Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Fri, 1 Jul 2022 01:00:32 +0000 +Subject: [PATCH 54/59] Incrementing VERSION to 102.0.5005.146 + +Change-Id: I2d9fd202320097c93f848856867637a3c12c036d +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3739526 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1213} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 48b95fdd910e..77a1b84df510 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=145 ++PATCH=146 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0055-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0055-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..fdce2b459243 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0055-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,106 @@ +From a27b8ff1869802e8d34afae11ff52e0271077db4 Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Fri, 1 Jul 2022 14:09:34 +0000 +Subject: [PATCH 55/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: I57bfdaabcbb5987d43fa117e818a0e9669877525 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3738937 +Commit-Queue: Rubber Stamper +Auto-Submit: Ben Mason +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1214} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/app/resources/generated_resources_es-419.xtb | 2 +- + chrome/app/resources/generated_resources_fa.xtb | 4 ++-- + components/strings/components_strings_fa.xtb | 4 ++-- + remoting/resources/remoting_strings_fa.xtb | 2 +- + ui/chromeos/translations/ui_chromeos_strings_fa.xtb | 2 +- + 5 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/chrome/app/resources/generated_resources_es-419.xtb b/chrome/app/resources/generated_resources_es-419.xtb +index dd4a406234dd..ee73f2dda753 100644 +--- a/chrome/app/resources/generated_resources_es-419.xtb ++++ b/chrome/app/resources/generated_resources_es-419.xtb +@@ -8321,7 +8321,7 @@ Mantén el archivo de clave en un lugar seguro. Debes crear las nuevas versiones + Haz clic para salir de la Guía de privacidad. + podrá editar los archivos de la carpeta + Buscar en +-Se borrarán los datos sin conexión ++Se borrarán los datos sin conexión. + Visto anteriormente + Opciones de bloqueo de pantalla + Se produjo un error. Comunícate con el administrador o el propietario de tu dispositivo. Código de error: . +diff --git a/chrome/app/resources/generated_resources_fa.xtb b/chrome/app/resources/generated_resources_fa.xtb +index 262eccfeac75..79d3b99cca6e 100644 +--- a/chrome/app/resources/generated_resources_fa.xtb ++++ b/chrome/app/resources/generated_resources_fa.xtb +@@ -9,7 +9,7 @@ + ‏اشکال‌زدایی ADB (پل اشکال‌زدایی Android) فعال شود؟ + این افزونه می‌تواند داده‌هایتان را در سایت‌ها بخواند و تغییر دهد. می‌توانید سایت‌هایی را که این افزونه به آن‌ها دسترسی دارد کنترل کنید. + صادرکردن نشانک‌ها +-اکنون نه ++حالا نه + مکان + این برگه به درگاه سریال متصل است. + {NUM_PAGES,plural, =1{صفحه غیرپاسخگو}one{صفحه‌های غیرپاسخگو}other{صفحه‌های غیرپاسخگو}} +@@ -2601,7 +2601,7 @@ + ‏داده‌های استفاده و عیب‌یابی را ارسال کنید. با ارسال خودکار داده‌های عیب‌یابی و داده‌های استفاده از دستگاه و برنامه به Google به بهبود تجربه Android خود کمک کنید. این داده‌ها برای شناسایی فرزندتان استفاده نخواهند شد و به بهبود پایداری سیستم و برنامه و موارد دیگر کمک خواهد کرد. بعضی داده‌های انبوهشی نیز به برنامه‌ها و شرکای Google (مانند برنامه‌نویس‌های Android) کمک می‌کند. این تنظیم توسط مالک اعمال می‌شود. ممکن است مالک انتخاب کند داده‌های استفاده و عیب‌یابی این دستگاه به Google ارسال شود. اگر تنظیم «فعالیت وب و برنامه» تکمیلی برای فرزندتان روشن باشد، ممکن است این داده‌ها در حساب Google او ذخیره شود. بیشتر بدانید + وای! سیستم نتوانست خط‌مشی را برای دستگاهتان واکشی کند. + همچنان دسترسی به دوربین و میکروفون شما، توسط مجاز باشد +-اکنون نه ++حالا نه + سرور چاپ شناسایی نشد. لطفاً نشانی را بررسی و دوباره امتحان کنید. + اندازه و سبک زیرنویس ناشنوایان را برای «زیرنویس ناشنوایان زنده» سفارشی می‌کند. برخی از برنامه‌ها و سایت‌ها نیز از این تنظیم استفاده خواهند کرد. + برگه پیدا شد +diff --git a/components/strings/components_strings_fa.xtb b/components/strings/components_strings_fa.xtb +index e7cb75762bb5..c4333102aae1 100644 +--- a/components/strings/components_strings_fa.xtb ++++ b/components/strings/components_strings_fa.xtb +@@ -2,7 +2,7 @@ + + + یادآوری: پیشنهاد ذخیره‌شده دردسترس است +-اکنون نه ++حالا نه + از مکان شما استفاده شود؟ + بار کردن صفحه در فرصتی دیگر + درحال آماده‌سازی فایل‌ها +@@ -930,7 +930,7 @@ + ‏، اکنون باز است، برای جابه‌جا شدن به برگه باز، ابتدا دکمه Tab سپس Enter را فشار دهید + ؛ برای بستن همه پنجره‌های ناشناسی که درحال‌حاضر باز هستند، کلید «جهش» و سپس «ورود» را فشار دهید + فهرست فیلم و ساعات کار سینما +-اکنون نه ++حالا نه + ‏ممکن است دسترسی به حساب Google را از دست بدهید. Chrome توصیه می‌کند اکنون گذرواژه‌تان را تغییر دهید. از شما خواسته می‌شود به سیستم وارد شوید. + سینی ۴ + یافتن در صفحه +diff --git a/remoting/resources/remoting_strings_fa.xtb b/remoting/resources/remoting_strings_fa.xtb +index 50c5d11d21b9..746856700b26 100644 +--- a/remoting/resources/remoting_strings_fa.xtb ++++ b/remoting/resources/remoting_strings_fa.xtb +@@ -2,7 +2,7 @@ + + + نسخه ناسازگار پروتکل شناسایی شد. لطفاً مطمئن شوید جدیدترین نسخه نرم‌افزار روی هر دو رایانه نصب شده است و دوباره امتحان کنید. +-اکنون نه ++حالا نه + بعدی + خطا در اتصال به + شئ درخواست شده وجود ندارد. +diff --git a/ui/chromeos/translations/ui_chromeos_strings_fa.xtb b/ui/chromeos/translations/ui_chromeos_strings_fa.xtb +index 2d8ce99bd8f5..859bf5d213ba 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_fa.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_fa.xtb +@@ -287,7 +287,7 @@ + در حال اسکن دستگاه رسانه شما... + ‏ عکس در Google Drive پشتیبان گرفته شدند + ‏صفحه‌گسترده Google +-اکنون نه ++حالا نه + مغولی + خطا. + شبکه از ، ، ، ، قدرت سیگنال ٪، جزئیات +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0056-Incrementing-VERSION-to-102.0.5005.147.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0056-Incrementing-VERSION-to-102.0.5005.147.patch new file mode 100644 index 000000000000..2ef3e3c38af2 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0056-Incrementing-VERSION-to-102.0.5005.147.patch @@ -0,0 +1,28 @@ +From 391fb1a5e453329543f2f332e5974766cd5014a3 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Sat, 2 Jul 2022 01:01:07 +0000 +Subject: [PATCH 56/59] Incrementing VERSION to 102.0.5005.147 + +Change-Id: I14fb873b1b7c28ba9671cadd20eba07df8273899 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3741368 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1215} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 77a1b84df510..1e243e1ad602 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=146 ++PATCH=147 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0057-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0057-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch new file mode 100644 index 000000000000..e98e8e72aeb7 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0057-Updating-XTBs-based-on-.GRDs-from-branch-5005.patch @@ -0,0 +1,420 @@ +From 635e11ea23feab7857e247cfc97bf6c31d5b3232 Mon Sep 17 00:00:00 2001 +From: Ben Mason +Date: Sat, 2 Jul 2022 14:46:02 +0000 +Subject: [PATCH 57/59] Updating XTBs based on .GRDs from branch 5005 + +Change-Id: Iae0d7ba2d623eb48253bf9f4c0ae7256374d5f6f +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3738372 +Auto-Submit: Ben Mason +Commit-Queue: Rubber Stamper +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/5005@{#1216} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + ash/strings/ash_strings_mn.xtb | 4 +-- + chrome/app/resources/chromium_strings_te.xtb | 2 +- + .../app/resources/generated_resources_ky.xtb | 2 +- + .../app/resources/generated_resources_mn.xtb | 2 +- + .../app/resources/generated_resources_te.xtb | 16 +++++------ + .../resources/generated_resources_zh-CN.xtb | 2 +- + .../resources/google_chrome_strings_te.xtb | 2 +- + .../strings/accessibility_strings_ml.xtb | 8 +++--- + components/strings/components_strings_te.xtb | 28 +++++++++---------- + .../app/strings/resources/ios_strings_ml.xtb | 6 ++-- + .../strings/resources/ios_strings_zh-CN.xtb | 2 +- + .../translations/ui_chromeos_strings_te.xtb | 2 +- + 12 files changed, 38 insertions(+), 38 deletions(-) + +diff --git a/ash/strings/ash_strings_mn.xtb b/ash/strings/ash_strings_mn.xtb +index 18ea3f5ec598..eb78743a3d1d 100644 +--- a/ash/strings/ash_strings_mn.xtb ++++ b/ash/strings/ash_strings_mn.xtb +@@ -7,7 +7,7 @@ + Дэлгэцийн видео бичлэгийн хэрэгсэл + Хэсэгчилсэн дэлгэцийн агшныг сонгосон + Өөрийн -г хадгалах уу? +-Мэдрэгч үзэгний батерей бага байна ++Мэдрэгч үзэгний батарей бага байна + Мэдэгдлүүдийг удирдахын тулд Тохиргоо руу очно уу + Би танд өдрийн турш туслахад бэлэн Google Туслах тань байна! + Эхлүүлэхийн тулд та эдгээр зүйлээс хийж үзэх боломжтой. +@@ -668,7 +668,7 @@ + Таны утас ойролцоо бөгөөд Bluetooth-г нь асаасан эсэхийг шалгана уу. + Цэнэг дүүрсэн байна. + Босоо +-Батерей % ++Батарей % + Хүчтэй + Хүлээн зөвшөөрөх + Энэ хаягийг хариуцсан ажилтан нь олон хаягаар зэрэг нэвтрэх тохиолдолд зөвхөн энэ хаягаар түрүүлж нэвтэрсний дараагаар бусад хаягт нэвтрэх боломжтой байхаар тохируулсан байна. +diff --git a/chrome/app/resources/chromium_strings_te.xtb b/chrome/app/resources/chromium_strings_te.xtb +index 6cd93063385f..2488072014b7 100644 +--- a/chrome/app/resources/chromium_strings_te.xtb ++++ b/chrome/app/resources/chromium_strings_te.xtb +@@ -36,7 +36,7 @@ + ఇది ఈ పరికరం నుండి 1 అంశాన్ని తొలగిస్తుంది. మీ డేటాను తర్వాత తిరిగి పొందడానికి, Chromiumకు లాగా సైన్ ఇన్ చేయండి. + డేటా ఉల్లంఘనల నుండి, ఇతర భద్రతా సమస్యల నుండి మీ ఇతర పాస్‌వర్డ్‌లు సురక్షితంగా ఉన్నాయో లేదో చెక్ చేయడానికి, Chromiumకు సైన్ ఇన్ చేయండి. + Google సర్వీస్‌లలో మరింత వ్యక్తిగతీకరించిన అనుభవం కోసం Chromium హిస్టరీని చేర్చాలో, లేదో ఎంచుకోండి +-Chromiumను అనుకూలంగా మార్చు ++Chromiumను అనుకూలంగా మార్చండి + Chromium - నెట్‌వర్క్ సైన్ ఇన్ - + మీరు కంప్యూటర్‌ను షేర్‌ చేస్తే, స్నేహితులు, కుటుంబ సభ్యులు విడివిడిగా బ్రౌజ్ చేయవచ్చు. Chromiumను వారికి నచ్చిన రీతిలో సెటప్ చేసుకోవచ్చు. + Chromiumలో స్టోర్ చేయబడిన సురక్షితం కాని సైట్‌ల లిస్ట్‌తో కూడిన URLలను చెక్ చేస్తుంది. ఏదైనా సైట్ మీ పాస్‌వర్డ్‌ను దొంగిలించే ప్రయత్నం చేసినా, లేదంటే ఏదైనా హానికరమైన ఫైల్‌ను మీరు డౌన్‌లోడ్ చేసినా, సదరు URLలను, ఆయా పేజీల కంటెంట్‌లోని కొన్ని భాగాలను కూడా Chromium, 'సురక్షిత బ్రౌజింగ్'కు పంపవచ్చు. +diff --git a/chrome/app/resources/generated_resources_ky.xtb b/chrome/app/resources/generated_resources_ky.xtb +index 47ae70643bb0..715404a4a6d7 100644 +--- a/chrome/app/resources/generated_resources_ky.xtb ++++ b/chrome/app/resources/generated_resources_ky.xtb +@@ -6862,7 +6862,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу + , анын астындагы бардык сайттардагы, ошондой эле орнотулган колдонмолордогу сайтка тиешелүү маалыматтар жана уруксаттар тазалансынбы? + Айрым сайттардын көрүнүшүн чоңойтуу же кичирейтүү функциясын колдоно аласыз + Шилтемени төмөнкү менен бөлүшүү: +-Кайда сакталаарын тандаңыз ++Кайда сакталарын тандаңыз + Басып чыгаруу таржымалыңызды көрүү + Сырсөз уурдалды + Башка аракеттерди дайындоо үчүн жаңы которгучту же баскычтоптогу баскычты таптап коюңуз. +diff --git a/chrome/app/resources/generated_resources_mn.xtb b/chrome/app/resources/generated_resources_mn.xtb +index 58836e6a0de1..a277cff23049 100644 +--- a/chrome/app/resources/generated_resources_mn.xtb ++++ b/chrome/app/resources/generated_resources_mn.xtb +@@ -1123,7 +1123,7 @@ + {NUM_EXTENSIONS,plural, =1{Өргөтгөлийг суулгахын тулд товшино уу}other{Эдгээр өргөтгөлийг суулгахын тулд товшино уу}} + Таны төхөөрөмж эсвэл сонгосон нөөцлөлтийн байршилд хангалттай сул хадгалах сан байхгүй байж магадгүй. Сул зай гаргах эсвэл өөр байршил сонгож үзнэ үү. + эсвэл үүнээс цөөн тэмдэгт ашиглана уу +-% батерей ++% батарей + Танд tap-to-click болон чирэлтийг товшихыг идэвхжүүлэх/идэвхгүй болгохыг зөвшөөрдөг + Энэ нэмэлт өргөтгөлийг нуух + Дунд (санал болгосон) +diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb +index ccce07a85680..bccf4999244f 100644 +--- a/chrome/app/resources/generated_resources_te.xtb ++++ b/chrome/app/resources/generated_resources_te.xtb +@@ -665,7 +665,7 @@ + రీస్టార్ట్ చేసి, కొనసాగించు + మీ Google ఖాతాలో పాస్‌వర్డ్ స్టోర్ చేయబడింది + కత్తిరింపు టూల్ +-మీ కీబోర్డ్ పునరావృత రేటు, పద సూచన మొదలైనవి సర్దుబాటు చేయడానికి మిమ్మల్ని అనుమతిస్తుంది ++మీ కీబోర్డ్ రిపీట్ రేటు, పద సూచన మొదలైనవి సర్దుబాటు చేయడానికి మిమ్మల్ని అనుమతిస్తుంది + ప్రారంభ అక్షరం వెడల్పు నిండింది + Google Assistantను డిజేబుల్ చేయండి + మీరు ఇప్పటికే ఈ పాస్‌వర్డ్‌ను లో మార్చారా? +@@ -1588,7 +1588,7 @@ + {NUM_TABS,plural, =1{ - 1 ట్యాబ్}other{ - # ట్యాబ్‌లు}} + వర్చువల్ మెషీన్ స్టేటస్ + మీ వద్ద సేవ్ చేసిన ప్రింటర్‌లు ఏవీ లేవు. +-స్పెల్ చెక్‌ను అనుకూలంగా మార్చు ++స్పెల్ చెక్‌ను అనుకూలంగా మార్చండి + ఫైల్ షేర్ URL + మద్దతు లేని ఎక్స్‌టెన్షన్‌లు నిలిపివేయబడ్డాయి + నలుపు (ఆటోమేటిక్ సెట్టింగ్) +@@ -2213,7 +2213,7 @@ + మీ ఫోన్‌తో కనెక్షన్‌ను ఏర్పాటు చేయడం మాకు సాధ్యపడలేదు. మీ ఫోన్ సమీపంలోనే ఉండి, అలాగే బ్లూటూత్, Wi-Fi ఆన్ చేయబడి ఉందని నిర్ధారించుకోండి. + సైట్‌లు సౌండ్‌ను ప్లే చేయగలవు + ట్యాబ్ మూసివేత ప్ర‌తిస్పంద‌న‌. +-కీబోర్డ్ పునరావృత ప్రతిస్పందన సమయం ++కీబోర్డ్ రిపీట్ ప్రతిస్పందన సమయం + యాప్‌ను ఇన్‌స్టాల్ చేయాలా? + ఈ ప్లగ్ఇన్‌ను అమలు చేయి + మీరు కొత్త ట్యాబ్‌ను తెరవడానికి ఇక్కడ క్లిక్ చేయవచ్చు +@@ -2515,7 +2515,7 @@ + , + ఈ సైట్ కోసం పాస్‌వర్డ్‌లు సేవ్ చేయబడలేదు + స్క్రీన్ సేవర్‌ను ఎనేబుల్ చేయి +-ఫాంట్‌లను అనుకూలంగా మార్చు ++ఫాంట్‌లను అనుకూలంగా మార్చండి + ... + వర్చువల్ రియాలిటీ పరికరాలను, అలాగే డేటాను ఉపయోగించడానికి అనుమతించబడింది + భాష లేదా ఇన్‌పుట్ పేరు ఆధారంగా సెర్చ్ చేయండి +@@ -3089,7 +3089,7 @@ + సర్టిఫికెట్ జారీ చేసినవారి ప్రత్యామ్నాయ పేరు + ఎల్లప్పుడూ భాషలోది అనువదించు + విక్రేత నుండి అందించే పరికరాలు +-ఆటోమేటిక్‌గా పునరావృతం చేయడాన్ని ప్రారంభించు ++ఆటోమేటిక్‌గా రిపీట్‌ చేయడాన్ని ప్రారంభించు + ఈ ప్రోగ్రామ్‌కు యాక్సెస్‌ను దాచడానికి, మీరు దీన్ని నియంత్రణ ప్యానెల్‌లోని + ను ఉపయోగించి అన్‌ఇన్‌స్టాల్ చేయాలి. + +@@ -3763,7 +3763,7 @@ + మరో పరికరం నుండి కొనసాగించండి + Linux కంటెయినర్ సెటప్ పూర్తి కాలేదు. దయచేసి మళ్లీ ప్రయత్నించండి. + ప్రొఫైల్‌ను తెరవు +-కార్డ్‌లను అనుకూలంగా మార్చు ++కార్డ్‌లను అనుకూలంగా మార్చండి + "" యొక్క వెర్షన్ కనీసం "" ఉండాలని ఎక్స్‌టెన్షన్ కోరుతోంది, కానీ "" వెర్షన్ మాత్రమే ఇన్‌స్టాల్ చేయబడి ఉంది + Google Driveలో బ్యాకప్ చేయండి. సులభంగా డేటాను పునరుద్ధరించండి లేదా ఏ సమయంలో అయినా పరికరాన్ని మార్చండి. ఈ బ్యాకప్‌లో యాప్ డేటా కూడా ఉంటుంది. బ్యాకప్‌లు Googleకు అప్‌లోడ్ అవుతాయి, మీ చిన్నారి Google ఖాతా పాస్‌వర్డ్‌ను ఉపయోగించి ఎన్‌క్రిప్ట్ చేయబడతాయి. + పని కోసం లేదా వ్యక్తిగత వినియోగం కోసం ఈ పరికరాన్ని సెటప్ చేయండి +@@ -5659,7 +5659,7 @@ + కొనసాగించబడుతోంది… + గమనిక: డేటా సేకరణ వలన పనితీరు తగ్గవచ్చు, అందువల్ల‌ మీరు చేస్తున్నది మీకు తెలిసినప్పుడు లేదా ఇలా చేయాలని మీకు చెప్పినప్పుడు మాత్రమే ప్రారంభించండి. + ఈ సైట్ మీ మోషన్ సెన్సార్‌లను యాక్సెస్ చేయనీయకుండా బ్లాక్ చేయబడింది. +-పునరావృత రేటు ++రిపీట్ రేటు + Mac సిస్టమ్ ప్రాధాన్యతలలో మైక్రోఫోన్‌ ఆఫ్ చేయబడింది + అప్‌గ్రేడ్ సమాచారా వివరాల కోసం, Files > నా ఫైల్స్ > అనే సెట్టింగ్‌లో లాగ్స్ సేవ్ చేయబడతాయి + కనీసం 512 MB స్థలాన్ని ఖాళీగా ఉంచండి, లేదంటే పరికరం ఇక స్పందించదు. స్థలాన్ని ఖాళీ చేయడానికి, పరికర నిల్వ నుండి ఫైళ్లను తొలగించండి. +@@ -8090,7 +8090,7 @@ + ప్రారంభిస్తోంది... + మీ తల్లి/తండ్రికి వారి Google Family Link యాప్‌నకు, అలాగే families.google.comకు ఒక అప్రూవల్ రిక్వెస్ట్ పంపబడింది. ఒకవేళ మీ తల్లి/తండ్రి ఆ రిక్వెస్ట్‌ను ఆమోదిస్తే, మీకు నోటిఫికేషన్ వస్తుంది. + రీడర్‌లో తెరవండి +-ప్రొఫైల్‌ను అనుకూలంగా మార్చు ++ప్రొఫైల్‌ను అనుకూలంగా మార్చండి + JavaScript మెమరీ + త్వరిత సమాధానాల యూనిట్ మార్పిడి + మీరు ఒకసారి ఒక ఫైల్‌ను మాత్రమే షేర్ చేయగలరు. ప్రస్తుత బదిలీ పూర్తయినప్పుడు మీరు మళ్లీ ట్రై చేయండి. +diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb +index 0cc9b784386d..fe3bffd76d5d 100644 +--- a/chrome/app/resources/generated_resources_zh-CN.xtb ++++ b/chrome/app/resources/generated_resources_zh-CN.xtb +@@ -7487,7 +7487,7 @@ + 请将 Google Cast 发生的情况告诉我们。 + 包括此网站上的第三方 Cookie + 如果此 Web 应用试图诱骗您认为它是另一款应用，请卸载它。 +-由贵单位管理 ++由贵组织管理 + 一旦您登录，系统便会存储一个独一无二的身份验证令牌，并会使用它保存今后所有符合条件的下载内容。 + 此设备不支持该网站要求使用的安全密钥的类型 + 只需为此标签页添加书签，便可在需要时快速返回到此处 +diff --git a/chrome/app/resources/google_chrome_strings_te.xtb b/chrome/app/resources/google_chrome_strings_te.xtb +index 6945de13ae9e..0e82c63e3572 100644 +--- a/chrome/app/resources/google_chrome_strings_te.xtb ++++ b/chrome/app/resources/google_chrome_strings_te.xtb +@@ -367,7 +367,7 @@ + మీ మార్పులను వర్తింపజేయడానికి, Chromeని పునఃప్రారంభించండి + గత కొన్ని వారాల మీ బ్రౌజింగ్ హిస్టరీ ఆధారంగా Chrome మీ ఆసక్తులను అంచనా వేయగలదు. ఈ సమాచారం మీ పరికరంలో ఉంటుంది. + సింక్‌ను ప్రారంభించడానికి Chromeను అప్‌డేట్ చేయాలి +-Chromeను అనుకూలంగా మార్చు ++Chromeను అనుకూలంగా మార్చండి + ChromeOS Flexను రీస్టార్ట్ చేయండి + మీ అన్ని పరికరాలలో మీ Chrome సంబంధిత అంశాలను యాక్సెస్ చేయడానికి, సైన్ ఇన్ చేసి, ఆపై సింక్‌ను ఆన్ చేయండి. + మీ డిఫాల్ట్ బ్రౌజర్ Google Chrome +diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_ml.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_ml.xtb +index dfae3919ee18..d7ba94ea8ae0 100644 +--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_ml.xtb ++++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_ml.xtb +@@ -136,7 +136,7 @@ + ലാൻഡ്‌സ്‌കേപ്പ് + പേജില്‍ കണ്ടുപിടിക്കുക + നിര +-സജീവമാക്കാൻ രണ്ട് തവണ ടാപ്പ് ചെയ്യുക ++സജീവമാക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യുക + Bluetooth ബ്രെയ്‌ലി ഡിസ്‌പ്ലേ + നാല് വിരലുകൾ ഉപയോഗിച്ച് സ്‌ക്രീനിൽ ടാപ്പ് ചെയ്യുന്നത് ChromeVox മെനുകൾ തുറക്കുകയും അടയ്ക്കുകയും ചെയ്യും. ഈ മെനുകളിൽ കമാൻഡുകളെയും കുറുക്കുവഴികളെയും കുറിച്ചുള്ള സഹായകരമായ വിവരങ്ങൾ അടങ്ങിയിരിക്കുന്നു. മെനുകൾ തുറന്ന് കഴിയുമ്പോൾ, ഒരു വിരൽ ഉപയോഗിച്ച് സ്വൈപ്പ് ചെയ്ത് ഇനങ്ങളിലൂടെ നാവിഗേറ്റ് ചെയ്യാനും ഡബിൾ ടാപ്പ് ചെയ്ത് ഇനങ്ങൾ സജീവമാക്കാനും നിങ്ങൾക്ക് കഴിയും. തുടരാൻ, നാല് വിരലുകൾ ഉപയോഗിച്ച് സ്ക്രീനിൽ ടാപ്പ് ചെയ്യുക. + വാചകത്തിന്റെ അവസാനം +@@ -228,7 +228,7 @@ + അടിസ്ഥാന നാവിഗേഷൻ + ഗ്രൂപ്പ് + അരികിൽ +-എഡിറ്റിംഗ് ആരംഭിക്കാൻ രണ്ടുതവണ ടാപ്പ് ചെയ്യുക ++എഡിറ്റിംഗ് ആരംഭിക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യുക + വ്യാകരണ പിശക് + ഒരു പ്രതീകം മുന്നോട്ട് നീക്കുക + ചേർക്കുക +@@ -408,7 +408,7 @@ + കടപ്പാട് + നിങ്ങൾക്ക് ക്ലിക്ക് ചെയ്യേണ്ട ഇനത്തിൽ എത്തിയെങ്കിൽ, തിരയൽ + സ്‌പെയ്‌സ് അമർത്തുക. തുടരാൻ അത് ഇപ്പോൾ പരീക്ഷിച്ചുനോക്കൂ. + ഓഡിയോ +-ഒരു വിരൽ ഉപയോഗിച്ച് രണ്ടുതവണ ടാപ്പ് ചെയ്യുക ++ഒരു വിരൽ ഉപയോഗിച്ച് ഡബിൾ ടാപ്പ് ചെയ്യുക + {COUNT,plural, =1{ബാക്ക്‌ടിക്ക്}other{# ബാക്ക്‌ടിക്കുകൾ}} + chkmnuitm + {COUNT,plural, =1{ഡോളർ}other{# ഡോളർ ചിഹ്നങ്ങൾ}} +@@ -874,7 +874,7 @@ + Coral + ടീൽ നിറം + തെളിച്ചം കൂട്ടുക +-ഫോക്കസ് ചെയ്‌തിരിക്കുന്ന ഇനം സജീവമാക്കാൻ ഇരട്ട ടാപ്പ് ചെയ്യുക ++ഫോക്കസ് ചെയ്‌തിരിക്കുന്ന ഇനം സജീവമാക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യുക + സ്വിച്ച് ആക്‌സസ് + ഒരു വിരൽ ഉപയോഗിച്ച് ഇടത്തോട്ടും വലത്തോട്ടും സ്വൈപ്പ് ചെയ്യുന്നതിനേക്കാൾ ഇത് കൂടുതൽ കാര്യക്ഷമമാകും. + നവാജോ വൈറ്റ് +diff --git a/components/strings/components_strings_te.xtb b/components/strings/components_strings_te.xtb +index b6930dce3e96..fc2af3c61755 100644 +--- a/components/strings/components_strings_te.xtb ++++ b/components/strings/components_strings_te.xtb +@@ -901,7 +901,7 @@ + పికప్ పద్ధతి + బట్వాడా అడ్రస్‌ + ఈ సైట్‌ను లోడ్ చేయడానికి ఉపయోగించిన కనెక్షన్ TLS 1.0 లేదా TLS 1.1ను ఉపయోగించింది, ఇవి విస్మరించబడ్డాయి, భవిష్యత్తులో నిలిపివేయబడతాయి. ఒక సారి నిలిపివేయబడితే, యూజర్‌లు ఈ సైట్‌ను లోడ్ చేయకుండా నివారించబడతారు. సర్వర్ TLS 1.2 లేదా ఆపై వెర్షన్‌లను ఎనేబుల్ చేయాలి. +-ఫాంట్‌లను అనుకూలంగా మార్చు ++ఫాంట్‌లను అనుకూలంగా మార్చండి + భద్రతా సెట్టింగ్‌లను మేనేజ్ చేయండి + పరిమాణం: + మీరు అప్‌లోడ్ లేదా జోడించిన ఫైల్స్ Google క్లౌడ్ లేదా థర్డ్ పార్టీలకు విశ్లేషణ కోసం పంపబడతాయి. ఉదాహరణకు, వాటిని సున్నితమైన వ్యక్తిగత సమాచారం లేదా మాల్‌వేర్ కోసం స్కాన్ చేయబడవచ్చు. +@@ -909,7 +909,7 @@ + ని ప్రస్తుతం చేరుకోవడం సాధ్యపడదు. + సిస్టమ్ పేర్కొన్నవి + అనుమతించు (డిఫాల్ట్) +-&సవరించడాన్ని పునరావృతం చేయి ++&సవరించడాన్ని రిపీట్‌ చేయి + మీరు మీ పాస్‌వర్డ్‌ని ఇతర సైట్‌లలో తిరిగి ఉపయోగించినట్లయితే దీనిని రీసెట్ చేయాల్సిందిగా Chromium సిఫార్సు చేస్తోంది. + DnsOverHttpsTemplates సర్వర్ టెంప్లేట్‌ URIలు చెల్లవు, ఉపయోగించబడవు. + ఈ కార్డ్‌ను ఈ పరికరానికి సేవ్ చేయి +@@ -959,7 +959,7 @@ + జిమ్నాస్టిక్స్ + ఈ పేజీ సిద్ధమైనప్పుడు Chrome మీకు తెలియజేస్తుంది. <a>రద్దు చేయి</a> + పేరు జోడించండి +-&తరలించడాన్ని పునరావృతం చేయి ++&తరలించడాన్ని రిపీట్‌ చేయి + దిగువ భాగంలో రెండు రంధ్రాలు + వివరాలను దాచిపెట్టు + మధ్యలో +@@ -1167,7 +1167,7 @@ + టైమ్‌షేర్‌లు & వెకేషన్ ప్రాపర్టీలు + + మీ కార్డ్‌ను ప్రస్తుతం సేవ్ చేయలేము +-&తరలించడాన్ని పునరావృతం చేయి ++&తరలించడాన్ని రిపీట్‌ చేయి + ఫిఫ్త్ రోల్ + ఫైర్‌వాల్ మరియు యాంటీవైరస్ కాన్ఫిగరేషన్‌లను తనిఖీ చేయడం + పెద్దది +@@ -1653,7 +1653,7 @@ + పరికరాలను కనుగొంటోంది... + ఇటాలియన్ + సివిల్ ఇంజినీరింగ్ +-&సవరించడాన్ని పునరావృతం చేయి ++&సవరించడాన్ని రిపీట్‌ చేయి + కామెడీ సినిమాలు + B6/C4 (ఎన్వలప్) + ఈ కంటెంట్ మీ సమాచారాన్ని దొంగిలించగల లేదా తొలగించగల హానికరమైన సాఫ్ట్‌వేర్‌ను మీ పరికరంలో ఇన్‌స్టాల్ చేయడానికి ప్రయత్నించవచ్చు. ఏదేమైనా చూపు +@@ -1771,7 +1771,7 @@ + సిమ్యులేషన్ గేమ్‌లు + కు గల మీ కనెక్షన్ వాడుకలో లేని సైఫర్ సూట్ ఉపయోగించి ఎన్‌క్రిప్ట్ చేయ‌బ‌డింది. + భద్రతా ఈవెంట్‌లను Chrome ద్వారా ఫ్లాగ్ చేసినప్పుడు, ఈవెంట్‌లకు సంబంధించిన డేటా మీ అడ్మినిస్ట్రేటర్‌కు పంపబడుతుంది. ఇందులో మీరు Chromeలో వెళ్లిన పేజీల URLలు, ఫైల్ పేర్లు లేదా మెటాడేటా, ఇంకా వెబ్ ఆధారితమైన యాప్‌లు, మీ పరికరం, అలాగే Chromeకు సైన్ ఇన్ చేయడానికి మీరు ఉపయోగించే యూజర్‌నేమ్ ఉండవచ్చు. +-&జోడించడాన్ని పునరావృతం చేయి ++&జోడించడాన్ని రిపీట్‌ చేయి + టీవీ రియాలిటీ షోలు + భౌతిక శాస్త్రం + జత చేయి +@@ -1913,7 +1913,7 @@ + ప్రింట్ కంపోజిటర్ సేవ + , Chromeలో మీరు డౌన్‌లోడ్ చేసిన ఫైల్‌లను మేనేజ్ చేయడానికి Tabను నొక్కి, ఆపై Enterను నొక్కండి + ఈ పేజీని తెరవడానికి తగినంత మెమరీ లేదు +-&మళ్లీ క్రమం చేయడాన్ని పునరావృతం చేయి ++&మళ్లీ క్రమం చేయడాన్ని రిపీట్‌ చేయి + బుక్‌మార్క్‌లు + భద్రతకు తిరిగి వెళ్ళు + పాలసీ విలువను కాపీ చేయి +@@ -2008,7 +2008,7 @@ + ధృవీకరించు + యాక్టివ్‌గా లేదు + సెవెంత్ రోల్ +-&తొలగించడాన్ని పునరావృతం చేయి ++&తొలగించడాన్ని రిపీట్‌ చేయి + కరెన్సీలు & విదేశీ మారకం + మ్యూచువల్ ఫండ్‌లు + బ్లూటూత్ స్కానింగ్ +@@ -2114,7 +2114,7 @@ + ప్రస్తుతం ఈ కార్డ్‌ని ధృవీకరించడం సాధ్యపడదు + వ్యక్తిగత రుణాలు + టాప్ ట్రే +-&జోడించడాన్ని పునరావృతం చేయి ++&జోడించడాన్ని రిపీట్‌ చేయి + కొత్త Google డాక్‌ను త్వరగా క్రియేట్ చేయండి + సురక్షిత పేమెంట్ ఆధారాల ప్రామాణీకరణ షీట్ మూయబడింది + పరిమాణం 1 +@@ -2278,7 +2278,7 @@ + కనెక్షన్ సహాయం + "" విభాగాన్ని దాచు + పరికర స్థానిక ఖాతా భర్తీ +-&మళ్లీ క్రమం చేయడాన్ని పునరావృతం చేయి ++&మళ్లీ క్రమం చేయడాన్ని రిపీట్‌ చేయి + మీ కెమెరాను ఉపయోగించడానికి సైట్ అనుమతి అడగవచ్చు + మరిన్ని వరుసలను చూపించు + వర్చువల్ కార్డ్ నంబర్‌ను పూరించలేదా? కాపీ చేయడం కోసం కార్డ్ వివరాలను క్లిక్ చేయండి. +@@ -2379,7 +2379,7 @@ + మీరు నిర్ధారించిన తర్వాత, మీ కార్డ్ వివరాలు ఈ సైట్‌తో షేర్ చేయబడతాయి. + ఈ ఫారమ్ సురక్షిత కనెక్షన్‌ను ఉపయోగించనందున క్రెడిట్ కార్డ్ వివరాలను ఆటోమేటిక్‌గా పూర్తి చేయడం ఆపివేయబడింది. + కనెక్షన్ ఎర్రర్‌లను పరిష్కరించండి +-ఈ వెబ్‌పేజీ సరిగ్గా ప్రదర్శించబడటానికి మీరు మునుపు నమోదు చేసిన డేటా అవసరం. మీరు ఈ డేటాను మళ్లీ పంపవచ్చు. కానీ అలా చేయడం వ‌ల్ల‌ ఈ పేజీ మునుపు ప్రదర్శించిన ఏదైనా చర్య పునరావృతం కావచ్చు. ++ఈ వెబ్‌పేజీ సరిగ్గా ప్రదర్శించబడటానికి మీరు మునుపు నమోదు చేసిన డేటా అవసరం. మీరు ఈ డేటాను మళ్లీ పంపవచ్చు. కానీ అలా చేయడం వ‌ల్ల‌ ఈ పేజీ మునుపు ప్రదర్శించిన ఏదైనా చర్య రిపీట్‌ కావచ్చు. + మీ పరికరం వినియోగదారు పేరు మరియు Chrome వినియోగదారు పేరు + ట్రావెల్ బీమా + ట్రయల్ యాక్టివ్‌గా ఉంది +@@ -2629,7 +2629,7 @@ + కంట్రీ మ్యూజిక్ + అభిరుచులు & కాలక్షేపం + కొత్త అజ్ఞాత ట్యాబ్‌లో పేజీని తెరవండి +-మీరు వెతికే పేజీ మీరు ఎంటర్ చేసిన సమాచారాన్ని ఉపయోగించుకుంది. ఆ పేజీకి తిరిగి వెళ్ల‌డం ద్వారా మీరు చేసిన ఏ చర్య అయినా పునరావృతం చేయ‌వలసి వస్తుంది. మీరు కొనసాగాలని అనుకుంటున్నారా? ++మీరు వెతికే పేజీ మీరు ఎంటర్ చేసిన సమాచారాన్ని ఉపయోగించుకుంది. ఆ పేజీకి తిరిగి వెళ్ల‌డం ద్వారా మీరు చేసిన ఏ చర్య అయినా రిపీట్‌ చేయ‌వలసి వస్తుంది. మీరు కొనసాగాలని అనుకుంటున్నారా? + ఈ సైట్‌లో బ్లాక్ చేయి + కొనసాగు + రద్దుచేయి +@@ -2803,7 +2803,7 @@ + సురక్షిత పేమెంట్ ఆధారాల ప్రామాణీకరణ షీట్ తెరవబడింది + A4 + మోటారుసైకిళ్లు +-&తొలగించడాన్ని పునరావృతం చేయి ++&తొలగించడాన్ని రిపీట్‌ చేయి + మీరు మీ ఖాతాకు యాక్సెస్‌ను కోల్పోవచ్చు. లేదా గుర్తింపు స‌మాచారం చోరీకి గురి కావచ్చు. మీ పాస్‌వర్డ్‌ను ఇప్పుడే రీసెట్ చేయాల్సిందిగా Chromium సిఫార్సు చేస్తోంది. + మైక్రోఫోన్ + , మీ బ్రౌజర్‌లో Chrome Enterprise కనెక్టర్‌లను ఆన్ చేసింది. ఈ కనెక్టర్‌లకు మీ డేటాలో కొంత డేటాకు యాక్సెస్ ఉంది. +@@ -2963,7 +2963,7 @@ + కనిపించే తీరును అనుకూలంగా మార్చండి + ఒక అప్లికేషన్ కారణంగా Chrome ఈ సైట్‌కు సురక్షితంగా కనెక్ట్ కాలేకపోతోంది + ఇమేజ్‌లు +-Chromeను అనుకూలంగా మార్చు ++Chromeను అనుకూలంగా మార్చండి + డైనర్స్ క్లబ్ + ఫారమ్‌ను తీసివేయండి + సూపర్-B +diff --git a/ios/chrome/app/strings/resources/ios_strings_ml.xtb b/ios/chrome/app/strings/resources/ios_strings_ml.xtb +index 5a7b4111c8a4..5f2f3d8a8c47 100644 +--- a/ios/chrome/app/strings/resources/ios_strings_ml.xtb ++++ b/ios/chrome/app/strings/resources/ios_strings_ml.xtb +@@ -51,7 +51,7 @@ + ചിത്രം സംരക്ഷിക്കുന്നതിൽ പിശക്. + അദൃശ്യ മോഡ് ഉപയോഗിക്കാൻ നിങ്ങളുടെ സ്ഥാപനം ആവശ്യപ്പെടുന്നു + ഇല്ലാതാക്കുക +-പാരന്റ് ഫോൾഡർ മാറ്റാൻ രണ്ടുതവണ ടാപ്പ് ചെയ്യുക. ++പാരന്റ് ഫോൾഡർ മാറ്റാൻ ഡബിൾ ടാപ്പ് ചെയ്യുക. + മെനു അടയ്‌ക്കുക + നിങ്ങൾ പകർത്തിയ ലിങ്ക് സന്ദർശിക്കുക + സൈൻ ഔട്ട് ചെയ്‌ത് സമന്വയം ഓഫാക്കണോ? +@@ -67,7 +67,7 @@ + പാസ്‍വേഡ് അദൃശ്യമാക്കുക + ഇനങ്ങൾ + കോൺഫിഗറേഷൻ പ്രൊഫൈൽ ഡൗൺലോഡ് ചെയ്യാൻ ഈ വെബ്സൈറ്റ് ശ്രമിക്കുന്നു. +-ക്രമീകരണം മാറ്റാൻ രണ്ടുതവണ ടാപ്പ് ചെയ്യുക ++ക്രമീകരണം മാറ്റാൻ ഡബിൾ ടാപ്പ് ചെയ്യുക + ഈ സൈറ്റിനായി നിങ്ങൾ ഇതിനകം തന്നെ ഈ ഉപയോക്തൃനാമം സംരക്ഷിച്ചു + ഫോട്ടോകളെടുത്ത് അപ്‌ലോഡ് ചെയ്യാനും QR കോഡുകൾ സ്‌കാൻ ചെയ്യാനും ഇത് നിങ്ങളെ അനുവദിക്കുന്നു + വെബ്‌സൈറ്റിലേക്ക് സൈൻ ഇൻ ചെയ്യുക +@@ -101,7 +101,7 @@ + ഇനങ്ങളൊന്നുമില്ല + സമന്വയം ഓണാണ് + തിരഞ്ഞെടുത്തു +-ഇൻസ്‌റ്റാൾ ചെയ്യാൻ രണ്ടുതവണ ടാപ്പ് ചെയ്യുക. ++ഇൻസ്‌റ്റാൾ ചെയ്യാൻ ഡബിൾ ടാപ്പ് ചെയ്യുക. + സംരക്ഷിച്ച പാസ്‌വേഡുകള്‍ + കൂടുതൽ‍ സന്ദര്‍ശിച്ചത് + കാർഡ് ഉടമയുടെ പേര് +diff --git a/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb b/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb +index 4c6b66623eb7..aace2b76470a 100644 +--- a/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb ++++ b/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb +@@ -865,7 +865,7 @@ + 新搜索 + 轻触并按住可查看更多的标签页选项 + 全部关闭 +-由贵单位管理 ++由贵组织管理 + 重置 + 未找到任何用于此网站的密码 + 所用登录身份 +diff --git a/ui/chromeos/translations/ui_chromeos_strings_te.xtb b/ui/chromeos/translations/ui_chromeos_strings_te.xtb +index 7093b4618657..808afe88fc4e 100644 +--- a/ui/chromeos/translations/ui_chromeos_strings_te.xtb ++++ b/ui/chromeos/translations/ui_chromeos_strings_te.xtb +@@ -834,7 +834,7 @@ + రొమేనియన్ + వ్యక్తిగత అన్‌బ్లాకింగ్ కీ(PUK)ని ఎంటర్ చేయండి + ను సంగ్రహిస్తోంది… +-పునరావృతం చేయి ++రిపీట్‌ చేయి + డౌన్‌లోడ్ చేయి, + నాతో షేర్ చేసినవి + చల్లటి నీరు +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/chromium-upstream-patches/0058-Incrementing-VERSION-to-102.0.5005.148.patch b/srcpkgs/electron19/files/chromium-upstream-patches/0058-Incrementing-VERSION-to-102.0.5005.148.patch new file mode 100644 index 000000000000..875c94f3c9d5 --- /dev/null +++ b/srcpkgs/electron19/files/chromium-upstream-patches/0058-Incrementing-VERSION-to-102.0.5005.148.patch @@ -0,0 +1,28 @@ +From 975dd790f0a8f62d54d2a4c1a58833c81f0e1742 Mon Sep 17 00:00:00 2001 +From: "Chrome Release Bot (LUCI)" + +Date: Sun, 3 Jul 2022 01:00:32 +0000 +Subject: [PATCH 58/59] Incrementing VERSION to 102.0.5005.148 + +Change-Id: I30a4cd488d75fef0c005dce94d0e429e3805d297 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3739746 +Bot-Commit: Chrome Release Bot (LUCI) +Cr-Commit-Position: refs/branch-heads/5005@{#1217} +Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} +--- + chrome/VERSION | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/VERSION b/chrome/VERSION +index 1e243e1ad602..408a45a0b648 100644 +--- a/chrome/VERSION ++++ b/chrome/VERSION +@@ -1,4 +1,4 @@ + MAJOR=102 + MINOR=0 + BUILD=5005 +-PATCH=147 ++PATCH=148 +-- +2.37.0 + diff --git a/srcpkgs/electron19/files/musl-patches/chromium-musl-hacks.patch b/srcpkgs/electron19/files/musl-patches/chromium-musl-hacks.patch new file mode 100644 index 000000000000..1238970d4f80 --- /dev/null +++ b/srcpkgs/electron19/files/musl-patches/chromium-musl-hacks.patch @@ -0,0 +1,34 @@ +--- base/debug/stack_trace.cc.orig 2018-12-08 14:11:25.303475116 +0100 ++++ base/debug/stack_trace.cc 2018-12-08 18:00:43.874946999 +0100 +@@ -229,7 +229,7 @@ + } + std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { + std::stringstream stream; +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + OutputToStreamWithPrefix(&stream, prefix_string); + #endif + return stream.str(); +--- net/socket/udp_socket_posix.cc.orig 2019-07-03 13:13:46.034342649 -0400 ++++ net/socket/udp_socket_posix.cc 2019-07-03 13:23:53.117081909 -0400 +@@ -1194,7 +1194,7 @@ + msg_iov->push_back({const_cast(buffer->data()), buffer->length()}); + msgvec->reserve(buffers.size()); + for (size_t j = 0; j < buffers.size(); j++) +- msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0}); ++ msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0}); + int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0)); + SendResult send_result(0, 0, std::move(buffers)); + if (result < 0) { +--- base/debug/stack_trace.cc 2021-05-25 00:05:31.000000000 +0200 ++++ - 2021-05-27 13:46:43.740380140 +0200 +@@ -217,7 +217,9 @@ + } + + void StackTrace::OutputToStream(std::ostream* os) const { ++#if defined(__GLIBC__) + OutputToStreamWithPrefix(os, nullptr); ++#endif + } + + std::string StackTrace::ToString() const { diff --git a/srcpkgs/electron19/files/musl-patches/chromium-musl-libc++.patch b/srcpkgs/electron19/files/musl-patches/chromium-musl-libc++.patch new file mode 100644 index 000000000000..088d80fad52b --- /dev/null +++ b/srcpkgs/electron19/files/musl-patches/chromium-musl-libc++.patch @@ -0,0 +1,55 @@ +diff --git a/buildtools/third_party/libc++/trunk/include/locale b/buildtools/third_party/libc++/trunk/include/locale +index d29a2dc..53998bc 100644 +--- buildtools/third_party/libc++/trunk/include/locale ++++ buildtools/third_party/libc++/trunk/include/locale +@@ -11,6 +11,15 @@ + #ifndef _LIBCPP_LOCALE + #define _LIBCPP_LOCALE + ++// musl doesn't define _l (with locale) variants of functions, as it only supports UTF-8. ++// we can simply make macros that will call the non-localated ones if we're using musl, or rather not-using something that has the _l ones. ++// couldn't find anything glibc #defines when it creates strtoull_l (that it doesn't undefine a few lines later), so let's test against glibc and glibc-likes. ++// almost all glibc-likes define __GNU_LIBRARY__ for compatibility ++#ifndef __GNU_LIBRARY__ ++#define strtoull_l(A, B, C, LOC) strtoull(A,B,C) ++#define strtoll_l(A, B, C, LOC) strtoll(A,B,C) ++#endif ++ + /* + locale synopsis + +diff --git a/buildtools/third_party/libc++/trunk/src/locale.cpp b/buildtools/third_party/libc++/trunk/src/locale.cpp +index 4163c2c..3d1902a 100644 +--- a/buildtools/third_party/libc++/trunk/src/locale.cpp ++++ buildtools/third_party/libc++/trunk/src/locale.cpp +@@ -1028,11 +1028,11 @@ ctype::do_narrow(const char_type* low, const char_type* high, char dfault, + return low; + } + +-#if defined(__EMSCRIPTEN__) ++//#if defined(__EMSCRIPTEN__) + extern "C" const unsigned short ** __ctype_b_loc(); + extern "C" const int ** __ctype_tolower_loc(); + extern "C" const int ** __ctype_toupper_loc(); +-#endif ++//#endif + + #ifdef _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE + const ctype::mask* +@@ -1136,12 +1136,10 @@ ctype::classic_table() _NOEXCEPT + #elif defined(_AIX) + return (const unsigned int *)__lc_ctype_ptr->obj->mask; + #else +- // Platform not supported: abort so the person doing the port knows what to +- // fix +-# warning ctype::classic_table() is not implemented +- printf("ctype::classic_table() is not implemented\n"); +- abort(); +- return NULL; ++// not sure any other libc like this exists, but there is no way to differentiate musl as of right now ++// to be fair, with the change above, this should always work ++// also, #warning is a gcc extension ++ return (const unsigned long *)*__ctype_b_loc(); + #endif + } + #endif diff --git a/srcpkgs/electron19/files/musl-patches/chromium-musl-sandbox.patch b/srcpkgs/electron19/files/musl-patches/chromium-musl-sandbox.patch new file mode 100644 index 000000000000..230bb7bbd297 --- /dev/null +++ b/srcpkgs/electron19/files/musl-patches/chromium-musl-sandbox.patch @@ -0,0 +1,92 @@ +--- ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.orig 2019-07-03 11:53:21.213479736 -0400 ++++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2019-07-03 11:57:01.304998253 -0400 +@@ -140,31 +140,14 @@ + ResultExpr RestrictCloneToThreadsAndEPERMFork() { + const Arg flags(0); + +- // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2. +- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES | +- CLONE_SIGHAND | CLONE_THREAD | +- CLONE_SYSVSEM; +- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED; ++ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | ++ CLONE_THREAD | CLONE_SYSVSEM; ++ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | ++ CLONE_DETACHED; ++ const BoolExpr thread_clone_ok = (flags&~safe)==required; + +- const uint64_t kGlibcPthreadFlags = +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD | +- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID; +- const BoolExpr glibc_test = flags == kGlibcPthreadFlags; +- +- const BoolExpr android_test = +- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask, +- flags == kGlibcPthreadFlags); +- +- // The following two flags are the two important flags in any vfork-emulating +- // clone call. EPERM any clone call that contains both of them. +- const uint64_t kImportantCloneVforkFlags = CLONE_VFORK | CLONE_VM; +- +- const BoolExpr is_fork_or_clone_vfork = +- AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0, +- (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags); +- +- return If(IsAndroid() ? android_test : glibc_test, Allow()) +- .ElseIf(is_fork_or_clone_vfork, Error(EPERM)) ++ return If(thread_clone_ok, Allow()) ++ .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM)) + .Else(CrashSIGSYSClone()); + } + +--- ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.orig ++++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +@@ -494,6 +494,7 @@ + case __NR_mlock: + case __NR_munlock: + case __NR_munmap: ++ case __NR_mremap: + return true; + case __NR_madvise: + case __NR_mincore: +@@ -509,7 +510,6 @@ + case __NR_modify_ldt: + #endif + case __NR_mprotect: +- case __NR_mremap: + case __NR_msync: + case __NR_munlockall: + case __NR_readahead: +diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +index 80f02c0..21fbe21 100644 +--- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ++++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +@@ -373,6 +373,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { + #if defined(__i386__) + case __NR_waitpid: + #endif ++ case __NR_set_tid_address: + return true; + case __NR_clone: // Should be parameter-restricted. + case __NR_setns: // Privileged. +@@ -385,7 +386,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { + #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) + case __NR_set_thread_area: + #endif +- case __NR_set_tid_address: + case __NR_unshare: + #if !defined(__mips__) && !defined(__aarch64__) + case __NR_vfork: +--- sandbox/policy/linux/bpf_renderer_policy_linux.cc ++++ sandbox/policy/linux/bpf_renderer_policy_linux.cc +@@ -100,9 +100,9 @@ + case __NR_uname: + case __NR_sched_getparam: + case __NR_sched_getscheduler: ++ case __NR_sched_setscheduler: + return Allow(); + case __NR_sched_getaffinity: +- case __NR_sched_setscheduler: + return RestrictSchedTarget(GetPolicyPid(), sysno); + case __NR_prlimit64: + // See crbug.com/662450 and setrlimit comment above. diff --git a/srcpkgs/electron19/files/musl-patches/chromium-musl-tid-caching.patch b/srcpkgs/electron19/files/musl-patches/chromium-musl-tid-caching.patch new file mode 100644 index 000000000000..cec0ffd551f3 --- /dev/null +++ b/srcpkgs/electron19/files/musl-patches/chromium-musl-tid-caching.patch @@ -0,0 +1,81 @@ +--- ./sandbox/linux/services/namespace_sandbox.cc.orig ++++ ./sandbox/linux/services/namespace_sandbox.cc +@@ -209,6 +209,70 @@ + return base::LaunchProcess(argv, launch_options_copy); + } + ++#if defined(__aarch64__) || defined(__arm__) || defined(__powerpc__) ++#define TLS_ABOVE_TP ++#endif ++ ++struct musl_pthread ++{ ++ /* Part 1 -- these fields may be external or ++ * internal (accessed via asm) ABI. Do not change. */ ++ struct pthread *self; ++#ifndef TLS_ABOVE_TP ++ uintptr_t *dtv; ++#endif ++ struct pthread *prev, *next; /* non-ABI */ ++ uintptr_t sysinfo; ++#ifndef TLS_ABOVE_TP ++#ifdef CANARY_PAD ++ uintptr_t canary_pad; ++#endif ++ uintptr_t canary; ++#endif ++ ++/* Part 2 -- implementation details, non-ABI. */ ++ int tid; ++ int errno_val; ++ volatile int detach_state; ++ volatile int cancel; ++ volatile unsigned char canceldisable, cancelasync; ++ unsigned char tsd_used:1; ++ unsigned char dlerror_flag:1; ++ unsigned char *map_base; ++ size_t map_size; ++ void *stack; ++ size_t stack_size; ++ size_t guard_size; ++ void *result; ++ struct __ptcb *cancelbuf; ++ void **tsd; ++ struct { ++ volatile void *volatile head; ++ long off; ++ volatile void *volatile pending; ++ } robust_list; ++ int h_errno_val; ++ volatile int timer_id; ++ locale_t locale; ++ volatile int killlock[1]; ++ char *dlerror_buf; ++ void *stdio_locks; ++ ++ /* Part 3 -- the positions of these fields relative to ++ * the end of the structure is external and internal ABI. */ ++#ifdef TLS_ABOVE_TP ++ uintptr_t canary; ++ uintptr_t *dtv; ++#endif ++}; ++ ++void MaybeUpdateMuslTidCache() ++{ ++ pid_t real_tid = sys_gettid(); ++ pid_t* cached_tid_location = &reinterpret_cast(pthread_self())->tid; ++ *cached_tid_location = real_tid; ++} ++ + // static + pid_t NamespaceSandbox::ForkInNewPidNamespace(bool drop_capabilities_in_child) { + const pid_t pid = +@@ -226,6 +290,7 @@ + #if defined(LIBC_GLIBC) + MaybeUpdateGlibcTidCache(); + #endif ++ MaybeUpdateMuslTidCache(); + return 0; + } + diff --git a/srcpkgs/electron19/files/musl-patches/chromium-no-mallinfo.patch b/srcpkgs/electron19/files/musl-patches/chromium-no-mallinfo.patch new file mode 100644 index 000000000000..aaa4cebf84e9 --- /dev/null +++ b/srcpkgs/electron19/files/musl-patches/chromium-no-mallinfo.patch @@ -0,0 +1,95 @@ +--- base/trace_event/malloc_dump_provider.cc.orig ++++ base/trace_event/malloc_dump_provider.cc +@@ -174,7 +174,8 @@ + + #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ + (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ +- !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA)) ++ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA) && \ ++ !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))) + void ReportMallinfoStats(ProcessMemoryDump* pmd, + size_t* total_virtual_size, + size_t* resident_size, +--- base/trace_event/malloc_dump_provider.cc ++++ base/trace_event/malloc_dump_provider.cc +@@ -339,7 +339,7 @@ + &allocated_objects_count); + #elif BUILDFLAG(IS_FUCHSIA) + // TODO(fuchsia): Port, see https://crbug.com/706592. +-#else ++#elif defined(__GLIBC__) + ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size, + &allocated_objects_size, &allocated_objects_count); + #endif +--- base/process/process_metrics_posix.cc.orig ++++ base/process/process_metrics_posix.cc +@@ -105,7 +105,7 @@ + + #endif // !BUILDFLAG(IS_FUCHSIA) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) + namespace { + + size_t GetMallocUsageMallinfo() { +@@ -123,7 +123,7 @@ + } + + } // namespace +-#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || ++#endif // (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_ANDROID) + + size_t ProcessMetrics::GetMallocUsage() { +@@ -131,9 +131,9 @@ + malloc_statistics_t stats = {0}; + malloc_zone_statistics(nullptr, &stats); + return stats.size_in_use; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) + return GetMallocUsageMallinfo(); +-#elif BUILDFLAG(IS_FUCHSIA) ++#elif BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)) + // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. + return 0; + #endif +--- third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc.orig ++++ third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc +@@ -35,7 +35,7 @@ + + MemoryUsage GetMemoryUsage() { + MemoryUsage result; +-#ifdef __linux__ ++#if defined(__linux__) && defined(__GLIBC__) + rusage res; + if (getrusage(RUSAGE_SELF, &res) == 0) { + result.max_rss_kb = res.ru_maxrss; +--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc ++++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig +@@ -86,11 +86,11 @@ + } + + size_t Process::GetMallocUsage() { +-#if defined(HAVE_MALLINFO2) ++#if defined(HAVE_MALLINFO2) && defined(__GLIBC__) + struct mallinfo2 mi; + mi = ::mallinfo2(); + return mi.uordblks; +-#elif defined(HAVE_MALLINFO) ++#elif defined(HAVE_MALLINFO) && defined(__GLIBC__) + struct mallinfo mi; + mi = ::mallinfo(); + return mi.uordblks; + +--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400 ++++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400 +@@ -122,7 +122,9 @@ + /* #undef HAVE_MALLCTL */ + + /* Define to 1 if you have the `mallinfo' function. */ ++#if defined(__GLIBC__) + #define HAVE_MALLINFO 1 ++#endif + + /* Define to 1 if you have the header file. */ + #define HAVE_MALLOC_H 1 diff --git a/srcpkgs/electron19/files/musl-patches/chromium-quiche-arena-size.patch b/srcpkgs/electron19/files/musl-patches/chromium-quiche-arena-size.patch new file mode 100644 index 000000000000..8d2cbe442857 --- /dev/null +++ b/srcpkgs/electron19/files/musl-patches/chromium-quiche-arena-size.patch @@ -0,0 +1,11 @@ +--- ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h 2022-06-14 11:16:54.000000000 +0200 ++++ - 2022-07-09 09:24:13.956440529 +0200 +@@ -69,7 +69,7 @@ + + // QuicConnections currently use around 1KB of polymorphic types which would + // ordinarily be on the heap. Instead, store them inline in an arena. +-using QuicConnectionArena = QuicOneBlockArena<1152>; ++using QuicConnectionArena = QuicOneBlockArena<1504>; + + } // namespace quic + diff --git a/srcpkgs/electron19/files/musl-patches/chromium-xxx-ppc64le-support.patch b/srcpkgs/electron19/files/musl-patches/chromium-xxx-ppc64le-support.patch new file mode 100644 index 000000000000..c893d9b078fb --- /dev/null +++ b/srcpkgs/electron19/files/musl-patches/chromium-xxx-ppc64le-support.patch @@ -0,0 +1,188 @@ +diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h +index a6aec544e..2a4a7f1bc 100644 +--- sandbox/linux/bpf_dsl/seccomp_macros.h ++++ sandbox/linux/bpf_dsl/seccomp_macros.h +@@ -16,7 +16,7 @@ + #if defined(__mips__) + // sys/user.h in eglibc misses size_t definition + #include +-#elif defined(__powerpc64__) ++#elif defined(__powerpc64__) && defined(__GLIBC__) + // Manually define greg_t on ppc64 + typedef unsigned long long greg_t; + #endif +@@ -361,11 +361,11 @@ typedef struct pt_regs regs_struct; + #define SECCOMP_ARCH AUDIT_ARCH_PPC64 + #endif + +-#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg]) ++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg]) + + #define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3) + #define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0) +-#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip ++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip + #define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3) + #define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4) + #define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5) +diff --git sandbox/linux/seccomp-bpf/syscall.cc sandbox/linux/seccomp-bpf/syscall.cc +index d53a7ff56..c290f0e92 100644 +--- sandbox/linux/seccomp-bpf/syscall.cc ++++ sandbox/linux/seccomp-bpf/syscall.cc +@@ -499,9 +499,9 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) { + // Same as MIPS, need to invert ret and set error register (cr0.SO) + if (ret_val <= -1 && ret_val >= -4095) { + ret_val = -ret_val; +- ctx->uc_mcontext.regs->ccr |= (1 << 28); ++ ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28); + } else { +- ctx->uc_mcontext.regs->ccr &= ~(1 << 28); ++ ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28); + } + #endif + SECCOMP_RESULT(ctx) = static_cast(ret_val); +--- third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h.orig ++++ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h +@@ -46,7 +46,7 @@ + + // The following platforms have an implementation of a hardware counter. + #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ +- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ ++ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || defined(__riscv) || \ + defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) + #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 + #else +--- third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h ++++ third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h +@@ -64,7 +64,7 @@ + #elif defined(__i386__) || defined(__x86_64__) + #define ABSL_STACKTRACE_INL_HEADER \ + "absl/debugging/internal/stacktrace_x86-inl.inc" +-#elif defined(__ppc__) || defined(__PPC__) ++#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__) + #define ABSL_STACKTRACE_INL_HEADER \ + "absl/debugging/internal/stacktrace_powerpc-inl.inc" + #elif defined(__aarch64__) +diff --git third_party/breakpad/BUILD.gn third_party/breakpad/BUILD.gn +index f9a60e37..25f3a0b7 100644 +--- third_party/breakpad/BUILD.gn ++++ third_party/breakpad/BUILD.gn +@@ -637,6 +637,7 @@ if (is_linux || is_android) { + + if (current_cpu == "ppc64") { + defines = [ "HAVE_GETCONTEXT" ] ++ libs += [ "ucontext" ] + } else { + sources += [ + "breakpad/src/common/linux/breakpad_getcontext.S" +diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc +index 03afec7a..0264ecf1 100644 +--- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc ++++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc +@@ -273,6 +273,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const { + + #elif defined(__powerpc64__) + ++#include ++#include ++ + uintptr_t ThreadInfo::GetInstructionPointer() const { + return mcontext.gp_regs[PT_NIP]; + } +@@ -290,9 +293,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const { + out->ctr = mcontext.gp_regs[PT_CTR]; + + for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++) +- out->float_save.fpregs[i] = mcontext.fp_regs[i]; ++ out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i]; + +- out->float_save.fpscr = mcontext.fp_regs[NFPREG-1]; ++ out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1]; + + for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) + out->vector_save.save_vr[i] = \ +diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +index 1090470f..e580233d 100644 +--- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc ++++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +@@ -257,6 +257,9 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { + + #elif defined(__powerpc64__) + ++#include ++#include ++ + uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]; + } +@@ -280,9 +283,9 @@ void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc, + out->ctr = uc->uc_mcontext.gp_regs[PT_CTR]; + + for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++) +- out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i]; ++ out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i]; + +- out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1]; ++ out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1]; + + for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) + out->vector_save.save_vr[i] = +diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index 5a7ab50c..ee8b858c 100644 +--- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -105,6 +105,11 @@ + #define PR_SET_PTRACER 0x59616d61 + #endif + ++/* musl hack, can't include asm/ptrace.h as that causes conflicts */ ++#if defined(__powerpc64__) && !defined(PT_NIP) ++#define PT_NIP 32 ++#endif ++ + namespace google_breakpad { + + namespace { +diff --git third_party/crashpad/crashpad/snapshot/linux/signal_context.h third_party/crashpad/crashpad/snapshot/linux/signal_context.h +index 8e335a09..b2a0f155 100644 +--- third_party/crashpad/crashpad/snapshot/linux/signal_context.h ++++ third_party/crashpad/crashpad/snapshot/linux/signal_context.h +@@ -469,7 +469,7 @@ struct MContext64 { + SignalThreadContext64 gp_regs; + SignalFloatContext64 fp_regs; + SignalVectorContext64 *v_regs; +- int64_t vmx_reserve[69]; ++ int64_t vmx_reserve[101]; + }; + + struct ContextTraits64 : public Traits64 { +diff --git third_party/crashpad/crashpad/util/linux/thread_info.h third_party/crashpad/crashpad/util/linux/thread_info.h +index dea0d1f3..b203e5b2 100644 +--- third_party/crashpad/crashpad/util/linux/thread_info.h ++++ third_party/crashpad/crashpad/util/linux/thread_info.h +@@ -30,6 +30,7 @@ + + #if defined(ARCH_CPU_PPC64_FAMILY) + #include ++#include + #endif + + namespace crashpad { +diff --git third_party/lss/linux_syscall_support.h third_party/lss/linux_syscall_support.h +index 9955ce44..4c1cc488 100644 +--- third_party/lss/linux_syscall_support.h ++++ third_party/lss/linux_syscall_support.h +@@ -4216,9 +4216,13 @@ struct kernel_statfs { + } + #endif + #if defined(__NR_fstatat64) ++ // musl does #define fstatat64 fstatat ++ #undef fstatat64 + LSS_INLINE _syscall4(int, fstatat64, int, d, + const char *, p, + struct kernel_stat64 *, b, int, f) ++ // set it back like it was ++ #define fstatat64 fstatat + #endif + #if defined(__NR_waitpid) + // waitpid is polyfilled below when not available. diff --git a/srcpkgs/electron19/files/patches/chromium-102-fenced_frame_utils-include.patch b/srcpkgs/electron19/files/patches/chromium-102-fenced_frame_utils-include.patch new file mode 100644 index 000000000000..61f904bad6a4 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-102-fenced_frame_utils-include.patch @@ -0,0 +1,25 @@ +From 7c135a291184b59a59643ed6a8c40b4405ac0175 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Wed, 27 Apr 2022 16:01:01 +0000 +Subject: [PATCH] IWYU: add cstring for std::strlen in fenced_frame_utils + +--- + third_party/blink/common/fenced_frame/fenced_frame_utils.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc +index 9e2d3ad..68f4823 100644 +--- a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc ++++ b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc +@@ -4,6 +4,8 @@ + + #include "third_party/blink/public/common/fenced_frame/fenced_frame_utils.h" + ++#include ++ + #include "base/guid.h" + #include "base/strings/string_util.h" + +-- +2.35.1 + diff --git a/srcpkgs/electron19/files/patches/chromium-102-regex_pattern-array.patch b/srcpkgs/electron19/files/patches/chromium-102-regex_pattern-array.patch new file mode 100644 index 000000000000..18058b1faa45 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-102-regex_pattern-array.patch @@ -0,0 +1,14 @@ +--- a/components/autofill/core/browser/BUILD.gn ++++ b/components/autofill/core/browser/BUILD.gn +@@ -54,6 +54,11 @@ action("regex_patterns_inl_h") { + } + + static_library("browser") { ++ if (is_clang) { ++ cflags = [ ++ "-fbracket-depth=1000", ++ ] ++ } + sources = [ + "address_normalization_manager.cc", + "address_normalization_manager.h", diff --git a/srcpkgs/electron19/files/patches/chromium-93-ffmpeg-4.4.patch b/srcpkgs/electron19/files/patches/chromium-93-ffmpeg-4.4.patch new file mode 100644 index 000000000000..f0ec736f98bc --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-93-ffmpeg-4.4.patch @@ -0,0 +1,36 @@ +diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc +index ac4713b07268..492a9a37d096 100644 +--- a/media/filters/ffmpeg_demuxer.cc ++++ b/media/filters/ffmpeg_demuxer.cc +@@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { + scoped_refptr buffer; + + if (type() == DemuxerStream::TEXT) { +- size_t id_size = 0; ++ int id_size = 0; + uint8_t* id_data = av_packet_get_side_data( + packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size); + +- size_t settings_size = 0; ++ int settings_size = 0; + uint8_t* settings_data = av_packet_get_side_data( + packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size); + +@@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { + buffer = DecoderBuffer::CopyFrom(packet->data, packet->size, + side_data.data(), side_data.size()); + } else { +- size_t side_data_size = 0; ++ int side_data_size = 0; + uint8_t* side_data = av_packet_get_side_data( + packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size); + +@@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { + packet->size - data_offset); + } + +- size_t skip_samples_size = 0; ++ int skip_samples_size = 0; + const uint32_t* skip_samples_ptr = + reinterpret_cast(av_packet_get_side_data( + packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size)); diff --git a/srcpkgs/electron19/files/patches/chromium-browser-size_t.patch b/srcpkgs/electron19/files/patches/chromium-browser-size_t.patch new file mode 100644 index 000000000000..36af0ec6c4a7 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-browser-size_t.patch @@ -0,0 +1,10 @@ +--- a/chrome/browser/search/background/ntp_backgrounds.h 2020-08-10 20:39:20.000000000 +0200 ++++ b/chrome/browser/search/background/ntp_backgrounds.h 2020-09-04 13:48:22.640023256 +0200 +@@ -6,6 +6,7 @@ + #define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_ + + #include ++#include + + class GURL; + diff --git a/srcpkgs/electron19/files/patches/chromium-cursed^Uscoped_file.patch b/srcpkgs/electron19/files/patches/chromium-cursed^Uscoped_file.patch new file mode 100644 index 000000000000..2e5433f7abce --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-cursed^Uscoped_file.patch @@ -0,0 +1,18 @@ +--- a/base/files/scoped_file_linux.cc.orig ++++ b/base/files/scoped_file_linux.cc +@@ -77,15 +77,3 @@ + } + + } // namespace base +- +-extern "C" { +- +-int __close(int); +- +-__attribute__((visibility("default"), noinline)) int close(int fd) { +- if (base::IsFDOwned(fd) && g_is_ownership_enforced) +- CrashOnFdOwnershipViolation(); +- return __close(fd); +-} +- +-} // extern "C" diff --git a/srcpkgs/electron19/files/patches/chromium-fix-missing-TEMP_FAILURE_RETRY-macro.patch b/srcpkgs/electron19/files/patches/chromium-fix-missing-TEMP_FAILURE_RETRY-macro.patch new file mode 100644 index 000000000000..b56717b9ce32 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-fix-missing-TEMP_FAILURE_RETRY-macro.patch @@ -0,0 +1,21 @@ +This macro is defined in glibc, but not musl. + +--- a/sandbox/linux/suid/process_util.h.orig ++++ b/sandbox/linux/suid/process_util.h +@@ -11,6 +11,16 @@ + #include + #include + ++// Some additional functions ++#if !defined(TEMP_FAILURE_RETRY) ++# define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + // This adjusts /proc/process/oom_score_adj so the Linux OOM killer + // will prefer certain process types over others. The range for the + // adjustment is [-1000, 1000], with [0, 1000] being user accessible. diff --git a/srcpkgs/electron19/files/patches/chromium-fix-missing-cstdint-include-musl.patch b/srcpkgs/electron19/files/patches/chromium-fix-missing-cstdint-include-musl.patch new file mode 100644 index 000000000000..6ca2897f3dd2 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-fix-missing-cstdint-include-musl.patch @@ -0,0 +1,10 @@ +--- a/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h ++++ b/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h +@@ -3,6 +3,7 @@ + + #include + ++#include + #include + + #include "quiche/common/platform/api/quiche_export.h" diff --git a/srcpkgs/electron19/files/patches/chromium-fix-musl-missing-unistd_h-include.patch b/srcpkgs/electron19/files/patches/chromium-fix-musl-missing-unistd_h-include.patch new file mode 100644 index 000000000000..e14d009a9e0b --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-fix-musl-missing-unistd_h-include.patch @@ -0,0 +1,10 @@ +--- a/sandbox/linux/services/credentials.h ++++ b/sandbox/linux/services/credentials.h +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + #include "sandbox/linux/system_headers/capability.h" + #include "sandbox/sandbox_export.h" diff --git a/srcpkgs/electron19/files/patches/chromium-fix-narrowing-cast.patch b/srcpkgs/electron19/files/patches/chromium-fix-narrowing-cast.patch new file mode 100644 index 000000000000..afd42a1489ae --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-fix-narrowing-cast.patch @@ -0,0 +1,53 @@ +--- a/base/files/file_util_linux.cc ++++ b/base/files/file_util_linux.cc +@@ -23,14 +23,14 @@ + + // Not all possible |statfs_buf.f_type| values are in linux/magic.h. + // Missing values are copied from the statfs man page. +- switch (statfs_buf.f_type) { ++ switch (static_cast(statfs_buf.f_type)) { + case 0: + *type = FILE_SYSTEM_0; + break; + case EXT2_SUPER_MAGIC: // Also ext3 and ext4 + case MSDOS_SUPER_MAGIC: + case REISERFS_SUPER_MAGIC: +- case static_cast(BTRFS_SUPER_MAGIC): ++ case BTRFS_SUPER_MAGIC: + case 0x5346544E: // NTFS + case 0x58465342: // XFS + case 0x3153464A: // JFS +@@ -40,14 +40,14 @@ + *type = FILE_SYSTEM_NFS; + break; + case SMB_SUPER_MAGIC: +- case static_cast(0xFF534D42): // CIFS ++ case 0xFF534D42: // CIFS + *type = FILE_SYSTEM_SMB; + break; + case CODA_SUPER_MAGIC: + *type = FILE_SYSTEM_CODA; + break; +- case static_cast(HUGETLBFS_MAGIC): +- case static_cast(RAMFS_MAGIC): ++ case HUGETLBFS_MAGIC: ++ case RAMFS_MAGIC: + case TMPFS_MAGIC: + *type = FILE_SYSTEM_MEMORY; + break; +--- a/base/system/sys_info_posix.cc ++++ b/base/system/sys_info_posix.cc +@@ -100,10 +100,10 @@ + if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0) + return false; + +- switch (stats.f_type) { ++ switch (static_cast(stats.f_type)) { + case TMPFS_MAGIC: +- case static_cast(HUGETLBFS_MAGIC): +- case static_cast(RAMFS_MAGIC): ++ case HUGETLBFS_MAGIC: ++ case RAMFS_MAGIC: + return true; + } + return false; diff --git a/srcpkgs/electron19/files/patches/chromium-fix-nasm-musl-config.patch b/srcpkgs/electron19/files/patches/chromium-fix-nasm-musl-config.patch new file mode 100644 index 000000000000..7a0337f3bf3b --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-fix-nasm-musl-config.patch @@ -0,0 +1,12 @@ +--- a/third_party/nasm/config/config-linux.h ++++ b/third_party/nasm/config/config-linux.h +@@ -139,7 +139,9 @@ + #define HAVE_ACCESS 1 + + /* Define to 1 if you have the `canonicalize_file_name' function. */ ++#ifdef __GLIBC__ + #define HAVE_CANONICALIZE_FILE_NAME 1 ++#endif + + /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */ + /* #undef HAVE_CPU_TO_LE16 */ diff --git a/srcpkgs/electron19/files/patches/chromium-fix-perfetto-GetThreadName-musl.patch b/srcpkgs/electron19/files/patches/chromium-fix-perfetto-GetThreadName-musl.patch new file mode 100644 index 000000000000..4014d1ee5e69 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-fix-perfetto-GetThreadName-musl.patch @@ -0,0 +1,22 @@ +--- a/third_party/perfetto/include/perfetto/ext/base/thread_utils.h ++++ b/third_party/perfetto/include/perfetto/ext/base/thread_utils.h +@@ -30,7 +30,8 @@ + #include + #endif + +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ ++ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !defined(__GLIBC__)) + #include + #endif + +@@ -58,7 +59,8 @@ + + inline bool GetThreadName(std::string& out_result) { + char buf[16] = {}; +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ ++ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !defined(__GLIBC__)) + if (prctl(PR_GET_NAME, buf) != 0) + return false; + #else diff --git a/srcpkgs/electron19/files/patches/chromium-fix-resolver-musl.patch b/srcpkgs/electron19/files/patches/chromium-fix-resolver-musl.patch new file mode 100644 index 000000000000..6bb7aaabb76c --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-fix-resolver-musl.patch @@ -0,0 +1,66 @@ +--- a/net/dns/public/scoped_res_state.cc.orig ++++ b/net/dns/public/scoped_res_state.cc +@@ -13,7 +13,7 @@ + namespace net { + + ScopedResState::ScopedResState() { +-#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)) + // Note: res_ninit in glibc always returns 0 and sets RES_INIT. + // res_init behaves the same way. + memset(&_res, 0, sizeof(_res)); +--- a/net/dns/public/scoped_res_state.cc ++++ b/net/dns/public/scoped_res_state.cc +@@ -25,7 +25,7 @@ + } + + ScopedResState::~ScopedResState() { +-#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) && !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)) + + // Prefer res_ndestroy where available. + #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD) +@@ -34,7 +34,7 @@ + res_nclose(&res_); + #endif // BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD) + +-#endif // !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) ++#endif // !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) && !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)) + } + + bool ScopedResState::IsValid() const { +--- a/net/dns/host_resolver_manager.cc.orig ++++ b/net/dns/host_resolver_manager.cc +@@ -3015,7 +3015,7 @@ + if (system_dns_config_notifier_) + system_dns_config_notifier_->AddObserver(this); + #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \ +- !BUILDFLAG(IS_ANDROID) ++ !BUILDFLAG(IS_ANDROID) && !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)) + EnsureDnsReloaderInit(); + #endif + +--- a/net/dns/dns_reloader.cc.orig ++++ b/net/dns/dns_reloader.cc +@@ -7,7 +7,8 @@ + #include "build/build_config.h" + + #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \ +- !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) ++ !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) && \ ++ !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)) + + #include + +--- a/net/dns/host_resolver_proc.cc.orig ++++ b/net/dns/host_resolver_proc.cc +@@ -177,7 +177,8 @@ + base::BlockingType::WILL_BLOCK); + + #if BUILDFLAG(IS_POSIX) && \ +- !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID)) ++ !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID) || \ ++ (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))) + DnsReloaderMaybeReload(); + #endif + absl::optional ai; diff --git a/srcpkgs/electron19/files/patches/chromium-fix-stack-utils-with-musl.patch b/srcpkgs/electron19/files/patches/chromium-fix-stack-utils-with-musl.patch new file mode 100644 index 000000000000..7936aa6e0db4 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-fix-stack-utils-with-musl.patch @@ -0,0 +1,20 @@ +--- a/third_party/blink/renderer/platform/wtf/stack_util.cc.orig ++++ b/third_party/blink/renderer/platform/wtf/stack_util.cc +@@ -29,7 +29,7 @@ + // FIXME: On Mac OSX and Linux, this method cannot estimate stack size + // correctly for the main thread. + +-#elif defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \ ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \ + BUILDFLAG(IS_FUCHSIA) + // pthread_getattr_np() can fail if the thread is not invoked by + // pthread_create() (e.g., the main thread of blink_unittests). +@@ -97,7 +97,7 @@ + } + + void* GetStackStart() { +-#if defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \ ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \ + BUILDFLAG(IS_FUCHSIA) + pthread_attr_t attr; + int error; diff --git a/srcpkgs/electron19/files/patches/chromium-fix-swiftshader-llvm-musl-config.patch b/srcpkgs/electron19/files/patches/chromium-fix-swiftshader-llvm-musl-config.patch new file mode 100644 index 000000000000..7bf63bd33d4e --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-fix-swiftshader-llvm-musl-config.patch @@ -0,0 +1,26 @@ +--- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h ++++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h +@@ -17,7 +17,11 @@ + #define ENABLE_CRASH_OVERRIDES 0 + + /* Define to 1 if you have the `backtrace' function. */ ++#ifdef __GLIBC__ + #define HAVE_BACKTRACE 1 ++#else ++#define HAVE_BACKTRACE 0 ++#endif + + /* Define to 1 if you have the header file. */ + /* #undef HAVE_CRASHREPORTERCLIENT_H */ +@@ -58,7 +62,11 @@ + #define HAVE_ERRNO_H 1 + + /* Define to 1 if you have the header file. */ ++#ifdef __GLIBC__ + #define HAVE_EXECINFO_H 1 ++#else ++#define HAVE_EXECINFO_H 0 ++#endif + + /* Define to 1 if you have the header file. */ + #define HAVE_FCNTL_H 1 diff --git a/srcpkgs/electron19/files/patches/chromium-fix-unbundled-libxmnl.patch b/srcpkgs/electron19/files/patches/chromium-fix-unbundled-libxmnl.patch new file mode 100644 index 000000000000..e7f291f88a65 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-fix-unbundled-libxmnl.patch @@ -0,0 +1,10 @@ +--- a/build/linux/unbundle/libxml.gn 2022-06-14 11:14:53.000000000 +0200 ++++ - 2022-07-08 22:53:21.278254993 +0200 +@@ -20,6 +20,7 @@ + ":xml_writer", + "//base/test:test_support", + "//services/data_decoder:xml_parser_fuzzer_deps", ++ "//services/data_decoder:lib", + ] + sources = [ + "chromium/libxml_utils.cc", diff --git a/srcpkgs/electron19/files/patches/chromium-libc_malloc.patch b/srcpkgs/electron19/files/patches/chromium-libc_malloc.patch new file mode 100644 index 000000000000..414f28765d69 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-libc_malloc.patch @@ -0,0 +1,34 @@ +--- a/base/process/memory_linux.cc ++++ b/base/process/memory_linux.cc +@@ -18,6 +18,13 @@ + #include "base/threading/thread_restrictions.h" + #include "build/build_config.h" + ++#if defined(LIBC_GLIBC) ++extern "C" { ++extern void *__libc_malloc(size_t size); ++extern void *__libc_free(void *ptr); ++} ++#endif ++ + namespace base { + + namespace { +@@ -111,7 +118,7 @@ + #elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || !defined(LIBC_GLIBC) + *result = malloc(size); + #elif defined(LIBC_GLIBC) +- *result = __libc_malloc(size); ++ *result = ::__libc_malloc(size); + #endif + return *result != nullptr; + } +@@ -122,7 +129,7 @@ + #elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || !defined(LIBC_GLIBC) + free(ptr); + #elif defined(LIBC_GLIBC) +- __libc_free(ptr); ++ ::__libc_free(ptr); + #endif + } + diff --git a/srcpkgs/electron19/files/patches/chromium-musl-stat.patch b/srcpkgs/electron19/files/patches/chromium-musl-stat.patch new file mode 100644 index 000000000000..b25e3c062172 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-musl-stat.patch @@ -0,0 +1,12 @@ +--- a/base/files/file.h.orig ++++ b/base/files/file.h +@@ -19,7 +19,8 @@ + #include "build/build_config.h" + + #if BUILDFLAG(IS_BSD) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_NACL) || \ +- BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21) ++ BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21) || \ ++ (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)) + struct stat; + namespace base { + typedef struct stat stat_wrapper_t; diff --git a/srcpkgs/electron19/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/electron19/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch new file mode 100644 index 000000000000..cb2e715fe206 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch @@ -0,0 +1,24 @@ +Use monotonic clock for pthread_cond_timedwait with musl too. + +diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc +index 5ea7083..c13027e 100644 +--- a/v8/src/base/platform/condition-variable.cc ++++ a/v8/src/base/platform/condition-variable.cc +@@ -16,7 +16,7 @@ namespace base { + + ConditionVariable::ConditionVariable() { + #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \ +- (V8_OS_LINUX && V8_LIBC_GLIBC)) ++ V8_OS_LINUX) + // On Free/Net/OpenBSD and Linux with glibc we can change the time + // source for pthread_cond_timedwait() to use the monotonic clock. + pthread_condattr_t attr; +@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) { + &native_handle_, &mutex->native_handle(), &ts); + #else + #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \ +- (V8_OS_LINUX && V8_LIBC_GLIBC)) ++ V8_OS_LINUX) + // On Free/Net/OpenBSD and Linux with glibc we can change the time + // source for pthread_cond_timedwait() to use the monotonic clock. + result = clock_gettime(CLOCK_MONOTONIC, &ts); diff --git a/srcpkgs/electron19/files/patches/chromium-no-execinfo.patch b/srcpkgs/electron19/files/patches/chromium-no-execinfo.patch new file mode 100644 index 000000000000..6e67182b21b6 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-no-execinfo.patch @@ -0,0 +1,75 @@ +--- a/base/debug/stack_trace_posix.cc ++++ b/base/debug/stack_trace_posix.cc +@@ -27,7 +27,7 @@ + #if !defined(USE_SYMBOLIZE) + #include + #endif +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + #include + #endif + +@@ -89,7 +89,7 @@ + // Note: code in this function is NOT async-signal safe (std::string uses + // malloc internally). + +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + std::string::size_type search_from = 0; + while (search_from < text->size()) { + // Look for the start of a mangled symbol, from search_from. +@@ -136,7 +136,7 @@ + virtual ~BacktraceOutputHandler() = default; + }; + +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + void OutputPointer(void* pointer, BacktraceOutputHandler* handler) { + // This should be more than enough to store a 64-bit number in hex: + // 16 hex digits + 1 for null-terminator. +@@ -839,7 +839,7 @@ + // If we do not have unwind tables, then try tracing using frame pointers. + return base::debug::TraceStackFramePointers(const_cast(trace), + count, 0); +-#elif !defined(__UCLIBC__) && !defined(_AIX) ++#elif defined(__GLIBC__) && !defined(_AIX) + // Though the backtrace API man page does not list any possible negative + // return values, we take no chance. + return base::saturated_cast(backtrace(trace, count)); +@@ -852,13 +852,13 @@ + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. + +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + PrintBacktraceOutputHandler handler; + ProcessBacktrace(trace_, count_, prefix_string, &handler); + #endif + } + +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + void StackTrace::OutputToStreamWithPrefix(std::ostream* os, + const char* prefix_string) const { + StreamBacktraceOutputHandler handler(os); +--- a/v8/src/codegen/external-reference-table.cc.orig ++++ b/v8/src/codegen/external-reference-table.cc +@@ -11,7 +11,9 @@ + + #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) + #define SYMBOLIZE_FUNCTION ++#if defined(__GLIBC__) + #include ++#endif + + #include + +@@ -96,7 +98,7 @@ + } + + const char* ExternalReferenceTable::ResolveSymbol(void* address) { +-#ifdef SYMBOLIZE_FUNCTION ++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__) + char** names = backtrace_symbols(&address, 1); + const char* name = names[0]; + // The array of names is malloc'ed. However, each name string is static diff --git a/srcpkgs/electron19/files/patches/chromium-no-getcontext.patch b/srcpkgs/electron19/files/patches/chromium-no-getcontext.patch new file mode 100644 index 000000000000..2502b5a06acb --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-no-getcontext.patch @@ -0,0 +1,27 @@ +--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.orig 2015-12-06 09:59:55.554536646 +0100 ++++ a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2015-12-06 10:01:16.818238035 +0100 +@@ -477,7 +477,9 @@ bool ExceptionHandler::SimulateSignalDel + siginfo.si_code = SI_USER; + siginfo.si_pid = getpid(); + ucontext_t context; ++#if defined(__GLIBC__) + getcontext(&context); ++#endif + return HandleSignal(sig, &siginfo, &context); + } + +@@ -647,9 +649,14 @@ bool ExceptionHandler::WriteMinidump() { + sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0); + + CrashContext context; ++ ++#if defined(__GLIBC__) + int getcontext_result = getcontext(&context.context); + if (getcontext_result) + return false; ++#else ++ return false; ++#endif + + #if defined(__i386__) + // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved diff --git a/srcpkgs/electron19/files/patches/chromium-no-opaque-pointers.patch b/srcpkgs/electron19/files/patches/chromium-no-opaque-pointers.patch new file mode 100644 index 000000000000..367bea0f92e5 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-no-opaque-pointers.patch @@ -0,0 +1,17 @@ +--- a/build/config/compiler/BUILD.gn 2022-07-08 23:17:39.889019407 +0200 ++++ - 2022-07-08 23:23:22.740712991 +0200 +@@ -1531,14 +1531,6 @@ + cflags += [ "-Wno-deprecated-non-prototype" ] + } + +- if (!is_nacl && !(is_chromeos || +- default_toolchain == "//build/toolchain/cros:target")) { +- # TODO(https://crbug.com/1316298): Re-enable once test failure is figured out +- cflags += [ +- "-Xclang", +- "-no-opaque-pointers", +- ] +- } + + if (is_fuchsia) { + # TODO(https://bugs.chromium.org/p/fuchsia/issues/detail?id=77383) diff --git a/srcpkgs/electron19/files/patches/chromium-remove-sys-cdefs-includes.patch b/srcpkgs/electron19/files/patches/chromium-remove-sys-cdefs-includes.patch new file mode 100644 index 000000000000..00344073f461 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-remove-sys-cdefs-includes.patch @@ -0,0 +1,39 @@ +--- a/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h ++++ b/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h +@@ -17,8 +17,6 @@ + + #include_next + +-#include +- + // https://sourceware.org/bugzilla/show_bug.cgi?id=22433 + #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \ + defined(__GLIBC__) +--- a/third_party/libsync/src/include/sync/sync.h ++++ b/third_party/libsync/src/include/sync/sync.h +@@ -19,12 +19,13 @@ + #ifndef __SYS_CORE_SYNC_H + #define __SYS_CORE_SYNC_H + +-#include + #include + + #include + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + struct sync_legacy_merge_data { + int32_t fd2; +@@ -158,6 +159,8 @@ + struct sync_pt_info *itr); + void sync_fence_info_free(struct sync_fence_info_data *info); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif /* __SYS_CORE_SYNC_H */ diff --git a/srcpkgs/electron19/files/patches/chromium-revert-drop-of-system-java.patch b/srcpkgs/electron19/files/patches/chromium-revert-drop-of-system-java.patch new file mode 100644 index 000000000000..c3f97c7c4d1c --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-revert-drop-of-system-java.patch @@ -0,0 +1,15 @@ +This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef +--- a/third_party/closure_compiler/compiler.py 2021-05-20 04:17:53.000000000 +0200 ++++ - 2021-05-25 20:31:10.102971765 +0200 +@@ -13,8 +13,9 @@ + + + _CURRENT_DIR = os.path.join(os.path.dirname(__file__)) +-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java") +-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds" ++_JAVA_BIN = "java" ++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java") ++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN + + class Compiler(object): + """Runs the Closure compiler on given source files to typecheck them diff --git a/srcpkgs/electron19/files/patches/chromium-roll-src-third_party-ffmpeg.patch b/srcpkgs/electron19/files/patches/chromium-roll-src-third_party-ffmpeg.patch new file mode 100644 index 000000000000..e739b40a2733 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-roll-src-third_party-ffmpeg.patch @@ -0,0 +1,333 @@ +From 6e554a30893150793c2638e3689cf208ffc8e375 Mon Sep 17 00:00:00 2001 +From: Dale Curtis +Date: Sat, 2 Apr 2022 05:13:53 +0000 +Subject: [PATCH] Roll src/third_party/ffmpeg/ 574c39cce..32b2d1d526 (1125 + commits) + +https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/574c39cce323..32b2d1d526 + +Created with: + roll-dep src/third_party/ffmpeg + +Fixed: 1293918 +Cq-Include-Trybots: luci.chromium.try:mac_chromium_asan_rel_ng,linux_chromium_asan_rel_ng,linux_chromium_chromeos_asan_rel_ng +Change-Id: I41945d0f963e3d1f65940067bac22f63b68e37d2 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3565647 +Auto-Submit: Dale Curtis +Reviewed-by: Dan Sanders +Commit-Queue: Dale Curtis +Cr-Commit-Position: refs/heads/main@{#988253} +--- + .../clear_key_cdm/ffmpeg_cdm_audio_decoder.cc | 29 ++++++++++--------- + media/ffmpeg/ffmpeg_common.cc | 11 +++---- + media/filters/audio_file_reader.cc | 9 +++--- + media/filters/audio_file_reader_unittest.cc | 6 ++-- + .../filters/audio_video_metadata_extractor.cc | 11 +++++-- + .../filters/ffmpeg_aac_bitstream_converter.cc | 7 +++-- + ...ffmpeg_aac_bitstream_converter_unittest.cc | 2 +- + media/filters/ffmpeg_audio_decoder.cc | 13 +++++---- + 8 files changed, 51 insertions(+), 37 deletions(-) + +diff --git a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc +index e4fc3f460e2..9b1ad9f7675 100644 +--- a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc ++++ b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc +@@ -74,7 +74,7 @@ void CdmAudioDecoderConfigToAVCodecContext( + codec_context->sample_fmt = AV_SAMPLE_FMT_NONE; + } + +- codec_context->channels = config.channel_count; ++ codec_context->ch_layout.nb_channels = config.channel_count; + codec_context->sample_rate = config.samples_per_second; + + if (config.extra_data) { +@@ -124,8 +124,8 @@ void CopySamples(cdm::AudioFormat cdm_format, + case cdm::kAudioFormatPlanarS16: + case cdm::kAudioFormatPlanarF32: { + const int decoded_size_per_channel = +- decoded_audio_size / av_frame.channels; +- for (int i = 0; i < av_frame.channels; ++i) { ++ decoded_audio_size / av_frame.ch_layout.nb_channels; ++ for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) { + memcpy(output_buffer, av_frame.extended_data[i], + decoded_size_per_channel); + output_buffer += decoded_size_per_channel; +@@ -185,13 +185,14 @@ bool FFmpegCdmAudioDecoder::Initialize( + // Success! + decoding_loop_ = std::make_unique(codec_context_.get()); + samples_per_second_ = config.samples_per_second; +- bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8; ++ bytes_per_frame_ = ++ codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8; + output_timestamp_helper_ = + std::make_unique(config.samples_per_second); + is_initialized_ = true; + + // Store initial values to guard against midstream configuration changes. +- channels_ = codec_context_->channels; ++ channels_ = codec_context_->ch_layout.nb_channels; + av_sample_format_ = codec_context_->sample_fmt; + + return true; +@@ -291,17 +292,19 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer( + for (auto& frame : audio_frames) { + int decoded_audio_size = 0; + if (frame->sample_rate != samples_per_second_ || +- frame->channels != channels_ || frame->format != av_sample_format_) { ++ frame->ch_layout.nb_channels != channels_ || ++ frame->format != av_sample_format_) { + DLOG(ERROR) << "Unsupported midstream configuration change!" + << " Sample Rate: " << frame->sample_rate << " vs " +- << samples_per_second_ << ", Channels: " << frame->channels +- << " vs " << channels_ << ", Sample Format: " << frame->format +- << " vs " << av_sample_format_; ++ << samples_per_second_ ++ << ", Channels: " << frame->ch_layout.nb_channels << " vs " ++ << channels_ << ", Sample Format: " << frame->format << " vs " ++ << av_sample_format_; + return cdm::kDecodeError; + } + + decoded_audio_size = av_samples_get_buffer_size( +- nullptr, codec_context_->channels, frame->nb_samples, ++ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples, + codec_context_->sample_fmt, 1); + if (!decoded_audio_size) + continue; +@@ -320,9 +323,9 @@ bool FFmpegCdmAudioDecoder::OnNewFrame( + size_t* total_size, + std::vector>* audio_frames, + AVFrame* frame) { +- *total_size += av_samples_get_buffer_size(nullptr, codec_context_->channels, +- frame->nb_samples, +- codec_context_->sample_fmt, 1); ++ *total_size += av_samples_get_buffer_size( ++ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples, ++ codec_context_->sample_fmt, 1); + audio_frames->emplace_back(av_frame_clone(frame)); + return true; + } +diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc +index 87ca8969626..76f03d6608e 100644 +--- a/media/ffmpeg/ffmpeg_common.cc ++++ b/media/ffmpeg/ffmpeg_common.cc +@@ -345,10 +345,11 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, + codec_context->sample_fmt, codec_context->codec_id); + + ChannelLayout channel_layout = +- codec_context->channels > 8 ++ codec_context->ch_layout.nb_channels > 8 + ? CHANNEL_LAYOUT_DISCRETE +- : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout, +- codec_context->channels); ++ : ChannelLayoutToChromeChannelLayout( ++ codec_context->ch_layout.u.mask, ++ codec_context->ch_layout.nb_channels); + + int sample_rate = codec_context->sample_rate; + switch (codec) { +@@ -401,7 +402,7 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, + extra_data, encryption_scheme, seek_preroll, + codec_context->delay); + if (channel_layout == CHANNEL_LAYOUT_DISCRETE) +- config->SetChannelsForDiscrete(codec_context->channels); ++ config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels); + + #if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO) + // These are bitstream formats unknown to ffmpeg, so they don't have +@@ -470,7 +471,7 @@ void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config, + + // TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses + // said information to decode. +- codec_context->channels = config.channels(); ++ codec_context->ch_layout.nb_channels = config.channels(); + codec_context->sample_rate = config.samples_per_second(); + + if (config.extra_data().empty()) { +diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc +index 5f257bdfaa6..e1be5aa9a5b 100644 +--- a/media/filters/audio_file_reader.cc ++++ b/media/filters/audio_file_reader.cc +@@ -113,14 +113,15 @@ bool AudioFileReader::OpenDecoder() { + + // Verify the channel layout is supported by Chrome. Acts as a sanity check + // against invalid files. See http://crbug.com/171962 +- if (ChannelLayoutToChromeChannelLayout(codec_context_->channel_layout, +- codec_context_->channels) == ++ if (ChannelLayoutToChromeChannelLayout( ++ codec_context_->ch_layout.u.mask, ++ codec_context_->ch_layout.nb_channels) == + CHANNEL_LAYOUT_UNSUPPORTED) { + return false; + } + + // Store initial values to guard against midstream configuration changes. +- channels_ = codec_context_->channels; ++ channels_ = codec_context_->ch_layout.nb_channels; + audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id); + sample_rate_ = codec_context_->sample_rate; + av_sample_format_ = codec_context_->sample_fmt; +@@ -223,7 +224,7 @@ bool AudioFileReader::OnNewFrame( + if (frames_read < 0) + return false; + +- const int channels = frame->channels; ++ const int channels = frame->ch_layout.nb_channels; + if (frame->sample_rate != sample_rate_ || channels != channels_ || + frame->format != av_sample_format_) { + DLOG(ERROR) << "Unsupported midstream configuration change!" +diff --git a/media/filters/audio_file_reader_unittest.cc b/media/filters/audio_file_reader_unittest.cc +index 2aba7927a31..1f45a50cace 100644 +--- a/media/filters/audio_file_reader_unittest.cc ++++ b/media/filters/audio_file_reader_unittest.cc +@@ -121,11 +121,11 @@ class AudioFileReaderTest : public testing::Test { + EXPECT_FALSE(reader_->Open()); + } + +- void RunTestFailingDecode(const char* fn) { ++ void RunTestFailingDecode(const char* fn, int expect_read = 0) { + Initialize(fn); + EXPECT_TRUE(reader_->Open()); + std::vector> decoded_audio_packets; +- EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0); ++ EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read); + } + + void RunTestPartialDecode(const char* fn) { +@@ -219,7 +219,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) { + } + + TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) { +- RunTestFailingDecode("midstream_config_change.mp3"); ++ RunTestFailingDecode("midstream_config_change.mp3", 42624); + } + #endif + +diff --git a/media/filters/audio_video_metadata_extractor.cc b/media/filters/audio_video_metadata_extractor.cc +index 185819eb936..69ff508c221 100644 +--- a/media/filters/audio_video_metadata_extractor.cc ++++ b/media/filters/audio_video_metadata_extractor.cc +@@ -113,6 +113,15 @@ bool AudioVideoMetadataExtractor::Extract(DataSource* source, + if (!stream) + continue; + ++ void* display_matrix = ++ av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr); ++ if (display_matrix) { ++ rotation_ = VideoTransformation::FromFFmpegDisplayMatrix( ++ static_cast(display_matrix)) ++ .rotation; ++ info.tags["rotate"] = base::NumberToString(rotation_); ++ } ++ + // Extract dictionary from streams also. Needed for containers that attach + // metadata to contained streams instead the container itself, like OGG. + ExtractDictionary(stream->metadata, &info.tags); +@@ -255,8 +264,6 @@ void AudioVideoMetadataExtractor::ExtractDictionary(AVDictionary* metadata, + if (raw_tags->find(tag->key) == raw_tags->end()) + (*raw_tags)[tag->key] = tag->value; + +- if (ExtractInt(tag, "rotate", &rotation_)) +- continue; + if (ExtractString(tag, "album", &album_)) + continue; + if (ExtractString(tag, "artist", &artist_)) +diff --git a/media/filters/ffmpeg_aac_bitstream_converter.cc b/media/filters/ffmpeg_aac_bitstream_converter.cc +index 6f231c85729..ca5e5fb927d 100644 +--- a/media/filters/ffmpeg_aac_bitstream_converter.cc ++++ b/media/filters/ffmpeg_aac_bitstream_converter.cc +@@ -195,14 +195,15 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) { + if (!header_generated_ || codec_ != stream_codec_parameters_->codec_id || + audio_profile_ != stream_codec_parameters_->profile || + sample_rate_index_ != sample_rate_index || +- channel_configuration_ != stream_codec_parameters_->channels || ++ channel_configuration_ != ++ stream_codec_parameters_->ch_layout.nb_channels || + frame_length_ != header_plus_packet_size) { + header_generated_ = + GenerateAdtsHeader(stream_codec_parameters_->codec_id, + 0, // layer + stream_codec_parameters_->profile, sample_rate_index, + 0, // private stream +- stream_codec_parameters_->channels, ++ stream_codec_parameters_->ch_layout.nb_channels, + 0, // originality + 0, // home + 0, // copyrighted_stream +@@ -214,7 +215,7 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) { + codec_ = stream_codec_parameters_->codec_id; + audio_profile_ = stream_codec_parameters_->profile; + sample_rate_index_ = sample_rate_index; +- channel_configuration_ = stream_codec_parameters_->channels; ++ channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels; + frame_length_ = header_plus_packet_size; + } + +diff --git a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc +index 1fd4c5ccd7d..f59bcd8fdaf 100644 +--- a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc ++++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc +@@ -34,7 +34,7 @@ class FFmpegAACBitstreamConverterTest : public testing::Test { + memset(&test_parameters_, 0, sizeof(AVCodecParameters)); + test_parameters_.codec_id = AV_CODEC_ID_AAC; + test_parameters_.profile = FF_PROFILE_AAC_MAIN; +- test_parameters_.channels = 2; ++ test_parameters_.ch_layout.nb_channels = 2; + test_parameters_.extradata = extradata_header_; + test_parameters_.extradata_size = sizeof(extradata_header_); + } +diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc +index 6a56c675f7d..4615fdeb3fb 100644 +--- a/media/filters/ffmpeg_audio_decoder.cc ++++ b/media/filters/ffmpeg_audio_decoder.cc +@@ -28,7 +28,7 @@ namespace media { + + // Return the number of channels from the data in |frame|. + static inline int DetermineChannels(AVFrame* frame) { +- return frame->channels; ++ return frame->ch_layout.nb_channels; + } + + // Called by FFmpeg's allocation routine to allocate a buffer. Uses +@@ -231,7 +231,7 @@ bool FFmpegAudioDecoder::OnNewFrame(const DecoderBuffer& buffer, + // Translate unsupported into discrete layouts for discrete configurations; + // ffmpeg does not have a labeled discrete configuration internally. + ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout( +- codec_context_->channel_layout, codec_context_->channels); ++ codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels); + if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED && + config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) { + channel_layout = CHANNEL_LAYOUT_DISCRETE; +@@ -348,11 +348,11 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) { + // Success! + av_sample_format_ = codec_context_->sample_fmt; + +- if (codec_context_->channels != config.channels()) { ++ if (codec_context_->ch_layout.nb_channels != config.channels()) { + MEDIA_LOG(ERROR, media_log_) + << "Audio configuration specified " << config.channels() + << " channels, but FFmpeg thinks the file contains " +- << codec_context_->channels << " channels"; ++ << codec_context_->ch_layout.nb_channels << " channels"; + ReleaseFFmpegResources(); + state_ = DecoderState::kUninitialized; + return false; +@@ -403,7 +403,7 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, + if (frame->nb_samples <= 0) + return AVERROR(EINVAL); + +- if (s->channels != channels) { ++ if (s->ch_layout.nb_channels != channels) { + DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count."; + return AVERROR(EINVAL); + } +@@ -436,7 +436,8 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, + ChannelLayout channel_layout = + config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE + ? CHANNEL_LAYOUT_DISCRETE +- : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels); ++ : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask, ++ s->ch_layout.nb_channels); + + if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) { + DLOG(ERROR) << "Unsupported channel layout."; diff --git a/srcpkgs/electron19/files/patches/chromium-roll-src-third_party-ffmpeg.patch.args b/srcpkgs/electron19/files/patches/chromium-roll-src-third_party-ffmpeg.patch.args new file mode 100644 index 000000000000..8bbbbe948363 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-roll-src-third_party-ffmpeg.patch.args @@ -0,0 +1 @@ +-RNp1 diff --git a/srcpkgs/electron19/files/patches/chromium-sandbox-membarrier.patch b/srcpkgs/electron19/files/patches/chromium-sandbox-membarrier.patch new file mode 100644 index 000000000000..998552c2f9e7 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-sandbox-membarrier.patch @@ -0,0 +1,10 @@ +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ++++ a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +@@ -370,6 +370,7 @@ + switch (sysno) { + case __NR_exit: + case __NR_exit_group: ++ case __NR_membarrier: + case __NR_wait4: + case __NR_waitid: + #if defined(__i386__) diff --git a/srcpkgs/electron19/files/patches/chromium-sandbox-sched_getparam.patch b/srcpkgs/electron19/files/patches/chromium-sandbox-sched_getparam.patch new file mode 100644 index 000000000000..87f11af43c04 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-sandbox-sched_getparam.patch @@ -0,0 +1,20 @@ +Allow SYS_sched_getparam and SYS_sched_getscheduler +musl uses them for pthread_getschedparam() + +source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e + +--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc.orig 2019-10-08 21:03:18.253080425 +0200 ++++ a/sandbox/policy/linux/bpf_renderer_policy_linux.cc 2019-10-08 21:04:19.648549718 +0200 +@@ -88,10 +88,10 @@ + case __NR_sysinfo: + case __NR_times: + case __NR_uname: +- return Allow(); +- case __NR_sched_getaffinity: + case __NR_sched_getparam: + case __NR_sched_getscheduler: ++ return Allow(); ++ case __NR_sched_getaffinity: + case __NR_sched_setscheduler: + return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno); + case __NR_prlimit64: diff --git a/srcpkgs/electron19/files/patches/chromium-sndio.patch b/srcpkgs/electron19/files/patches/chromium-sndio.patch new file mode 100644 index 000000000000..bac8a63bc24f --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-sndio.patch @@ -0,0 +1,877 @@ +diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn +--- a/media/BUILD.gn 2020-06-03 20:40:26.000000000 +0200 ++++ b/media/BUILD.gn 2020-06-13 17:32:28.510395975 +0200 +@@ -65,6 +65,9 @@ + defines += [ "DLOPEN_PULSEAUDIO" ] + } + } ++ if (use_sndio) { ++ defines += [ "USE_SNDIO" ] ++ } + if (use_cras) { + defines += [ "USE_CRAS" ] + } +diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn +--- a/media/audio/BUILD.gn 2020-06-03 20:39:37.000000000 +0200 ++++ b/media/audio/BUILD.gn 2020-06-13 17:32:28.511395969 +0200 +@@ -236,6 +236,17 @@ + sources += [ "linux/audio_manager_linux.cc" ] + } + ++ if (use_sndio) { ++ libs += [ "sndio" ] ++ sources += [ ++ "sndio/audio_manager_sndio.cc", ++ "sndio/sndio_input.cc", ++ "sndio/sndio_input.h", ++ "sndio/sndio_output.cc", ++ "sndio/sndio_output.h" ++ ] ++ } ++ + if (use_alsa) { + libs += [ "asound" ] + sources += [ +diff -Naur chromium-83.0.4103.97.orig/media/audio/linux/audio_manager_linux.cc chromium-83.0.4103.97/media/audio/linux/audio_manager_linux.cc +--- a/media/audio/linux/audio_manager_linux.cc 2020-06-03 20:39:37.000000000 +0200 ++++ b/media/audio/linux/audio_manager_linux.cc 2020-06-13 18:09:43.623333167 +0200 +@@ -19,6 +19,11 @@ + #include "media/audio/pulse/audio_manager_pulse.h" + #include "media/audio/pulse/pulse_util.h" + #endif ++#if defined(USE_SNDIO) ++#include "media/audio/sndio/audio_manager_sndio.h" ++#include "media/audio/sndio/sndio_input.h" ++#include "media/audio/sndio/sndio_output.h" ++#endif + + namespace media { + + std::unique_ptr CreateAudioManager( +@@ -39,6 +45,16 @@ + audio_log_factory); + } + ++#if defined(USE_SNDIO) ++ struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0); ++ if (hdl != NULL) { ++ sio_close(hdl); ++ UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1); ++ return std::make_unique(std::move(audio_thread), ++ audio_log_factory); ++ } ++#endif ++ + #if defined(USE_CRAS) + if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) { + UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1); +diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.cc chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.cc +--- a/media/audio/sndio/audio_manager_sndio.cc 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/audio_manager_sndio.cc 2020-06-13 17:32:28.511395969 +0200 +@@ -0,0 +1,148 @@ ++// Copyright (c) 2012 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "media/audio/sndio/audio_manager_sndio.h" ++ ++#include "base/metrics/histogram_macros.h" ++#include "base/memory/ptr_util.h" ++#include "media/audio/audio_device_description.h" ++#include "media/audio/audio_output_dispatcher.h" ++#include "media/audio/sndio/sndio_input.h" ++#include "media/audio/sndio/sndio_output.h" ++#include "media/base/limits.h" ++#include "media/base/media_switches.h" ++ ++namespace media { ++ ++ ++// Maximum number of output streams that can be open simultaneously. ++static const int kMaxOutputStreams = 4; ++ ++// Default sample rate for input and output streams. ++static const int kDefaultSampleRate = 48000; ++ ++void AddDefaultDevice(AudioDeviceNames* device_names) { ++ DCHECK(device_names->empty()); ++ device_names->push_front(AudioDeviceName::CreateDefault()); ++} ++ ++bool AudioManagerSndio::HasAudioOutputDevices() { ++ return true; ++} ++ ++bool AudioManagerSndio::HasAudioInputDevices() { ++ return true; ++} ++ ++void AudioManagerSndio::GetAudioInputDeviceNames( ++ AudioDeviceNames* device_names) { ++ DCHECK(device_names->empty()); ++ AddDefaultDevice(device_names); ++} ++ ++void AudioManagerSndio::GetAudioOutputDeviceNames( ++ AudioDeviceNames* device_names) { ++ AddDefaultDevice(device_names); ++} ++ ++const char* AudioManagerSndio::GetName() { ++ return "SNDIO"; ++} ++ ++AudioParameters AudioManagerSndio::GetInputStreamParameters( ++ const std::string& device_id) { ++ static const int kDefaultInputBufferSize = 1024; ++ ++ int user_buffer_size = GetUserBufferSize(); ++ int buffer_size = user_buffer_size ? ++ user_buffer_size : kDefaultInputBufferSize; ++ ++ return AudioParameters( ++ AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, ++ kDefaultSampleRate, buffer_size); ++} ++ ++AudioManagerSndio::AudioManagerSndio(std::unique_ptr audio_thread, ++ AudioLogFactory* audio_log_factory) ++ : AudioManagerBase(std::move(audio_thread), ++ audio_log_factory) { ++ DLOG(WARNING) << "AudioManagerSndio"; ++ SetMaxOutputStreamsAllowed(kMaxOutputStreams); ++} ++ ++AudioManagerSndio::~AudioManagerSndio() { ++ Shutdown(); ++} ++ ++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream( ++ const AudioParameters& params, ++ const LogCallback& log_callback) { ++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); ++ return MakeOutputStream(params); ++} ++ ++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream( ++ const AudioParameters& params, ++ const std::string& device_id, ++ const LogCallback& log_callback) { ++ DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!"; ++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); ++ return MakeOutputStream(params); ++} ++ ++AudioInputStream* AudioManagerSndio::MakeLinearInputStream( ++ const AudioParameters& params, ++ const std::string& device_id, ++ const LogCallback& log_callback) { ++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); ++ return MakeInputStream(params); ++} ++ ++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream( ++ const AudioParameters& params, ++ const std::string& device_id, ++ const LogCallback& log_callback) { ++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); ++ return MakeInputStream(params); ++} ++ ++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters( ++ const std::string& output_device_id, ++ const AudioParameters& input_params) { ++ // TODO(tommi): Support |output_device_id|. ++ DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!"; ++ static const int kDefaultOutputBufferSize = 2048; ++ ++ ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; ++ int sample_rate = kDefaultSampleRate; ++ int buffer_size = kDefaultOutputBufferSize; ++ if (input_params.IsValid()) { ++ sample_rate = input_params.sample_rate(); ++ channel_layout = input_params.channel_layout(); ++ buffer_size = std::min(buffer_size, input_params.frames_per_buffer()); ++ } ++ ++ int user_buffer_size = GetUserBufferSize(); ++ if (user_buffer_size) ++ buffer_size = user_buffer_size; ++ ++ return AudioParameters( ++ AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, ++ sample_rate, buffer_size); ++} ++ ++AudioInputStream* AudioManagerSndio::MakeInputStream( ++ const AudioParameters& params) { ++ DLOG(WARNING) << "MakeInputStream"; ++ return new SndioAudioInputStream(this, ++ AudioDeviceDescription::kDefaultDeviceId, params); ++} ++ ++AudioOutputStream* AudioManagerSndio::MakeOutputStream( ++ const AudioParameters& params) { ++ DLOG(WARNING) << "MakeOutputStream"; ++ return new SndioAudioOutputStream(params, this); ++} ++ ++} // namespace media +diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.h chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.h +--- a/media/audio/sndio/audio_manager_sndio.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/audio_manager_sndio.h 2020-06-13 17:32:28.511395969 +0200 +@@ -0,0 +1,65 @@ ++// Copyright (c) 2012 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_ ++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_ ++ ++#include ++ ++#include "base/compiler_specific.h" ++#include "base/macros.h" ++#include "base/memory/ref_counted.h" ++#include "base/threading/thread.h" ++#include "media/audio/audio_manager_base.h" ++ ++namespace media { ++ ++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase { ++ public: ++ AudioManagerSndio(std::unique_ptr audio_thread, ++ AudioLogFactory* audio_log_factory); ++ ~AudioManagerSndio() override; ++ ++ // Implementation of AudioManager. ++ bool HasAudioOutputDevices() override; ++ bool HasAudioInputDevices() override; ++ void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override; ++ void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; ++ AudioParameters GetInputStreamParameters( ++ const std::string& device_id) override; ++ const char* GetName() override; ++ ++ // Implementation of AudioManagerBase. ++ AudioOutputStream* MakeLinearOutputStream( ++ const AudioParameters& params, ++ const LogCallback& log_callback) override; ++ AudioOutputStream* MakeLowLatencyOutputStream( ++ const AudioParameters& params, ++ const std::string& device_id, ++ const LogCallback& log_callback) override; ++ AudioInputStream* MakeLinearInputStream( ++ const AudioParameters& params, ++ const std::string& device_id, ++ const LogCallback& log_callback) override; ++ AudioInputStream* MakeLowLatencyInputStream( ++ const AudioParameters& params, ++ const std::string& device_id, ++ const LogCallback& log_callback) override; ++ ++ protected: ++ AudioParameters GetPreferredOutputStreamParameters( ++ const std::string& output_device_id, ++ const AudioParameters& input_params) override; ++ ++ private: ++ // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream. ++ AudioOutputStream* MakeOutputStream(const AudioParameters& params); ++ AudioInputStream* MakeInputStream(const AudioParameters& params); ++ ++ DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio); ++}; ++ ++} // namespace media ++ ++#endif // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_ +diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.cc chromium-83.0.4103.97/media/audio/sndio/sndio_input.cc +--- a/media/audio/sndio/sndio_input.cc 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/sndio_input.cc 2020-06-13 17:32:28.511395969 +0200 +@@ -0,0 +1,200 @@ ++// Copyright 2013 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "base/bind.h" ++#include "base/logging.h" ++#include "base/macros.h" ++#include "media/base/audio_timestamp_helper.h" ++#include "media/audio/sndio/audio_manager_sndio.h" ++#include "media/audio/audio_manager.h" ++#include "media/audio/sndio/sndio_input.h" ++ ++namespace media { ++ ++static const SampleFormat kSampleFormat = kSampleFormatS16; ++ ++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta) ++{ ++ SndioAudioInputStream* self = static_cast(arg); ++ ++ self->hw_delay += delta; ++} ++ ++void *SndioAudioInputStream::ThreadEntry(void *arg) { ++ SndioAudioInputStream* self = static_cast(arg); ++ ++ self->ThreadLoop(); ++ return NULL; ++} ++ ++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager, ++ const std::string& device_name, ++ const AudioParameters& params) ++ : manager(manager), ++ params(params), ++ audio_bus(AudioBus::Create(params)), ++ state(kClosed) { ++} ++ ++SndioAudioInputStream::~SndioAudioInputStream() { ++ if (state != kClosed) ++ Close(); ++} ++ ++bool SndioAudioInputStream::Open() { ++ struct sio_par par; ++ int sig; ++ ++ if (state != kClosed) ++ return false; ++ ++ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR && ++ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) { ++ LOG(WARNING) << "Unsupported audio format."; ++ return false; ++ } ++ ++ sio_initpar(&par); ++ par.rate = params.sample_rate(); ++ par.rchan = params.channels(); ++ par.bits = SampleFormatToBitsPerChannel(kSampleFormat); ++ par.bps = par.bits / 8; ++ par.sig = sig = par.bits != 8 ? 1 : 0; ++ par.le = SIO_LE_NATIVE; ++ par.appbufsz = params.frames_per_buffer(); ++ ++ hdl = sio_open(SIO_DEVANY, SIO_REC, 0); ++ ++ if (hdl == NULL) { ++ LOG(ERROR) << "Couldn't open audio device."; ++ return false; ++ } ++ ++ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) { ++ LOG(ERROR) << "Couldn't set audio parameters."; ++ goto bad_close; ++ } ++ ++ if (par.rate != (unsigned int)params.sample_rate() || ++ par.rchan != (unsigned int)params.channels() || ++ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) || ++ par.sig != (unsigned int)sig || ++ (par.bps > 1 && par.le != SIO_LE_NATIVE) || ++ (par.bits != par.bps * 8)) { ++ LOG(ERROR) << "Unsupported audio parameters."; ++ goto bad_close; ++ } ++ state = kStopped; ++ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; ++ sio_onmove(hdl, &OnMoveCallback, this); ++ return true; ++bad_close: ++ sio_close(hdl); ++ return false; ++} ++ ++void SndioAudioInputStream::Start(AudioInputCallback* cb) { ++ ++ StartAgc(); ++ ++ state = kRunning; ++ hw_delay = 0; ++ callback = cb; ++ sio_start(hdl); ++ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) { ++ LOG(ERROR) << "Failed to create real-time thread for recording."; ++ sio_stop(hdl); ++ state = kStopped; ++ } ++} ++ ++void SndioAudioInputStream::Stop() { ++ ++ if (state == kStopped) ++ return; ++ ++ state = kStopWait; ++ pthread_join(thread, NULL); ++ sio_stop(hdl); ++ state = kStopped; ++ ++ StopAgc(); ++} ++ ++void SndioAudioInputStream::Close() { ++ ++ if (state == kClosed) ++ return; ++ ++ if (state == kRunning) ++ Stop(); ++ ++ state = kClosed; ++ delete [] buffer; ++ sio_close(hdl); ++ ++ manager->ReleaseInputStream(this); ++} ++ ++double SndioAudioInputStream::GetMaxVolume() { ++ // Not supported ++ return 0.0; ++} ++ ++void SndioAudioInputStream::SetVolume(double volume) { ++ // Not supported. Do nothing. ++} ++ ++double SndioAudioInputStream::GetVolume() { ++ // Not supported. ++ return 0.0; ++} ++ ++bool SndioAudioInputStream::IsMuted() { ++ // Not supported. ++ return false; ++} ++ ++void SndioAudioInputStream::SetOutputDeviceForAec( ++ const std::string& output_device_id) { ++ // Not supported. ++} ++ ++void SndioAudioInputStream::ThreadLoop(void) { ++ size_t todo, n; ++ char *data; ++ unsigned int nframes; ++ double normalized_volume = 0.0; ++ ++ nframes = audio_bus->frames(); ++ ++ while (state == kRunning && !sio_eof(hdl)) { ++ ++ GetAgcVolume(&normalized_volume); ++ ++ // read one block ++ todo = nframes * params.GetBytesPerFrame(kSampleFormat); ++ data = buffer; ++ while (todo > 0) { ++ n = sio_read(hdl, data, todo); ++ if (n == 0) ++ return; // unrecoverable I/O error ++ todo -= n; ++ data += n; ++ } ++ hw_delay -= nframes; ++ ++ // convert frames count to TimeDelta ++ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, ++ params.sample_rate()); ++ ++ // push into bus ++ audio_bus->FromInterleaved(reinterpret_cast(buffer), nframes); ++ ++ // invoke callback ++ callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.); ++ } ++} ++ ++} // namespace media +diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.h chromium-83.0.4103.97/media/audio/sndio/sndio_input.h +--- a/media/audio/sndio/sndio_input.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/sndio_input.h 2020-06-13 17:32:28.511395969 +0200 +@@ -0,0 +1,91 @@ ++// Copyright 2013 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_ ++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_ ++ ++#include ++#include ++#include ++ ++#include "base/compiler_specific.h" ++#include "base/macros.h" ++#include "base/memory/weak_ptr.h" ++#include "base/time/time.h" ++#include "media/audio/agc_audio_stream.h" ++#include "media/audio/audio_io.h" ++#include "media/audio/audio_device_description.h" ++#include "media/base/audio_parameters.h" ++ ++namespace media { ++ ++class AudioManagerBase; ++ ++// Implementation of AudioOutputStream using sndio(7) ++class SndioAudioInputStream : public AgcAudioStream { ++ public: ++ // Pass this to the constructor if you want to attempt auto-selection ++ // of the audio recording device. ++ static const char kAutoSelectDevice[]; ++ ++ // Create a PCM Output stream for the SNDIO device identified by ++ // |device_name|. If unsure of what to use for |device_name|, use ++ // |kAutoSelectDevice|. ++ SndioAudioInputStream(AudioManagerBase* audio_manager, ++ const std::string& device_name, ++ const AudioParameters& params); ++ ++ ~SndioAudioInputStream() override; ++ ++ // Implementation of AudioInputStream. ++ bool Open() override; ++ void Start(AudioInputCallback* callback) override; ++ void Stop() override; ++ void Close() override; ++ double GetMaxVolume() override; ++ void SetVolume(double volume) override; ++ double GetVolume() override; ++ bool IsMuted() override; ++ void SetOutputDeviceForAec(const std::string& output_device_id) override; ++ ++ private: ++ ++ enum StreamState { ++ kClosed, // Not opened yet ++ kStopped, // Device opened, but not started yet ++ kRunning, // Started, device playing ++ kStopWait // Stopping, waiting for the real-time thread to exit ++ }; ++ ++ // C-style call-backs ++ static void OnMoveCallback(void *arg, int delta); ++ static void* ThreadEntry(void *arg); ++ ++ // Continuously moves data from the device to the consumer ++ void ThreadLoop(); ++ // Our creator, the audio manager needs to be notified when we close. ++ AudioManagerBase* manager; ++ // Parameters of the source ++ AudioParameters params; ++ // We store data here for consumer ++ std::unique_ptr audio_bus; ++ // Call-back that consumes recorded data ++ AudioInputCallback* callback; // Valid during a recording session. ++ // Handle of the audio device ++ struct sio_hdl* hdl; ++ // Current state of the stream ++ enum StreamState state; ++ // High priority thread running ThreadLoop() ++ pthread_t thread; ++ // Number of frames buffered in the hardware ++ int hw_delay; ++ // Temporary buffer where data is stored sndio-compatible format ++ char* buffer; ++ ++ DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream); ++}; ++ ++} // namespace media ++ ++#endif // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_ +diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.cc chromium-83.0.4103.97/media/audio/sndio/sndio_output.cc +--- a/media/audio/sndio/sndio_output.cc 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/sndio_output.cc 2020-06-13 17:32:28.511395969 +0200 +@@ -0,0 +1,183 @@ ++// Copyright (c) 2012 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "base/logging.h" ++#include "base/time/time.h" ++#include "base/time/default_tick_clock.h" ++#include "media/audio/audio_manager_base.h" ++#include "media/base/audio_timestamp_helper.h" ++#include "media/audio/sndio/sndio_output.h" ++ ++namespace media { ++ ++static const SampleFormat kSampleFormat = kSampleFormatS16; ++ ++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) { ++ SndioAudioOutputStream* self = static_cast(arg); ++ ++ self->hw_delay -= delta; ++} ++ ++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) { ++ SndioAudioOutputStream* self = static_cast(arg); ++ ++ self->vol = vol; ++} ++ ++void *SndioAudioOutputStream::ThreadEntry(void *arg) { ++ SndioAudioOutputStream* self = static_cast(arg); ++ ++ self->ThreadLoop(); ++ return NULL; ++} ++ ++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params, ++ AudioManagerBase* manager) ++ : manager(manager), ++ params(params), ++ audio_bus(AudioBus::Create(params)), ++ state(kClosed), ++ mutex(PTHREAD_MUTEX_INITIALIZER) { ++} ++ ++SndioAudioOutputStream::~SndioAudioOutputStream() { ++ if (state != kClosed) ++ Close(); ++} ++ ++bool SndioAudioOutputStream::Open() { ++ struct sio_par par; ++ int sig; ++ ++ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR && ++ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) { ++ LOG(WARNING) << "Unsupported audio format."; ++ return false; ++ } ++ sio_initpar(&par); ++ par.rate = params.sample_rate(); ++ par.pchan = params.channels(); ++ par.bits = SampleFormatToBitsPerChannel(kSampleFormat); ++ par.bps = par.bits / 8; ++ par.sig = sig = par.bits != 8 ? 1 : 0; ++ par.le = SIO_LE_NATIVE; ++ par.appbufsz = params.frames_per_buffer(); ++ ++ hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0); ++ if (hdl == NULL) { ++ LOG(ERROR) << "Couldn't open audio device."; ++ return false; ++ } ++ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) { ++ LOG(ERROR) << "Couldn't set audio parameters."; ++ goto bad_close; ++ } ++ if (par.rate != (unsigned int)params.sample_rate() || ++ par.pchan != (unsigned int)params.channels() || ++ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) || ++ par.sig != (unsigned int)sig || ++ (par.bps > 1 && par.le != SIO_LE_NATIVE) || ++ (par.bits != par.bps * 8)) { ++ LOG(ERROR) << "Unsupported audio parameters."; ++ goto bad_close; ++ } ++ state = kStopped; ++ volpending = 0; ++ vol = 0; ++ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; ++ sio_onmove(hdl, &OnMoveCallback, this); ++ sio_onvol(hdl, &OnVolCallback, this); ++ return true; ++ bad_close: ++ sio_close(hdl); ++ return false; ++} ++ ++void SndioAudioOutputStream::Close() { ++ if (state == kClosed) ++ return; ++ if (state == kRunning) ++ Stop(); ++ state = kClosed; ++ delete [] buffer; ++ sio_close(hdl); ++ manager->ReleaseOutputStream(this); // Calls the destructor ++} ++ ++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) { ++ state = kRunning; ++ hw_delay = 0; ++ source = callback; ++ sio_start(hdl); ++ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) { ++ LOG(ERROR) << "Failed to create real-time thread."; ++ sio_stop(hdl); ++ state = kStopped; ++ } ++} ++ ++void SndioAudioOutputStream::Stop() { ++ if (state == kStopped) ++ return; ++ state = kStopWait; ++ pthread_join(thread, NULL); ++ sio_stop(hdl); ++ state = kStopped; ++} ++ ++void SndioAudioOutputStream::SetVolume(double v) { ++ pthread_mutex_lock(&mutex); ++ vol = v * SIO_MAXVOL; ++ volpending = 1; ++ pthread_mutex_unlock(&mutex); ++} ++ ++void SndioAudioOutputStream::GetVolume(double* v) { ++ pthread_mutex_lock(&mutex); ++ *v = vol * (1. / SIO_MAXVOL); ++ pthread_mutex_unlock(&mutex); ++} ++ ++// This stream is always used with sub second buffer sizes, where it's ++// sufficient to simply always flush upon Start(). ++void SndioAudioOutputStream::Flush() {} ++ ++void SndioAudioOutputStream::ThreadLoop(void) { ++ int avail, count, result; ++ ++ while (state == kRunning) { ++ // Update volume if needed ++ pthread_mutex_lock(&mutex); ++ if (volpending) { ++ volpending = 0; ++ sio_setvol(hdl, vol); ++ } ++ pthread_mutex_unlock(&mutex); ++ ++ // Get data to play ++ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, ++ params.sample_rate()); ++ count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get()); ++ audio_bus->ToInterleaved(count, reinterpret_cast(buffer)); ++ if (count == 0) { ++ // We have to submit something to the device ++ count = audio_bus->frames(); ++ memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat)); ++ LOG(WARNING) << "No data to play, running empty cycle."; ++ } ++ ++ // Submit data to the device ++ avail = count * params.GetBytesPerFrame(kSampleFormat); ++ result = sio_write(hdl, buffer, avail); ++ if (result == 0) { ++ LOG(WARNING) << "Audio device disconnected."; ++ break; ++ } ++ ++ // Update hardware pointer ++ hw_delay += count; ++ } ++} ++ ++} // namespace media +diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-83.0.4103.97/media/audio/sndio/sndio_output.h +--- a/media/audio/sndio/sndio_output.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/sndio_output.h 2020-06-13 17:32:28.511395969 +0200 +@@ -0,0 +1,86 @@ ++// Copyright (c) 2012 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ ++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ ++ ++#include ++#include ++ ++#include "base/time/tick_clock.h" ++#include "base/time/time.h" ++#include "media/audio/audio_io.h" ++ ++namespace media { ++ ++class AudioManagerBase; ++ ++// Implementation of AudioOutputStream using sndio(7) ++class SndioAudioOutputStream : public AudioOutputStream { ++ public: ++ // The manager is creating this object ++ SndioAudioOutputStream(const AudioParameters& params, ++ AudioManagerBase* manager); ++ virtual ~SndioAudioOutputStream(); ++ ++ // Implementation of AudioOutputStream. ++ bool Open() override; ++ void Close() override; ++ void Start(AudioSourceCallback* callback) override; ++ void Stop() override; ++ void SetVolume(double volume) override; ++ void GetVolume(double* volume) override; ++ void Flush() override; ++ ++ friend void sndio_onmove(void *arg, int delta); ++ friend void sndio_onvol(void *arg, unsigned int vol); ++ friend void *sndio_threadstart(void *arg); ++ ++ private: ++ enum StreamState { ++ kClosed, // Not opened yet ++ kStopped, // Device opened, but not started yet ++ kRunning, // Started, device playing ++ kStopWait // Stopping, waiting for the real-time thread to exit ++ }; ++ ++ // C-style call-backs ++ static void OnMoveCallback(void *arg, int delta); ++ static void OnVolCallback(void *arg, unsigned int vol); ++ static void* ThreadEntry(void *arg); ++ ++ // Continuously moves data from the producer to the device ++ void ThreadLoop(void); ++ ++ // Our creator, the audio manager needs to be notified when we close. ++ AudioManagerBase* manager; ++ // Parameters of the source ++ AudioParameters params; ++ // Source stores data here ++ std::unique_ptr audio_bus; ++ // Call-back that produces data to play ++ AudioSourceCallback* source; ++ // Handle of the audio device ++ struct sio_hdl* hdl; ++ // Current state of the stream ++ enum StreamState state; ++ // High priority thread running ThreadLoop() ++ pthread_t thread; ++ // Protects vol, volpending and hw_delay ++ pthread_mutex_t mutex; ++ // Current volume in the 0..SIO_MAXVOL range ++ int vol; ++ // Set to 1 if volumes must be refreshed in the realtime thread ++ int volpending; ++ // Number of frames buffered in the hardware ++ int hw_delay; ++ // Temporary buffer where data is stored sndio-compatible format ++ char* buffer; ++ ++ DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream); ++}; ++ ++} // namespace media ++ ++#endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ +diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni +--- a/media/media_options.gni 2020-06-03 20:40:26.000000000 +0200 ++++ b/media/media_options.gni 2020-06-13 17:32:28.512395963 +0200 +@@ -119,6 +119,9 @@ + # Enables runtime selection of ALSA library for audio. + use_alsa = false + ++ # Enable runtime selection of sndio(7) ++ use_sndio = false ++ + # Alsa should be used on non-Android, non-Mac POSIX systems. + # Alsa should be used on desktop Chromecast and audio-only Chromecast builds. + if (is_posix && !is_android && !is_mac && diff --git a/srcpkgs/electron19/files/patches/chromium-system-nodejs.patch b/srcpkgs/electron19/files/patches/chromium-system-nodejs.patch new file mode 100644 index 000000000000..14f88663dade --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-system-nodejs.patch @@ -0,0 +1,16 @@ +--- a/third_party/node/node.py 2022-02-23 04:45:01.000000000 +0100 ++++ - 2022-04-24 21:49:27.122211926 +0200 +@@ -13,12 +13,7 @@ + def GetBinaryPath(): + darwin_name = ('node-darwin-arm64' if platform.machine() == 'arm64' else + 'node-darwin-x64') +- return os_path.join(os_path.dirname(__file__), *{ +- 'Darwin': ('mac', darwin_name, 'bin', 'node'), +- 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), +- 'Windows': ('win', 'node.exe'), +- }[platform.system()]) +- ++ return "/usr/bin/node" + + def RunNode(cmd_parts, stdout=None): + cmd = [GetBinaryPath()] + cmd_parts diff --git a/srcpkgs/electron19/files/patches/chromium-system-nodejs.patch:q b/srcpkgs/electron19/files/patches/chromium-system-nodejs.patch:q new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/srcpkgs/electron19/files/patches/chromium-unbundle-ffmpeg-av_stream_get_first_dts.patch b/srcpkgs/electron19/files/patches/chromium-unbundle-ffmpeg-av_stream_get_first_dts.patch new file mode 100644 index 000000000000..dae1adde0bc6 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-unbundle-ffmpeg-av_stream_get_first_dts.patch @@ -0,0 +1,12 @@ +diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn +index 16e20744706..6a079b32221 100644 +--- a/build/linux/unbundle/ffmpeg.gn ++++ b/build/linux/unbundle/ffmpeg.gn +@@ -12,6 +12,7 @@ pkg_config("system_ffmpeg") { + "libavformat", + "libavutil", + ] ++ defines = [ "av_stream_get_first_dts(stream)=stream->first_dts" ] + } + + buildflag_header("ffmpeg_features") { diff --git a/srcpkgs/electron19/files/patches/chromium-use-ffile-compilation-dir.patch b/srcpkgs/electron19/files/patches/chromium-use-ffile-compilation-dir.patch new file mode 100644 index 000000000000..f0ce44c0a487 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-use-ffile-compilation-dir.patch @@ -0,0 +1,66 @@ +From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001 +From: Zequan Wu +Date: Tue, 20 Jul 2021 14:13:50 +0000 +Subject: [PATCH] Use -ffile-compilation-dir= instead of + -fdebug-compilation-dir= + +Bug: 1010267 +Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738 +Auto-Submit: Zequan Wu +Commit-Queue: Nico Weber +Reviewed-by: Nico Weber +Cr-Commit-Position: refs/heads/master@{#903456} +--- + build/config/compiler/BUILD.gn | 18 ++++++++++++------ + build/config/compiler/compiler.gni | 7 ++----- + 2 files changed, 14 insertions(+), 11 deletions(-) + +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index ede07d111c..6db16c1cdd 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -1216,12 +1216,19 @@ config("compiler_deterministic") { + # different build directory like "out/feature_a" and "out/feature_b" if + # we build same files with same compile flag. + # Other paths are already given in relative, no need to normalize them. +- cflags += [ +- "-Xclang", +- "-fdebug-compilation-dir", +- "-Xclang", +- ".", +- ] ++ if (is_nacl) { ++ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. ++ cflags += [ ++ "-Xclang", ++ "-fdebug-compilation-dir", ++ "-Xclang", ++ ".", ++ ] ++ } else { ++ # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir= ++ # and -fcoverage-compilation-dir=. ++ cflags += [ "-ffile-compilation-dir=." ] ++ } + if (!is_win) { + # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) + asmflags = [ "-Wa,-fdebug-compilation-dir,." ] +diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni +index 8c259c360a..642319b4f4 100644 +--- a/build/config/compiler/compiler.gni ++++ b/build/config/compiler/compiler.gni +@@ -225,11 +225,8 @@ declare_args() { + # deterministic builds to reduce compile times, so this is less relevant for + # official builders. + strip_absolute_paths_from_debug_symbols_default = +- # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has +- # dependency to absolute path of source files. +- !use_clang_coverage && +- (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux || +- is_chromeos || (is_apple && !enable_dsyms)) ++ is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux || ++ is_chromeos || (is_apple && !enable_dsyms) + + # If the platform uses stripped absolute paths by default, then we don't expose + # it as a configuration option. If this is causing problems, please file a bug. diff --git a/srcpkgs/electron19/files/patches/chromium-use-ffile-compilation-dir.patch.args b/srcpkgs/electron19/files/patches/chromium-use-ffile-compilation-dir.patch.args new file mode 100644 index 000000000000..8bbbbe948363 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-use-ffile-compilation-dir.patch.args @@ -0,0 +1 @@ +-RNp1 diff --git a/srcpkgs/electron19/files/patches/chromium-webrtc-r0.patch b/srcpkgs/electron19/files/patches/chromium-webrtc-r0.patch new file mode 100644 index 000000000000..c9b6e086ef00 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-webrtc-r0.patch @@ -0,0 +1,33 @@ +Upstream: Yes, https://webrtc-review.googlesource.com/9384 +Reason: Fixes musl builds of webrtc + +From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa +Date: Fri, 13 Oct 2017 15:49:32 +0200 +Subject: [PATCH] IWYU: Include math.h for round(3). + +math.h was being implicitly included, which can break the build with +alternative libc implementations. + +Bug: None +Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952 +Reviewed-on: https://webrtc-review.googlesource.com/9384 +Reviewed-by: Tommi +Commit-Queue: Raphael Kubo da Costa (rakuco) +Cr-Commit-Position: refs/heads/master@{#20292} +--- + +--- a/third_party/webrtc/p2p/base/port.cc ++++ a/third_party/webrtc/p2p/base/port.cc +@@ -10,6 +10,8 @@ + + #include "p2p/base/port.h" + ++#include ++ + #include + #include + +-- +2.15.0.rc2 + diff --git a/srcpkgs/electron19/files/patches/chromium-webrtc-size_t.patch b/srcpkgs/electron19/files/patches/chromium-webrtc-size_t.patch new file mode 100644 index 000000000000..a1fbd43b3013 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-webrtc-size_t.patch @@ -0,0 +1,10 @@ +--- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-08-10 20:42:29.000000000 +0200 ++++ a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-09-04 12:47:07.014833633 +0200 +@@ -12,6 +12,7 @@ + #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_ + + #include ++#include + + namespace webrtc { + diff --git a/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-4k-pages.patch b/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-4k-pages.patch new file mode 100644 index 000000000000..953ca165a094 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-4k-pages.patch @@ -0,0 +1,56 @@ +commit 45809f85bc3524f867e6e954f444fddd2333245a +Author: q66 +Date: Fri Jan 7 18:18:52 2022 +0100 + + switch ppc64 to 4k pages + + since the partition allocator appears to hate larger constants + and at this point errors at compile time and i am not willing + to wade through this pile of curse and we use 4k kernels anyway, + assume 4K pages for ppc64 + +diff --git a/base/allocator/partition_allocator/page_allocator_constants.h b/base/allocator/partition_allocator/page_allocator_constants.h +index bfd5753..045082b 100644 +--- a/base/allocator/partition_allocator/page_allocator_constants.h ++++ b/base/allocator/partition_allocator/page_allocator_constants.h +@@ -40,7 +40,7 @@ namespace base { + + PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t + PageAllocationGranularityShift() { +-#if BUILDFLAG(IS_WIN) || defined(ARCH_CPU_PPC64) ++#if BUILDFLAG(IS_WIN) + // Modern ppc64 systems support 4kB (shift = 12) and 64kB (shift = 16) page + // sizes. Since 64kB is the de facto standard on the platform and binaries + // compiled for 64kB are likely to work on 4kB systems, 64kB is a good choice +diff --git a/base/allocator/partition_allocator/partition_alloc_constants.h b/base/allocator/partition_allocator/partition_alloc_constants.h +index 0b9260d..3e054ec 100644 +--- a/base/allocator/partition_allocator/partition_alloc_constants.h ++++ b/base/allocator/partition_allocator/partition_alloc_constants.h +@@ -74,11 +74,6 @@ + PartitionPageShift() { + return 16; // 64 KiB + } +-#elif defined(ARCH_CPU_PPC64) +-PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t +-PartitionPageShift() { +- return 18; // 256 KiB +-} + #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ + (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) + PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t +diff --git a/base/allocator/partition_allocator/partition_alloc_forward.h b/base/allocator/partition_allocator/partition_alloc_forward.h +index 938ea38..9414b41 100644 +--- a/base/allocator/partition_allocator/partition_alloc_forward.h ++++ b/base/allocator/partition_allocator/partition_alloc_forward.h +@@ -26,7 +26,10 @@ namespace base { + // + // __STDCPP_DEFAULT_NEW_ALIGNMENT__ is C++17. As such, it is not defined on all + // platforms, as Chrome's requirement is C++14 as of 2020. +-#if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__) ++#if defined(__powerpc64__) ++/* we want this to be 16 here always */ ++constexpr size_t kAlignment = 16; ++#elif defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__) + constexpr size_t kAlignment = + std::max(alignof(max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__); + #else diff --git a/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-libvpx.patch b/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-libvpx.patch new file mode 100644 index 000000000000..6d423d4091c5 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-libvpx.patch @@ -0,0 +1,72 @@ +Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu +and add --enable-vsx, and change generic to ppc for the rtcd header. + +From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001 +From: q66 +Date: Wed, 9 Sep 2020 19:08:25 +0200 +Subject: [PATCH] enable generation of ppc64 libvpx bits + +this doesn't update the gni file, that's done from +the template by running the appropriate scripts +--- + third_party/libvpx/BUILD.gn | 4 ++++ + third_party/libvpx/generate_gni.sh | 9 +++++++++ + 2 files changed, 13 insertions(+) + +diff --git third_party/libvpx/BUILD.gn third_party/libvpx/BUILD.gn +index 7198e59..3300485 100644 +--- a/third_party/libvpx/BUILD.gn ++++ b/third_party/libvpx/BUILD.gn +@@ -336,6 +336,8 @@ static_library("libvpx") { + } else { + sources = libvpx_srcs_arm64 + } ++ } else if (current_cpu == "ppc64") { ++ sources = libvpx_srcs_ppc64 + } + + configs -= [ "//build/config/compiler:chromium_code" ] +diff --git third_party/libvpx/generate_gni.sh third_party/libvpx/generate_gni.sh +index bcf84b0..8a3f4f1 100755 +--- a/third_party/libvpx/generate_gni.sh ++++ b/third_party/libvpx/generate_gni.sh +@@ -361,6 +361,7 @@ gen_config_files linux/arm-neon-highbd "--target=armv7-linux-gcc ${all_platforms + gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}" + gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}" + gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}" ++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}" + gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}" + gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}" + gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}" +@@ -386,6 +387,7 @@ lint_config linux/arm-neon-highbd + lint_config linux/arm64-highbd + lint_config linux/mipsel + lint_config linux/mips64el ++lint_config linux/ppc64 + lint_config linux/generic + lint_config win/arm64 + lint_config win/ia32 +@@ -415,6 +417,7 @@ gen_rtcd_header linux/arm-neon-highbd armv7 + gen_rtcd_header linux/arm64-highbd armv8 + gen_rtcd_header linux/mipsel mipsel + gen_rtcd_header linux/mips64el mips64el ++gen_rtcd_header linux/ppc64 generic + gen_rtcd_header linux/generic generic + gen_rtcd_header win/arm64 armv8 + gen_rtcd_header win/ia32 x86 "${require_sse2}" +@@ -500,6 +503,12 @@ if [ -z $ONLY_CONFIGS ]; then + + echo "MIPS64 source list is identical to MIPS source list. No need to generate it." + ++ echo "Generate ppc64 source list." ++ config=$(print_config_basic linux/ppc64) ++ make_clean ++ make libvpx_srcs.txt target=libs $config > /dev/null ++ convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64 ++ + echo "Generate NaCl source list." + config=$(print_config_basic nacl) + make_clean +-- +2.28.0 + diff --git a/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-sandbox-linux-stat.patch new file mode 100644 index 000000000000..4bfb5d494b06 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-sandbox-linux-stat.patch @@ -0,0 +1,31 @@ +--- a/sandbox/linux/system_headers/linux_stat.h ++++ b/sandbox/linux/system_headers/linux_stat.h +@@ -155,6 +155,28 @@ struct kernel_stat { + unsigned int __unused4; + unsigned int __unused5; + }; ++#elif defined(__powerpc64__) ++struct kernel_stat { ++ unsigned long st_dev; ++ unsigned long st_ino; ++ unsigned long st_nlink; ++ unsigned int st_mode; ++ unsigned int st_uid; ++ unsigned int st_gid; ++ unsigned long st_rdev; ++ long st_size; ++ unsigned long st_blksize; ++ unsigned long st_blocks; ++ unsigned long st_atime_; ++ unsigned long st_atime_nsec_; ++ unsigned long st_mtime_; ++ unsigned long st_mtime_nsec_; ++ unsigned long st_ctime_; ++ unsigned long st_ctime_nsec_; ++ unsigned long __unused4; ++ unsigned long __unused5; ++ unsigned long __unused6; ++}; + #endif + + // On 32-bit systems, we default to the 64-bit stat struct like libc diff --git a/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-support.patch b/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-support.patch new file mode 100644 index 000000000000..e626f8130d43 --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-support.patch @@ -0,0 +1,3698 @@ +commit 2c013a317b1114ef67cdbbc30824b28907b9ea94 +Author: Daniel Kolesa +Date: Wed Mar 3 19:08:29 2021 +0100 + + ppc64le support + +diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py +index 286a92a27..ec36a85d3 100755 +--- a/build/download_nacl_toolchains.py ++++ b/build/download_nacl_toolchains.py +@@ -13,6 +13,10 @@ import sys + + + def Main(args): ++ # If `disable_nacl=1` is in GYP_DEFINES, exit ++ if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''): ++ return 0 ++ + script_dir = os.path.dirname(os.path.abspath(__file__)) + src_dir = os.path.dirname(script_dir) + nacl_dir = os.path.join(src_dir, 'native_client') +--- a/chrome/installer/linux/BUILD.gn ++++ b/chrome/installer/linux/BUILD.gn +@@ -97,8 +97,6 @@ + "$root_out_dir/xdg-mime", + "$root_out_dir/xdg-settings", + "$root_out_dir/locales/en-US.pak", +- "$root_out_dir/MEIPreload/manifest.json", +- "$root_out_dir/MEIPreload/preloaded_data.pb", + ] + + action_foreach("calculate_deb_dependencies") { +@@ -377,7 +377,6 @@ + "//chrome", + "//chrome:packed_resources", + "//chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service:chrome_management_service", +- "//chrome/browser/resources/media/mei_preload:component", + "//components/crash/core/app:chrome_crashpad_handler", + "//sandbox/linux:chrome_sandbox", + ] +diff --git a/sandbox/features.gni b/sandbox/features.gni +index db30ae6d6..9dc09bf53 100644 +--- a/sandbox/features.gni ++++ b/sandbox/features.gni +@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni") + use_seccomp_bpf = (is_linux || is_chromeos || is_android) && + (current_cpu == "x86" || current_cpu == "x64" || + current_cpu == "arm" || current_cpu == "arm64" || +- current_cpu == "mipsel" || current_cpu == "mips64el") ++ current_cpu == "mipsel" || current_cpu == "mips64el" || ++ current_cpu == "ppc64") + + use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi + +diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn +index e9a94b461..cca1a5da5 100644 +--- a/sandbox/linux/BUILD.gn ++++ b/sandbox/linux/BUILD.gn +@@ -427,6 +427,8 @@ component("sandbox_services") { + + source_set("sandbox_services_headers") { + sources = [ ++ "system_headers/ppc64_linux_syscalls.h", ++ "system_headers/ppc64_linux_ucontext.h", + "system_headers/arm64_linux_syscalls.h", + "system_headers/arm_linux_syscalls.h", + "system_headers/arm_linux_ucontext.h", +diff --git a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h +index 313511f22..0ca3a326f 100644 +--- a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h ++++ b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h +@@ -56,6 +56,13 @@ + #define MAX_PUBLIC_SYSCALL __NR_syscalls + #define MAX_SYSCALL MAX_PUBLIC_SYSCALL + ++#elif defined(__powerpc64__) ++ ++#include ++#define MIN_SYSCALL 0u ++#define MAX_PUBLIC_SYSCALL __NR_syscalls ++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL ++ + #else + #error "Unsupported architecture" + #endif +diff --git a/sandbox/linux/bpf_dsl/seccomp_macros.h b/sandbox/linux/bpf_dsl/seccomp_macros.h +index 1a407b952..a6aec544e 100644 +--- a/sandbox/linux/bpf_dsl/seccomp_macros.h ++++ b/sandbox/linux/bpf_dsl/seccomp_macros.h +@@ -16,6 +16,9 @@ + #if defined(__mips__) + // sys/user.h in eglibc misses size_t definition + #include ++#elif defined(__powerpc64__) ++// Manually define greg_t on ppc64 ++typedef unsigned long long greg_t; + #endif + #endif + +@@ -346,6 +349,51 @@ struct regs_struct { + #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3] + #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4] + #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5] ++ ++#elif defined(__powerpc64__) ++#include ++ ++typedef struct pt_regs regs_struct; ++ ++#ifdef ARCH_CPU_LITTLE_ENDIAN ++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE ++#else ++#define SECCOMP_ARCH AUDIT_ARCH_PPC64 ++#endif ++ ++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg]) ++ ++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3) ++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0) ++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip ++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3) ++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4) ++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5) ++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6) ++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7) ++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8) ++ ++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr)) ++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch)) ++#define SECCOMP_IP_MSB_IDX \ ++ (offsetof(struct arch_seccomp_data, instruction_pointer) + 4) ++#define SECCOMP_IP_LSB_IDX \ ++ (offsetof(struct arch_seccomp_data, instruction_pointer) + 0) ++#define SECCOMP_ARG_MSB_IDX(nr) \ ++ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4) ++#define SECCOMP_ARG_LSB_IDX(nr) \ ++ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0) ++ ++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3] ++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0] ++#define SECCOMP_PT_IP(_regs) (_regs).nip ++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3] ++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4] ++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5] ++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6] ++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7] ++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8] ++ + #else + #error Unsupported target platform + +diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +index 6a1ec2389..f20c582dd 100644 +--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc ++++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +@@ -88,7 +88,8 @@ bool IsBaselinePolicyWatched(int sysno) { + SyscallSets::IsPrctl(sysno) || + SyscallSets::IsProcessGroupOrSession(sysno) || + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + SyscallSets::IsSocketCall(sysno) || + #endif + #if defined(__arm__) +@@ -227,7 +228,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno, + } + + #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + if (sysno == __NR_mmap) + return RestrictMmapFlags(); + #endif +@@ -245,7 +246,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno, + return RestrictPrctl(); + + #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + if (sysno == __NR_socketpair) { + // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen. + static_assert(AF_UNIX == PF_UNIX, +@@ -285,7 +286,8 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno, + } + + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + if (SyscallSets::IsSocketCall(sysno)) + return RestrictSocketcallCommand(); + #endif +diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc +index 01c046dda..7e5a6be82 100644 +--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc 2021-04-15 13:11:10.481579470 -0400 ++++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc 2021-04-15 13:12:43.524831376 -0400 +@@ -302,7 +302,7 @@ + TEST_BASELINE_SIGSYS(__NR_syslog) + TEST_BASELINE_SIGSYS(__NR_timer_create) + +-#if !defined(__aarch64__) ++#if !defined(__aarch64__) && !defined(__powerpc64__) + TEST_BASELINE_SIGSYS(__NR_inotify_init) + TEST_BASELINE_SIGSYS(__NR_vserver) + #endif +diff --git a/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc b/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc +index 01c046dda..7e5a6be82 100644 +--- a/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc ++++ b/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc +@@ -358,7 +358,16 @@ + if (args.nr == __NR_fstatat_default) { + if (*reinterpret_cast(args.args[1]) == '\0' && + args.args[3] == static_cast(AT_EMPTY_PATH)) { +- return syscall(__NR_fstat_default, static_cast(args.args[0]), ++ int fd = static_cast(args.args[0]); ++#if defined(__powerpc64__) ++ // On ppc64+glibc, some syscalls seem to accidentally negate the first ++ // parameter which causes checks against it to fail. For now, manually ++ // negate them back. ++ // TODO: Investigate the root cause and fix in glibc ++ if (fd < 0) ++ fd = -fd; ++#endif ++ return syscall(__NR_fstat_default, fd, + reinterpret_cast(args.args[2])); + } + return -reinterpret_cast(fs_denied_errno); +diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +index 2a97d3916..8e81aa6cf 100644 +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2021-04-14 14:41:08.000000000 -0400 ++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2021-04-15 13:17:57.808715733 -0400 +@@ -37,7 +37,8 @@ + + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ + !defined(__arm__) && !defined(__aarch64__) && \ +- !defined(PTRACE_GET_THREAD_AREA) ++ !defined(PTRACE_GET_THREAD_AREA) && \ ++ !defined(__powerpc64__) + // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance + // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA. + // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't +@@ -45,6 +46,11 @@ + #include + #endif + ++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h ++#ifdef __powerpc64__ ++#include ++#endif ++ + #if BUILDFLAG(IS_ANDROID) + + #if !defined(F_DUPFD_CLOEXEC) +@@ -99,6 +105,14 @@ + return true; + #else + return false; ++#endif ++} ++ ++inline bool IsArchitecturePPC64() { ++#if defined(__powerpc64__) ++ return true; ++#else ++ return false; + #endif + } + +@@ -239,6 +254,8 @@ + uint64_t kOLargeFileFlag = O_LARGEFILE; + if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips()) + kOLargeFileFlag = 0100000; ++ else if (IsArchitecturePPC64()) ++ kOLargeFileFlag = 0200000; + + const Arg cmd(1); + const Arg long_arg(2); +@@ -256,7 +273,16 @@ + F_SETLKW, + F_GETLK, + F_DUPFD, +- F_DUPFD_CLOEXEC), ++ F_DUPFD_CLOEXEC ++#if defined(__powerpc64__) ++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants ++// but glibc will sometimes still use the 32-bit versions. Allow both. ++ , ++ 5, /* F_GETLK (32) */ ++ 6, /* F_SETLK (32) */ ++ 7 /* F_SETLKW (32) */ ++#endif ++ ), + Allow()) + .Case(F_SETFL, + If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS())) +@@ -266,7 +292,7 @@ + // clang-format on + } + +-#if defined(__i386__) || defined(__mips__) ++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__) + ResultExpr RestrictSocketcallCommand() { + // Unfortunately, we are unable to restrict the first parameter to + // socketpair(2). Whilst initially sounding bad, it's noteworthy that very +@@ -419,7 +445,7 @@ + #endif + return Switch(request) + .CASES(( +-#if !defined(__aarch64__) ++#if !defined(__aarch64__) && !defined(__powerpc64__) + PTRACE_GETREGS, PTRACE_GETFPREGS, PTRACE_GET_THREAD_AREA, + PTRACE_GETREGSET, + #endif +diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h +index ba4289f05..9a4d5ab2d 100644 +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h ++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h +@@ -48,7 +48,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictMprotectFlags(); + // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME. + SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands(); + +-#if defined(__i386__) || defined(__mips__) ++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__) + // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2), + // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2). + SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand(); +diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +index 642df7207..34f47eb73 100644 +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +@@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int sysno) { + switch (sysno) { + case __NR_gettimeofday: + #if defined(__i386__) || defined(__x86_64__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_time: + #endif + return true; +@@ -52,12 +53,14 @@ bool SyscallSets::IsAllowedGettime(int sysno) { + case __NR_clock_nanosleep_time64: // Parameters filtered by RestrictClockID(). + #endif + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_ftime: // Obsolete. + #endif + case __NR_settimeofday: // Privileged. + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_stime: + #endif + default: +@@ -135,7 +138,7 @@ bool SyscallSets::IsFileSystem(int sysno) { + case __NR_faccessat: // EPERM not a valid errno. + case __NR_fchmodat: + case __NR_fchownat: // Should be called chownat ? +-#if defined(__x86_64__) || defined(__aarch64__) ++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__) + case __NR_newfstatat: // fstatat(). EPERM not a valid errno. + #elif defined(__i386__) || defined(__arm__) || \ + (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) +@@ -154,7 +157,7 @@ bool SyscallSets::IsFileSystem(int sysno) { + case __NR_memfd_create: + case __NR_mkdirat: + case __NR_mknodat: +-#if defined(__i386__) ++#if defined(__i386__) || defined(__powerpc64__) + case __NR_oldlstat: + case __NR_oldstat: + #endif +@@ -168,7 +171,8 @@ bool SyscallSets::IsFileSystem(int sysno) { + #endif + case __NR_statfs: // EPERM not a valid errno. + #if defined(__i386__) || defined(__arm__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_statfs64: + #endif + case __NR_symlinkat: +@@ -178,7 +182,8 @@ bool SyscallSets::IsFileSystem(int sysno) { + case __NR_truncate64: + #endif + case __NR_unlinkat: +-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ ++ defined(__powerpc64__) + case __NR_utime: + #endif + case __NR_utimensat: // New. +@@ -203,7 +208,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) { + #endif + return true; + // TODO(jln): these should be denied gracefully as well (moved below). +-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ ++ defined(__powerpc64__) + case __NR_fadvise64: // EPERM not a valid errno. + #endif + #if defined(__i386__) +@@ -216,11 +222,12 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) { + case __NR_flock: // EPERM not a valid errno. + case __NR_fstatfs: // Give information about the whole filesystem. + #if defined(__i386__) || defined(__arm__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_fstatfs64: + #endif + case __NR_fsync: // EPERM not a valid errno. +-#if defined(__i386__) ++#if defined(__i386__) || defined(__powerpc64__) + case __NR_oldfstat: + #endif + #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ +@@ -228,6 +235,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) { + case __NR_sync_file_range: // EPERM not a valid errno. + #elif defined(__arm__) + case __NR_arm_sync_file_range: // EPERM not a valid errno. ++#elif defined(__powerpc64__) ++ case __NR_sync_file_range2: // EPERM not a valid errno. + #endif + default: + return false; +@@ -248,7 +257,8 @@ bool SyscallSets::IsDeniedFileSystemAccessViaFd(int sysno) { + #endif + case __NR_getdents64: // EPERM not a valid errno. + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_readdir: + #endif + return true; +@@ -289,7 +299,7 @@ bool SyscallSets::IsGetSimpleId(int sysno) { + bool SyscallSets::IsProcessPrivilegeChange(int sysno) { + switch (sysno) { + case __NR_capset: +-#if defined(__i386__) || defined(__x86_64__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) + case __NR_ioperm: // Intel privilege. + case __NR_iopl: // Intel privilege. + #endif +@@ -340,8 +350,11 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) { + case __NR_rt_sigreturn: + case __NR_rt_sigtimedwait: + #if defined(__i386__) || defined(__arm__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) ++#ifndef __powerpc64__ + case __NR_rt_sigtimedwait_time64: ++#endif + case __NR_sigaction: + case __NR_sigprocmask: + case __NR_sigreturn: +@@ -357,7 +370,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) { + #endif + case __NR_signalfd4: + #if defined(__i386__) || defined(__arm__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_sigpending: + case __NR_sigsuspend: + #endif +@@ -381,7 +395,7 @@ bool SyscallSets::IsAllowedOperationOnFd(int sysno) { + #endif + case __NR_dup3: + #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + case __NR_shutdown: + #endif + return true; +@@ -414,7 +428,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { + case __NR_exit_group: + case __NR_wait4: + case __NR_waitid: +-#if defined(__i386__) ++#if defined(__i386__) || defined(__powerpc64__) + case __NR_waitpid: + #endif + return true; +@@ -431,7 +445,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { + #endif + case __NR_set_tid_address: + case __NR_unshare: +-#if !defined(__mips__) && !defined(__aarch64__) ++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__) + case __NR_vfork: + #endif + default: +@@ -484,7 +498,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) { + return true; + default: + #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + case __NR_socketpair: // We will want to inspect its argument. + #endif + return false; +@@ -494,7 +508,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) { + bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) { + switch (sysno) { + #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + case __NR_accept: + case __NR_accept4: + case __NR_bind: +@@ -509,7 +523,8 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) { + } + + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + // Big multiplexing system call for sockets. + bool SyscallSets::IsSocketCall(int sysno) { + switch (sysno) { +@@ -523,7 +538,8 @@ bool SyscallSets::IsSocketCall(int sysno) { + } + #endif + +-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) ++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ ++ defined(__powerpc64__) + bool SyscallSets::IsNetworkSocketInformation(int sysno) { + switch (sysno) { + case __NR_getpeername: +@@ -548,7 +564,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { + case __NR_mincore: + case __NR_mlockall: + #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + case __NR_mmap: + #endif + #if defined(__i386__) || defined(__arm__) || \ +@@ -578,7 +594,8 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) { + switch (sysno) { + case __NR_lseek: + #if defined(__i386__) || defined(__arm__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR__llseek: + #endif + #if !defined(__aarch64__) +@@ -598,26 +615,28 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) { + case __NR_readv: + case __NR_pread64: + #if defined(__arm__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_recv: + #endif + #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + case __NR_recvfrom: // Could specify source. + case __NR_recvmsg: // Could specify source. + #endif +-#if defined(__i386__) || defined(__x86_64__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) + case __NR_select: + #endif +-#if defined(__i386__) || defined(__arm__) || defined(__mips__) ++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__) + case __NR__newselect: + #endif + #if defined(__arm__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_send: + #endif + #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + case __NR_sendmsg: // Could specify destination. + case __NR_sendto: // Could specify destination. + #endif +@@ -673,7 +692,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) { + return true; + case __NR_getpriority: + #if defined(__i386__) || defined(__arm__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_nice: + #endif + case __NR_setpriority: +@@ -685,7 +705,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) { + bool SyscallSets::IsAdminOperation(int sysno) { + switch (sysno) { + #if defined(__i386__) || defined(__arm__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_bdflush: + #endif + case __NR_kexec_load: +@@ -701,7 +722,8 @@ bool SyscallSets::IsAdminOperation(int sysno) { + + bool SyscallSets::IsKernelModule(int sysno) { + switch (sysno) { +-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ ++ defined(__powerpc64__) + case __NR_create_module: + case __NR_get_kernel_syms: // Should ENOSYS. + case __NR_query_module: +@@ -734,7 +756,8 @@ bool SyscallSets::IsFsControl(int sysno) { + case __NR_swapoff: + case __NR_swapon: + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_umount: + #endif + case __NR_umount2: +@@ -750,7 +773,7 @@ bool SyscallSets::IsNuma(int sysno) { + case __NR_getcpu: + case __NR_mbind: + #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + case __NR_migrate_pages: + #endif + case __NR_move_pages: +@@ -785,14 +808,15 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) { + switch (sysno) { + case __NR_acct: // Privileged. + #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + case __NR_getrlimit: + #endif +-#if defined(__i386__) || defined(__arm__) ++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) + case __NR_ugetrlimit: + #endif + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_ulimit: + #endif + case __NR_getrusage: +@@ -826,7 +850,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) { + #endif + case __NR_sysinfo: + case __NR_uname: +-#if defined(__i386__) ++#if defined(__i386__) || defined(__powerpc64__) + case __NR_olduname: + case __NR_oldolduname: + #endif +@@ -892,8 +916,16 @@ bool SyscallSets::IsSystemVSemaphores(int sysno) { + } + #endif + ++/* shitty hack around Void's 4.19 kernel headers missing those numbers */ ++#if defined(__powerpc64__) && !defined(__NR_shmget) ++#define __NR_shmget 395 ++#define __NR_shmctl 396 ++#define __NR_shmat 397 ++#define __NR_shmdt 398 ++#endif ++ + #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \ +- defined(__aarch64__) || \ ++ defined(__aarch64__) || defined(__powerpc64__) || \ + (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)) + // These give a lot of ambient authority and bypass the setuid sandbox. + bool SyscallSets::IsSystemVSharedMemory(int sysno) { +@@ -925,7 +957,8 @@ bool SyscallSets::IsSystemVMessageQueue(int sysno) { + #endif + + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + // Big system V multiplexing system call. + bool SyscallSets::IsSystemVIpc(int sysno) { + switch (sysno) { +@@ -945,7 +978,8 @@ bool SyscallSets::IsAnySystemV(int sysno) { + return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) || + IsSystemVSharedMemory(sysno); + #elif defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + return IsSystemVIpc(sysno); + #endif + } +@@ -1002,7 +1036,8 @@ bool SyscallSets::IsFaNotify(int sysno) { + bool SyscallSets::IsTimer(int sysno) { + switch (sysno) { + case __NR_getitimer: +-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ ++ defined(__powerpc64__) + case __NR_alarm: + #endif + case __NR_setitimer: +@@ -1084,18 +1119,22 @@ bool SyscallSets::IsMisc(int sysno) { + case __NR_syncfs: + case __NR_vhangup: + // The system calls below are not implemented. +-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ ++ defined(__powerpc64__) + case __NR_afs_syscall: + #endif + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_break: + #endif +-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ ++ defined(__powerpc64__) + case __NR_getpmsg: + #endif + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_gtty: + case __NR_idle: + case __NR_lock: +@@ -1103,20 +1142,22 @@ bool SyscallSets::IsMisc(int sysno) { + case __NR_prof: + case __NR_profil: + #endif +-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ ++ defined(__powerpc64__) + case __NR_putpmsg: + #endif + #if defined(__x86_64__) + case __NR_security: + #endif + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + case __NR_stty: + #endif +-#if defined(__x86_64__) ++#if defined(__x86_64__) || defined(__powerpc64__) + case __NR_tuxcall: + #endif +-#if !defined(__aarch64__) ++#if !defined(__aarch64__) && !defined(__powerpc64__) + case __NR_vserver: + #endif + return true; +diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h +index 923533ec9..411f72acd 100644 +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h ++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h +@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets { + static bool IsDeniedGetOrModifySocket(int sysno); + + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + // Big multiplexing system call for sockets. + static bool IsSocketCall(int sysno); + #endif + + #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + static bool IsNetworkSocketInformation(int sysno); + #endif + +@@ -76,7 +77,7 @@ class SANDBOX_EXPORT SyscallSets { + static bool IsSystemVSemaphores(int sysno); + #endif + #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \ +- defined(__aarch64__) || \ ++ defined(__aarch64__) || defined(__powerpc64__) || \ + (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)) + // These give a lot of ambient authority and bypass the setuid sandbox. + static bool IsSystemVSharedMemory(int sysno); +@@ -88,7 +89,8 @@ class SANDBOX_EXPORT SyscallSets { + #endif + + #if defined(__i386__) || \ +- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) ++ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ ++ defined(__powerpc64__) + // Big system V multiplexing system call. + static bool IsSystemVIpc(int sysno); + #endif +diff --git a/sandbox/linux/seccomp-bpf/syscall.cc b/sandbox/linux/seccomp-bpf/syscall.cc +index e47e98bf5..d53a7ff56 100644 +--- a/sandbox/linux/seccomp-bpf/syscall.cc ++++ b/sandbox/linux/seccomp-bpf/syscall.cc +@@ -18,7 +18,7 @@ namespace sandbox { + namespace { + + #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \ +- defined(ARCH_CPU_MIPS_FAMILY) ++ defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY) + // Number that's not currently used by any Linux kernel ABIs. + const int kInvalidSyscallNumber = 0x351d3; + #else +@@ -310,12 +310,56 @@ asm(// We need to be able to tell the kernel exactly where we made a + // Enter the kernel + "svc 0\n" + "2:ret\n" ++ ".cfi_endproc\n" ++ ".size SyscallAsm, .-SyscallAsm\n" ++#elif defined(__powerpc64__) ++ ".text\n" ++ ".align 4\n" ++ ".type SyscallAsm @function\n" ++ "SyscallAsm:\n" ++ ".cfi_startproc\n" ++ ++ // Check if r3 is negative ++ "cmpdi 3, 0\n" ++ "bgt 2f\n" ++ ++ // Load address of 3f into r3 and return ++ "mflr 10\n" ++ "bl 1f\n" ++ "1: mflr 3\n" ++ "mtlr 10\n" ++ "addi 3, 3, 4*13\n" ++ "blr\n" ++ ++ // Load arguments from array into r3-8 ++ // save param 3 in r10 ++ "2:\n" ++ "mr 0, 3\n" ++ "ld 3, 0(4)\n" ++ "ld 5, 16(4)\n" ++ "ld 6, 24(4)\n" ++ "ld 7, 32(4)\n" ++ "ld 8, 40(4)\n" ++ "ld 4, 8(4)\n" ++ "li 9, 0\n" ++ ++ // Enter kernel ++ "sc\n" ++ ++ // Magic return address ++ "3:\n" ++ // Like MIPS, ppc64 return values are always positive. ++ // Check for error in cr0.SO and negate upon error ++ "bc 4, 3, 4f\n" ++ "neg 3, 3\n" ++ "4: blr\n" ++ + ".cfi_endproc\n" + ".size SyscallAsm, .-SyscallAsm\n" + #endif + ); // asm + +-#if defined(__x86_64__) ++#if defined(__x86_64__) || defined(__powerpc64__) + extern "C" { + intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]); + } +@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr, + ret = inout; + } + ++#elif defined(__powerpc64__) ++ intptr_t ret = SyscallAsm(nr, args); + #else + #error "Unimplemented architecture" + #endif +@@ -445,8 +491,18 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) { + // needs to be changed back. + ret_val = -ret_val; + SECCOMP_PARM4(ctx) = 1; +- } else ++ } else { + SECCOMP_PARM4(ctx) = 0; ++ } ++#endif ++#if defined(__powerpc64__) ++ // Same as MIPS, need to invert ret and set error register (cr0.SO) ++ if (ret_val <= -1 && ret_val >= -4095) { ++ ret_val = -ret_val; ++ ctx->uc_mcontext.regs->ccr |= (1 << 28); ++ } else { ++ ctx->uc_mcontext.regs->ccr &= ~(1 << 28); ++ } + #endif + SECCOMP_RESULT(ctx) = static_cast(ret_val); + } +diff --git a/sandbox/linux/seccomp-bpf/trap.cc b/sandbox/linux/seccomp-bpf/trap.cc +index f5b86a73a..5e6c4a068 100644 +--- a/sandbox/linux/seccomp-bpf/trap.cc ++++ b/sandbox/linux/seccomp-bpf/trap.cc +@@ -232,6 +232,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { + SetIsInSigHandler(); + } + ++#if defined(__powerpc64__) ++ // On ppc64+glibc, some syscalls seem to accidentally negate the first ++ // parameter which causes checks against it to fail. For now, manually ++ // negate them back. ++ // TODO(shawn@anastas.io): investigate this issue further ++ auto nr = SECCOMP_SYSCALL(ctx); ++ if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat || ++ nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) { ++ if (static_cast(SECCOMP_PARM1(ctx)) > 0) { ++ SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx); ++ } ++ } ++#endif ++ + // Copy the seccomp-specific data into a arch_seccomp_data structure. This + // is what we are showing to TrapFnc callbacks that the system call + // evaluator registered with the sandbox. +diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc +index d7b5d8c44..4adc6d0d4 100644 +--- a/sandbox/linux/services/credentials.cc ++++ b/sandbox/linux/services/credentials.cc +@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() { + pid_t pid = -1; + alignas(16) char stack_buf[PTHREAD_STACK_MIN]; + #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \ +- defined(ARCH_CPU_MIPS_FAMILY) ++ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY) + // The stack grows downward. + void* stack = stack_buf + sizeof(stack_buf); + #else +@@ -90,7 +90,9 @@ + + int clone_flags = CLONE_FS | LINUX_SIGCHLD; + void* tls = nullptr; +-#if (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM_FAMILY)) && \ ++// RAJA this might be it... ++#if (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM_FAMILY) || \ ++ defined(ARCH_CPU_PPC64_FAMILY)) && \ + !defined(MEMORY_SANITIZER) + // Use CLONE_VM | CLONE_VFORK as an optimization to avoid copying page tables. + // Since clone writes to the new child's TLS before returning, we must set a +@@ -98,6 +100,11 @@ + // glibc performs syscalls by calling a function pointer in TLS, so we do not + // attempt this optimization. + // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f. ++ // ++ // NOTE: Without CLONE_VM, fontconfig will attempt to reload configuration ++ // in every thread. Since the rendered threads are sandboxed without ++ // filesystem access (e.g. to /etc/fonts/fonts.conf) this will cause font ++ // configuraiton loading failures and no fonts will be displayed! + clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS; + + char tls_buf[PTHREAD_STACK_MIN] = {0}; +diff --git a/sandbox/linux/services/syscall_wrappers.cc b/sandbox/linux/services/syscall_wrappers.cc +index fcfd2aa12..f6eb32fb7 100644 +--- a/sandbox/linux/services/syscall_wrappers.cc ++++ b/sandbox/linux/services/syscall_wrappers.cc +@@ -58,7 +58,7 @@ long sys_clone(unsigned long flags, + #if defined(ARCH_CPU_X86_64) + return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls); + #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \ +- defined(ARCH_CPU_MIPS_FAMILY) ++ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY) + // CONFIG_CLONE_BACKWARDS defined. + return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid); + #endif +diff --git a/sandbox/linux/syscall_broker/broker_process.cc b/sandbox/linux/syscall_broker/broker_process.cc +index d72c9d238..77f1d95f5 100644 +--- a/sandbox/linux/syscall_broker/broker_process.cc ++++ b/sandbox/linux/syscall_broker/broker_process.cc +@@ -169,7 +169,7 @@ bool BrokerProcess::IsSyscallBrokerable(int sysno, bool fast_check) const { + #if defined(__NR_fstatat64) + case __NR_fstatat64: + #endif +-#if defined(__x86_64__) || defined(__aarch64__) ++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__) + case __NR_newfstatat: + #endif + return !fast_check || allowed_command_set_.test(COMMAND_STAT); +diff --git a/sandbox/linux/system_headers/linux_seccomp.h b/sandbox/linux/system_headers/linux_seccomp.h +index 1fa47ed09..39cc9ab53 100644 +--- a/sandbox/linux/system_headers/linux_seccomp.h ++++ b/sandbox/linux/system_headers/linux_seccomp.h +@@ -41,6 +41,9 @@ + #ifndef EM_AARCH64 + #define EM_AARCH64 183 + #endif ++#ifndef EM_PPC64 ++#define EM_PPC64 21 ++#endif + + #ifndef __AUDIT_ARCH_64BIT + #define __AUDIT_ARCH_64BIT 0x80000000 +@@ -73,6 +76,12 @@ + #ifndef AUDIT_ARCH_AARCH64 + #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE) + #endif ++#ifndef AUDIT_ARCH_PPC64 ++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT) ++#endif ++#ifndef AUDIT_ARCH_PPC64LE ++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE) ++#endif + + // For prctl.h + #ifndef PR_SET_SECCOMP +diff --git a/sandbox/linux/system_headers/linux_signal.h b/sandbox/linux/system_headers/linux_signal.h +index f5a736761..515b21a5f 100644 +--- a/sandbox/linux/system_headers/linux_signal.h ++++ b/sandbox/linux/system_headers/linux_signal.h +@@ -13,7 +13,7 @@ + // (not undefined, but defined different values and in different memory + // layouts). So, fill the gap here. + #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + + #define LINUX_SIGHUP 1 + #define LINUX_SIGINT 2 +diff --git a/sandbox/linux/system_headers/linux_syscalls.h b/sandbox/linux/system_headers/linux_syscalls.h +index 2b78a0cc3..0a70f5ea5 100644 +--- a/sandbox/linux/system_headers/linux_syscalls.h ++++ b/sandbox/linux/system_headers/linux_syscalls.h +@@ -35,5 +35,9 @@ + #include "sandbox/linux/system_headers/arm64_linux_syscalls.h" + #endif + ++#if defined(__powerpc64__) ++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h" ++#endif ++ + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ + +diff --git a/sandbox/linux/system_headers/ppc64_linux_syscalls.h b/sandbox/linux/system_headers/ppc64_linux_syscalls.h +new file mode 100644 +index 000000000..ccacffe22 +--- /dev/null ++++ b/sandbox/linux/system_headers/ppc64_linux_syscalls.h +@@ -0,0 +1,12 @@ ++// Copyright 2014 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_ ++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_ ++ ++#include ++ ++//TODO: is it necessary to redefine syscall numbers for PPC64? ++ ++#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_ +diff --git a/sandbox/policy/linux/bpf_utility_policy_linux.cc b/sandbox/policy/linux/bpf_utility_policy_linux.cc +index 2588fc792..d455c4601 100644 +--- a/sandbox/policy/linux/bpf_utility_policy_linux.cc ++++ b/sandbox/policy/linux/bpf_utility_policy_linux.cc +@@ -34,7 +34,7 @@ + case __NR_fdatasync: + case __NR_fsync: + #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + case __NR_getrlimit: + #endif + #if defined(__i386__) || defined(__arm__) +diff --git a/sandbox/policy/linux/bpf_renderer_policy_linux.cc b/sandbox/policy/linux/bpf_renderer_policy_linux.cc +index 2588fc792..d455c4601 100644 +--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc ++++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc +@@ -15,6 +15,11 @@ + #include "sandbox/linux/system_headers/linux_syscalls.h" + #include "sandbox/policy/linux/sandbox_linux.h" + ++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h ++#ifdef __powerpc64__ ++#include ++#endif ++ + // TODO(vignatti): replace the local definitions below with #include + // once kernel version 4.6 becomes widely used. + #include +@@ -77,7 +77,7 @@ + case __NR_ftruncate64: + #endif + #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + case __NR_getrlimit: + case __NR_setrlimit: + // We allow setrlimit to dynamically adjust the address space limit as +diff --git a/third_party/angle/src/compiler/translator/InfoSink.h b/third_party/angle/src/compiler/translator/InfoSink.h +index 3a807e1e3..5258617a7 100644 +--- a/third_party/angle/src/compiler/translator/InfoSink.h ++++ b/third_party/angle/src/compiler/translator/InfoSink.h +@@ -92,7 +92,16 @@ class TInfoSinkBase + stream.precision(8); + stream << f; + } +- sink.append(stream.str()); ++ ++ // Hack to work around a bug where negative floating point values ++ // are rendered like '.0.5' instead of '-0.5' ++ std::string res(stream.str()); ++ ++ if (signbit(f)) { // test if f is negative ++ res[0] = '-'; ++ } ++ ++ sink.append(res); + return *this; + } + // Write boolean values as their names instead of integral value. +diff --git a/third_party/angle/src/libANGLE/Constants.h b/third_party/angle/src/libANGLE/Constants.h +index fcbc9246a..39ae66148 100644 +--- a/third_party/angle/src/libANGLE/Constants.h ++++ b/third_party/angle/src/libANGLE/Constants.h +@@ -9,6 +9,7 @@ + #ifndef LIBANGLE_CONSTANTS_H_ + #define LIBANGLE_CONSTANTS_H_ + ++#include + #include "common/platform.h" + + #include +diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn +index 17cf9cda9..8ce96bd32 100644 +--- a/third_party/boringssl/BUILD.gn ++++ b/third_party/boringssl/BUILD.gn +@@ -103,6 +103,13 @@ if (is_win && !is_msan && current_cpu != "arm64") { + } else { + public_configs = [ ":no_asm_config" ] + } ++ } else if (current_cpu == "ppc64") { ++ if (is_linux) { ++ # TODO: ppc64 (be) check ++ sources += crypto_sources_linux_ppc64le ++ } else { ++ public_configs = [ ":no_asm_config" ] ++ } + } else { + public_configs = [ ":no_asm_config" ] + } +diff --git a/third_party/breakpad/BUILD.gn b/third_party/breakpad/BUILD.gn +index 4af3d7bbf..adbf54159 100644 +--- a/third_party/breakpad/BUILD.gn ++++ b/third_party/breakpad/BUILD.gn +@@ -596,7 +596,6 @@ if (is_linux || is_chromeos || is_android) { + "breakpad/src/client/minidump_file_writer.h", + "breakpad/src/common/convert_UTF.cc", + "breakpad/src/common/convert_UTF.h", +- "breakpad/src/common/linux/breakpad_getcontext.S", + "breakpad/src/common/linux/elf_core_dump.cc", + "breakpad/src/common/linux/elf_core_dump.h", + "breakpad/src/common/linux/elfutils.cc", +@@ -634,6 +633,14 @@ if (is_linux || is_chromeos || is_android) { + + libs = [ "dl" ] + ++ if (current_cpu == "ppc64") { ++ defines = [ "HAVE_GETCONTEXT" ] ++ } else { ++ sources += [ ++ "breakpad/src/common/linux/breakpad_getcontext.S" ++ ] ++ } ++ + include_dirs = [ + ".", + "breakpad/src", +@@ -682,7 +689,6 @@ if (is_linux || is_chromeos || is_android) { + "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc", + "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc", + "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc", +- "breakpad/src/common/linux/breakpad_getcontext_unittest.cc", + "breakpad/src/common/linux/elf_core_dump_unittest.cc", + "breakpad/src/common/linux/file_id_unittest.cc", + "breakpad/src/common/linux/linux_libc_support_unittest.cc", +diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h +index 07d9171a0..9aed4cb36 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h ++++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h +@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU; + typedef MDRawContextARM64_Old RawContextCPU; + #elif defined(__mips__) + typedef MDRawContextMIPS RawContextCPU; ++#elif defined(__powerpc64__) ++typedef MDRawContextPPC64 RawContextCPU; + #else + #error "This code has not been ported to your platform yet." + #endif +diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc +index aae1dc13b..03afec7a5 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc +@@ -270,7 +270,42 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const { + out->float_save.fir = mcontext.fpc_eir; + #endif + } +-#endif // __mips__ ++ ++#elif defined(__powerpc64__) ++ ++uintptr_t ThreadInfo::GetInstructionPointer() const { ++ return mcontext.gp_regs[PT_NIP]; ++} ++ ++void ThreadInfo::FillCPUContext(RawContextCPU* out) const { ++ out->context_flags = MD_CONTEXT_PPC64_FULL; ++ for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++) ++ out->gpr[i] = mcontext.gp_regs[i]; ++ ++ out->lr = mcontext.gp_regs[PT_LNK]; ++ out->srr0 = mcontext.gp_regs[PT_NIP]; ++ out->srr1 = mcontext.gp_regs[PT_MSR]; ++ out->cr = mcontext.gp_regs[PT_CCR]; ++ out->xer = mcontext.gp_regs[PT_XER]; ++ out->ctr = mcontext.gp_regs[PT_CTR]; ++ ++ for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++) ++ out->float_save.fpregs[i] = mcontext.fp_regs[i]; ++ ++ out->float_save.fpscr = mcontext.fp_regs[NFPREG-1]; ++ ++ for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) ++ out->vector_save.save_vr[i] = \ ++ {(((uint64_t)vregs.vrregs[i][0]) << 32) ++ | vregs.vrregs[i][1], ++ (((uint64_t)vregs.vrregs[i][2]) << 32) ++ | vregs.vrregs[i][3]}; ++ ++ out->vrsave = vregs.vrsave; ++ out->vector_save.save_vscr = {0, vregs.vscr.vscr_word}; ++ out->vector_save.save_vrvalid = 0xFFFFFFFF; ++} ++#endif // __powerpc64__ + + void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) { + assert(gp_regs || size); +@@ -279,6 +314,11 @@ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) { + *gp_regs = mcontext.gregs; + if (size) + *size = sizeof(mcontext.gregs); ++#elif defined(__powerpc64__) ++ if (gp_regs) ++ *gp_regs = mcontext.gp_regs; ++ if (size) ++ *size = sizeof(mcontext.gp_regs); + #else + if (gp_regs) + *gp_regs = ®s; +@@ -294,6 +334,11 @@ void ThreadInfo::GetFloatingPointRegisters(void** fp_regs, size_t* size) { + *fp_regs = &mcontext.fpregs; + if (size) + *size = sizeof(mcontext.fpregs); ++#elif defined(__powerpc64__) ++ if (fp_regs) ++ *fp_regs = &mcontext.fp_regs; ++ if (size) ++ *size = sizeof(mcontext.fp_regs); + #else + if (fp_regs) + *fp_regs = &fpregs; +@@ -302,4 +347,13 @@ void ThreadInfo::GetFloatingPointRegisters(void** fp_regs, size_t* size) { + #endif + } + ++#if defined(__powerpc64__) ++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) { ++ if (v_regs) ++ *v_regs = &vregs; ++ if (size) ++ *size = sizeof(vregs); ++} ++#endif ++ + } // namespace google_breakpad +diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h +index fb216fa6d..593aac822 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h ++++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h +@@ -68,6 +68,10 @@ struct ThreadInfo { + // Use the structures defined in + struct user_regs_struct regs; + struct user_fpsimd_struct fpregs; ++#elif defined(__powerpc64__) ++ // Use the structures defined in . ++ mcontext_t mcontext; ++ vrregset_t vregs; + #elif defined(__mips__) + // Use the structure defined in . + mcontext_t mcontext; +@@ -84,6 +88,11 @@ struct ThreadInfo { + + // Returns the pointer and size of float point register area. + void GetFloatingPointRegisters(void** fp_regs, size_t* size); ++ ++#if defined(__powerpc64__) ++ // Returns the pointer and size of the vector register area. (PPC64 only) ++ void GetVectorRegisters(void** v_regs, size_t* size); ++#endif + }; + + } // namespace google_breakpad +diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +index 6eec1be24..741983a1a 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +@@ -254,6 +254,48 @@ void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc) { + out->float_save.fir = uc->uc_mcontext.fpc_eir; // Unused. + #endif + } ++ ++#elif defined(__powerpc64__) ++ ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { ++ return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]; ++} ++ ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { ++ return uc->uc_mcontext.gp_regs[PT_NIP]; ++} ++ ++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc, ++ const vrregset_t* vregs) { ++ out->context_flags = MD_CONTEXT_PPC64_FULL; ++ ++ for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++) ++ out->gpr[i] = uc->uc_mcontext.gp_regs[i]; ++ ++ out->lr = uc->uc_mcontext.gp_regs[PT_LNK]; ++ out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP]; ++ out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR]; ++ out->cr = uc->uc_mcontext.gp_regs[PT_CCR]; ++ out->xer = uc->uc_mcontext.gp_regs[PT_XER]; ++ out->ctr = uc->uc_mcontext.gp_regs[PT_CTR]; ++ ++ for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++) ++ out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i]; ++ ++ out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1]; ++ ++ for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) ++ out->vector_save.save_vr[i] = ++ {(((uint64_t)vregs->vrregs[i][0]) << 32) ++ | vregs->vrregs[i][1], ++ (((uint64_t)vregs->vrregs[i][2]) << 32) ++ | vregs->vrregs[i][3]}; ++ ++ out->vrsave = vregs->vrsave; ++ out->vector_save.save_vscr = {0, vregs->vscr.vscr_word}; ++ out->vector_save.save_vrvalid = 0xFFFFFFFF; ++} ++ + #endif + + } // namespace google_breakpad +diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +index 7d4100881..c122ac92e 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h ++++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +@@ -55,6 +55,9 @@ struct UContextReader { + #elif defined(__aarch64__) + static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc, + const struct fpsimd_context* fpregs); ++#elif defined(__powerpc64__) ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, ++ const vrregset_t* vregs); + #else + static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc); + #endif +diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index a6cb5f984..ae16b64d9 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -461,9 +461,16 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) { + memcpy(&g_crash_context_.float_state, fp_ptr, + sizeof(g_crash_context_.float_state)); + } ++#elif defined(__powerpc64__) ++ // On PPC64, we must copy VR state ++ ucontext_t* uc_ptr = (ucontext_t*)uc; ++ if (uc_ptr->uc_mcontext.v_regs) { ++ memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs, ++ sizeof(g_crash_context_.vector_state)); ++ } + #elif !defined(__ARM_EABI__) && !defined(__mips__) + // FP state is not part of user ABI on ARM Linux. +- // In case of MIPS Linux FP state is already part of ucontext_t ++ // In case of MIPS, Linux FP state is already part of ucontext_t + // and 'float_state' is not a member of CrashContext. + ucontext_t* uc_ptr = (ucontext_t*)uc; + if (uc_ptr->uc_mcontext.fpregs) { +@@ -708,11 +715,19 @@ bool ExceptionHandler::WriteMinidump() { + } + #endif + +-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) ++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \ ++ && !defined(__powerpc64__) + // FPU state is not part of ARM EABI ucontext_t. + memcpy(&context.float_state, context.context.uc_mcontext.fpregs, + sizeof(context.float_state)); + #endif ++ ++#if defined(__powerpc64__) ++ // Vector registers must be copied on PPC64 ++ memcpy(&context.vector_state, context.context.uc_mcontext.v_regs, ++ sizeof(context.vector_state)); ++#endif ++ + context.tid = sys_gettid(); + + // Add an exception stream to the minidump for better reporting. +@@ -733,6 +748,9 @@ bool ExceptionHandler::WriteMinidump() { + #elif defined(__mips__) + context.siginfo.si_addr = + reinterpret_cast(context.context.uc_mcontext.pc); ++#elif defined(__powerpc64__) ++ context.siginfo.si_addr = ++ reinterpret_cast(context.context.uc_mcontext.gp_regs[PT_NIP]); + #else + #error "This code has not been ported to your platform yet." + #endif +diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h +index f80843ea7..260dd10f7 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h ++++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h +@@ -192,7 +192,11 @@ class ExceptionHandler { + siginfo_t siginfo; + pid_t tid; // the crashing thread. + ucontext_t context; +-#if !defined(__ARM_EABI__) && !defined(__mips__) ++#if defined(__powerpc64__) ++ // PPC64's FP state is a part of ucontext_t like MIPS but the vector ++ // state is not, so a struct is needed. ++ vstate_t vector_state; ++#elif !defined(__ARM_EABI__) && !defined(__mips__) + // #ifdef this out because FP state is not part of user ABI for Linux ARM. + // In case of MIPS Linux FP state is already part of ucontext_t so + // 'float_state' is not required. +diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc +index 35dcbfd4d..7934370fd 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc +@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChildCrashesDontHang) { + } + + // Wait a while until the child should have crashed. +- usleep(1000000); ++ usleep(2000000); + // Kill the child if it is still running. + kill(child, SIGKILL); + +@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[] = { + #if defined(__mips__) + // mfc2 zero,Impl - usually illegal in userspace. + 0x48, 0x00, 0x00, 0x48 ++#elif defined(__powerpc64__) ++ 0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu + #else + // This crashes with SIGILL on x86/x86-64/arm. + 0xff, 0xff, 0xff, 0xff +@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMaxBound) { + + // These are defined here so the parent can use them to check the + // data from the minidump afterwards. +- // Use 4k here because the OS will hand out a single page even ++ // Use the page size here because the OS will hand out a single page even + // if a smaller size is requested, and this test wants to + // test the upper bound of the memory range. +- const uint32_t kMemorySize = 4096; // bytes ++ const uint32_t kMemorySize = getpagesize(); // bytes + const int kOffset = kMemorySize - sizeof(kIllegalInstruction); + + const pid_t child = fork(); +diff --git a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc +index fa3c1713a..6ce709e2f 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc +@@ -138,7 +138,9 @@ class MicrodumpWriter { + const MicrodumpExtraInfo& microdump_extra_info, + LinuxDumper* dumper) + : ucontext_(context ? &context->context : NULL), +-#if !defined(__ARM_EABI__) && !defined(__mips__) ++#if defined(__powerpc64__) ++ vector_state_(context ? &context->vector_state : NULL), ++#elif !defined(__ARM_EABI__) && !defined(__mips__) + float_state_(context ? &context->float_state : NULL), + #endif + dumper_(dumper), +@@ -337,6 +339,8 @@ class MicrodumpWriter { + # else + # error "This mips ABI is currently not supported (n32)" + #endif ++#elif defined(__powerpc64__) ++ const char kArch[] = "ppc64"; + #else + #error "This code has not been ported to your platform yet" + #endif +@@ -409,7 +413,9 @@ class MicrodumpWriter { + void DumpCPUState() { + RawContextCPU cpu; + my_memset(&cpu, 0, sizeof(RawContextCPU)); +-#if !defined(__ARM_EABI__) && !defined(__mips__) ++#if defined(__powerpc64__) ++ UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_); ++#elif !defined(__ARM_EABI__) && !defined(__mips__) + UContextReader::FillCPUContext(&cpu, ucontext_, float_state_); + #else + UContextReader::FillCPUContext(&cpu, ucontext_); +@@ -605,7 +611,9 @@ class MicrodumpWriter { + void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } + + const ucontext_t* const ucontext_; +-#if !defined(__ARM_EABI__) && !defined(__mips__) ++#if defined(__powerpc64__) ++ const google_breakpad::vstate_t* const vector_state_; ++#elif !defined(__ARM_EABI__) && !defined(__mips__) + const google_breakpad::fpstate_t* const float_state_; + #endif + LinuxDumper* dumper_; +diff --git a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc +index 6339ac0cd..291af106b 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc +@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappings) { + CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf); + ASSERT_TRUE(ContainsMicrodump(buf)); + ++ int page_size = getpagesize(); + #ifdef __LP64__ +- ASSERT_NE(std::string::npos, +- buf.find("M 0000000000001000 000000000000002A 0000000000001000 " +- "33221100554477668899AABBCCDDEEFF0 libfoo.so")); ++ // This test is only available for the following page sizes ++ ASSERT_TRUE((page_size == 4096) || (page_size == 65536)); ++ if (page_size == 4096) { ++ ASSERT_NE(std::string::npos, ++ buf.find("M 0000000000001000 000000000000002A 0000000000001000 " ++ "33221100554477668899AABBCCDDEEFF0 libfoo.so")); ++ } else { ++ ASSERT_NE(std::string::npos, ++ buf.find("M 0000000000010000 000000000000002A 0000000000010000 " ++ "33221100554477668899AABBCCDDEEFF0 libfoo.so")); ++ } + #else + ASSERT_NE(std::string::npos, + buf.find("M 00001000 0000002A 00001000 " +diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc +index 415068983..b93e4afcf 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc +@@ -112,6 +112,9 @@ bool LinuxCoreDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) { + #elif defined(__mips__) + stack_pointer = + reinterpret_cast(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]); ++#elif defined(__powerpc64__) ++ stack_pointer = ++ reinterpret_cast(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]); + #else + #error "This code hasn't been ported to your platform yet." + #endif +@@ -197,7 +200,10 @@ bool LinuxCoreDumper::EnumerateThreads() { + memset(&info, 0, sizeof(ThreadInfo)); + info.tgid = status->pr_pgrp; + info.ppid = status->pr_ppid; +-#if defined(__mips__) ++#if defined(__powerpc64__) ++ for (int i = 0; i < 31; i++) ++ info.mcontext.gp_regs[i] = status->pr_reg[i]; ++#elif defined(__mips__) + #if defined(__ANDROID__) + for (int i = EF_R0; i <= EF_R31; i++) + info.mcontext.gregs[i - EF_R0] = status->pr_reg[i]; +diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc +index 7fd6532ad..199cbfffd 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc +@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const void** stack, size_t* stack_len, + reinterpret_cast(int_stack_pointer & ~(page_size - 1)); + + // The number of bytes of stack which we try to capture. +- static const ptrdiff_t kStackToCapture = 32 * 1024; ++ // This now depends on page_size to avoid missing data ++ // on systems with larger page sizes. ++ static const ptrdiff_t kStackToCapture = 8 * page_size; + + const MappingInfo* mapping = FindMapping(stack_pointer); + if (!mapping) +diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h +index 7bee160f1..07bb2b81a 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h +@@ -63,7 +63,8 @@ namespace google_breakpad { + (defined(__mips__) && _MIPS_SIM == _ABIO32) + typedef Elf32_auxv_t elf_aux_entry; + #elif defined(__x86_64) || defined(__aarch64__) || \ +- (defined(__mips__) && _MIPS_SIM != _ABIO32) ++ (defined(__mips__) && _MIPS_SIM != _ABIO32) || \ ++ defined(__powerpc64__) + typedef Elf64_auxv_t elf_aux_entry; + #endif + +diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc +index 331f4bb34..3f722947f 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc +@@ -51,6 +51,8 @@ + #define TID_PTR_REGISTER "rcx" + #elif defined(__mips__) + #define TID_PTR_REGISTER "$1" ++#elif defined(__powerpc64__) ++#define TID_PTR_REGISTER "r8" + #else + #error This test has not been ported to this platform. + #endif +diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc +index e3ddb81a6..fa28575ef 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc +@@ -149,19 +149,27 @@ bool LinuxPtraceDumper::CopyFromProcess(void* dest, pid_t child, + return true; + } + +-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) +-{ ++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) { + #ifdef PTRACE_GETREGSET + struct iovec io; + info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len); +- if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) { ++ if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) { + return false; + } + + info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len); +- if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) { ++ if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) { + return false; + } ++ ++#if defined(__powerpc64__) ++ // Grab the vector registers on PPC64 too ++ info->GetVectorRegisters(&io.iov_base, &io.iov_len); ++ if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) { ++ return false; ++ } ++#endif // defined(__powerpc64__) ++ + return true; + #else + return false; +@@ -298,6 +306,9 @@ bool LinuxPtraceDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) { + #elif defined(__mips__) + stack_pointer = + reinterpret_cast(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]); ++#elif defined(__powerpc64__) ++ stack_pointer = ++ reinterpret_cast(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]); + #else + #error "This code hasn't been ported to your platform yet." + #endif +diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc +index da71e15dc..12bfb317a 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc +@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackReadWithMultipleThreads) { + #elif defined(__mips__) + pid_t* process_tid_location = + reinterpret_cast(one_thread.mcontext.gregs[1]); ++#elif defined(__powerpc64__) ++ pid_t* process_tid_location = ++ reinterpret_cast(one_thread.mcontext.gp_regs[8]); + #else + #error This test has not been ported to this platform. + #endif +@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeStackCopy) { + uintptr_t heap_addr = thread_info.regs.rcx; + #elif defined(__mips__) + uintptr_t heap_addr = thread_info.mcontext.gregs[1]; ++#elif defined(__powerpc64__) ++ uintptr_t heap_addr = thread_info.mcontext.gp_regs[8]; + #else + #error This test has not been ported to this platform. + #endif +diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc +index 32634ef00..2a56948de 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc +@@ -136,7 +136,9 @@ class MinidumpWriter { + : fd_(minidump_fd), + path_(minidump_path), + ucontext_(context ? &context->context : NULL), +-#if !defined(__ARM_EABI__) && !defined(__mips__) ++#if defined(__powerpc64__) ++ vector_state_(context ? &context->vector_state : NULL), ++#elif !defined(__ARM_EABI__) && !defined(__mips__) + float_state_(context ? &context->float_state : NULL), + #endif + dumper_(dumper), +@@ -468,7 +470,9 @@ class MinidumpWriter { + if (!cpu.Allocate()) + return false; + my_memset(cpu.get(), 0, sizeof(RawContextCPU)); +-#if !defined(__ARM_EABI__) && !defined(__mips__) ++#if defined(__powerpc64__) ++ UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_); ++#elif !defined(__ARM_EABI__) && !defined(__mips__) + UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_); + #else + UContextReader::FillCPUContext(cpu.get(), ucontext_); +@@ -897,7 +901,7 @@ class MinidumpWriter { + dirent->location.rva = 0; + } + +-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__) + bool WriteCPUInformation(MDRawSystemInfo* sys_info) { + char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0}; + static const char vendor_id_name[] = "vendor_id"; +@@ -917,7 +921,9 @@ class MinidumpWriter { + + // processor_architecture should always be set, do this first + sys_info->processor_architecture = +-#if defined(__mips__) ++#if defined(__powerpc64__) ++ MD_CPU_ARCHITECTURE_PPC64; ++#elif defined(__mips__) + # if _MIPS_SIM == _ABIO32 + MD_CPU_ARCHITECTURE_MIPS; + # elif _MIPS_SIM == _ABI64 +@@ -1333,7 +1339,9 @@ class MinidumpWriter { + const char* path_; // Path to the file where the minidum should be written. + + const ucontext_t* const ucontext_; // also from the signal handler +-#if !defined(__ARM_EABI__) && !defined(__mips__) ++#if defined(__powerpc64__) ++ const google_breakpad::vstate_t* const vector_state_; ++#elif !defined(__ARM_EABI__) && !defined(__mips__) + const google_breakpad::fpstate_t* const float_state_; // ditto + #endif + LinuxDumper* dumper_; +diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +index e3b0b16da..ccd8aa0a4 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +@@ -48,6 +48,8 @@ class ExceptionHandler; + + #if defined(__aarch64__) + typedef struct fpsimd_context fpstate_t; ++#elif defined(__powerpc64__) ++typedef vrregset_t vstate_t; + #elif !defined(__ARM_EABI__) && !defined(__mips__) + typedef std::remove_pointer::type fpstate_t; + #endif +diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc +index d192e5cbb..fc1bfa8d7 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc +@@ -715,6 +715,9 @@ TEST(MinidumpWriterTest, InvalidStackPointer) { + #elif defined(__mips__) + context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] = + invalid_stack_pointer; ++#elif defined(__powerpc64__) ++ context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] = ++ invalid_stack_pointer; + #else + # error "This code has not been ported to your platform yet." + #endif +diff --git a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc +index 99362945c..c54ba7145 100644 +--- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc ++++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc +@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* path, size_t offset) { + } + + #if defined(__x86_64__) || defined(__aarch64__) || \ +- (defined(__mips__) && _MIPS_SIM == _ABI64) +- ++ (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__) + struct kernel_stat st; + if (sys_fstat(fd, &st) == -1 || st.st_size < 0) { + #else +diff --git a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc +index fad59f40c..616496d67 100644 +--- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc ++++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc +@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterMap) { + TEST_F(MemoryMappedFileTest, MapWithOffset) { + // Put more data in the test file this time. Offsets can only be + // done on page boundaries, so we need a two page file to test this. +- const int page_size = 4096; +- char data1[2 * page_size]; +- size_t data1_size = sizeof(data1); ++ const int page_size = getpagesize(); ++ char *data1 = static_cast(malloc(2 * page_size)); ++ EXPECT_TRUE(data1 != NULL); ++ size_t data1_size = (2 * page_size); + for (size_t i = 0; i < data1_size; ++i) { + data1[i] = i & 0x7f; + } +diff --git a/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc b/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc +index 5803b90d5..2a1cf14f0 100644 +--- a/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc ++++ b/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc +@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) { + + EXPECT_EQ(0U, allocator.pages_allocated()); + uint8_t* p = reinterpret_cast(allocator.Alloc(10000)); ++ uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize()); + ASSERT_FALSE(p == NULL); +- EXPECT_EQ(3U, allocator.pages_allocated()); ++ EXPECT_EQ(expected_pages, allocator.pages_allocated()); + for (unsigned i = 1; i < 10; ++i) { + uint8_t* p = reinterpret_cast(allocator.Alloc(i)); + ASSERT_FALSE(p == NULL); +diff --git a/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc b/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc +index 798056dfa..22bd81fff 100644 +--- a/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc ++++ b/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc +@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegalWrite(uint64_t instruction_ptr) { + // Check architecture and set architecture variable to corresponding flag + // in objdump. + switch (context->GetContextCPU()) { ++#if defined(__i386) || defined(__x86_64) + case MD_CONTEXT_X86: + architecture = "i386"; + break; + case MD_CONTEXT_AMD64: + architecture = "i386:x86-64"; + break; ++#endif + default: + // Unsupported architecture. Note that ARM architectures are not + // supported because objdump does not support ARM. +diff --git a/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc b/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc +index 528ee5f21..72764d6c1 100644 +--- a/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc ++++ b/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc +@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename) { + } + + TEST(ExploitabilityTest, TestWindowsEngine) { ++// The following tests are only executable on an x86-class linux machine. ++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64)) + ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH, + ExploitabilityFor("ascii_read_av.dmp")); + ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH, +@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngine) { + ExploitabilityFor("read_av_clobber_write.dmp")); + ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW, + ExploitabilityFor("read_av_conditional.dmp")); ++#endif + } + + TEST(ExploitabilityTest, TestLinuxEngine) { ++// The following tests are only executable on an x86-class linux machine. ++#if defined(__i386) || defined(__x86_64) + ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING, + ExploitabilityFor("linux_null_read_av.dmp")); + ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH, +@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine) { + ExploitabilityFor("linux_executable_heap.dmp")); + ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH, + ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp")); +-#ifndef _WIN32 ++#endif ++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64)) + ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH, + ExploitabilityFor("linux_write_to_nonwritable_module.dmp")); + ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH, +@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine) { + ExploitabilityFor("linux_write_to_outside_module_via_math.dmp")); + ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING, + ExploitabilityFor("linux_write_to_under_4k.dmp")); +-#endif // _WIN32 ++#endif // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64)) + } + +-#ifndef _WIN32 ++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64)) + TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) { + ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL)); + uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0}; +@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, CalculateAddressTest) { + context, + &write_address)); + } +-#endif // _WIN32 ++#endif // !defined(_WIN32) && (defined(__i386) || defined(__x86_64)) ++ + + } // namespace +diff --git a/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc b/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc +index aade82c99..195aa73f3 100644 +--- a/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc ++++ b/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc +@@ -77,6 +77,8 @@ + #define ELF_ARCH EM_MIPS + #elif defined(__aarch64__) + #define ELF_ARCH EM_AARCH64 ++#elif defined(__powerpc64__) ++ #define ELF_ARCH EM_PPC64 + #endif + + #if defined(__arm__) +@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct; + #elif defined (__mips__) + // This file-local typedef simplifies the source code. + typedef gregset_t user_regs_struct; ++#elif defined(__powerpc64__) ++typedef struct pt_regs user_regs_struct; + #endif + + using google_breakpad::MDTypeHelper; +@@ -321,6 +325,9 @@ struct CrashedProcess { + #endif + #if defined(__aarch64__) + user_fpsimd_struct fpregs; ++#endif ++#if defined(__powerpc64__) ++ mcontext_t mcontext; + #endif + uintptr_t stack_addr; + const uint8_t* stack; +@@ -535,6 +542,38 @@ ParseThreadRegisters(CrashedProcess::Thread* thread, + thread->mcontext.fpc_eir = rawregs->float_save.fir; + #endif + } ++#elif defined(__powerpc64__) ++static void ++ParseThreadRegisters(CrashedProcess::Thread* thread, ++ const MinidumpMemoryRange& range) { ++ const MDRawContextPPC64* rawregs = range.GetData(0); ++ ++ for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++) ++ thread->mcontext.gp_regs[i] = rawregs->gpr[i]; ++ ++ thread->mcontext.gp_regs[PT_LNK] = rawregs->lr; ++ thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0; ++ thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1; ++ thread->mcontext.gp_regs[PT_CCR] = rawregs->cr; ++ thread->mcontext.gp_regs[PT_XER] = rawregs->xer; ++ thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr; ++ thread->mcontext.v_regs->vrsave = rawregs->vrsave; ++ ++ for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++) ++ thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i]; ++ ++ thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr; ++ ++ for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) { ++ thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32; ++ thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high; ++ thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32; ++ thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low; ++ } ++ ++ thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF; ++} ++ + #else + #error "This code has not been ported to your platform yet" + #endif +@@ -623,6 +662,12 @@ ParseSystemInfo(const Options& options, CrashedProcess* crashinfo, + # else + # error "This mips ABI is currently not supported (n32)" + # endif ++#elif defined(__powerpc64__) ++ if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) { ++ fprintf(stderr, ++ "This version of minidump-2-core only supports PPC64.\n"); ++ exit(1); ++ } + #else + #error "This code has not been ported to your platform yet" + #endif +diff --git a/third_party/crashpad/crashpad/CONTRIBUTORS b/third_party/crashpad/crashpad/CONTRIBUTORS +index 8724b7f32..8e29424ef 100644 +--- a/third_party/crashpad/crashpad/CONTRIBUTORS ++++ b/third_party/crashpad/crashpad/CONTRIBUTORS +@@ -13,3 +13,4 @@ Mark Mentovai + Robert Sesek + Scott Graham + Joshua Peraza ++Shawn Anastasio +diff --git a/third_party/crashpad/crashpad/compat/linux/sys/user.h b/third_party/crashpad/crashpad/compat/linux/sys/user.h +index 6ed77a98e..1fd83469a 100644 +--- a/third_party/crashpad/crashpad/compat/linux/sys/user.h ++++ b/third_party/crashpad/crashpad/compat/linux/sys/user.h +@@ -15,6 +15,7 @@ + #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_ + #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_ + ++#include + #include_next + + #include +diff --git a/third_party/crashpad/crashpad/minidump/minidump_context.h b/third_party/crashpad/crashpad/minidump/minidump_context.h +index 3a3e603cb..3118d9e9f 100644 +--- a/third_party/crashpad/crashpad/minidump/minidump_context.h ++++ b/third_party/crashpad/crashpad/minidump/minidump_context.h +@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 { + uint64_t fir; + }; + ++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags ++//! Based on minidump_cpu_ppc64.h from breakpad ++enum MinidumpContextPPC64Flags : uint32_t { ++ //! \brief Identifies the context as PPC64. ++ kMinidumpContextPPC64 = 0x01000000, ++ ++ //! \brief Indicates the validity of general purpose registers. ++ //! ++ //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid. ++ kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001, ++ ++ //! \brief Indicates the validity of floating point registers. ++ //! ++ //! Registers `fp0`-`fp31`, `fpscr` are valid. ++ kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008, ++ ++ //! \brief Indicates the validity of Altivec/VMX registers. ++ //! ++ //! Registers `v0`-`v31`, `vscr`, `vrsave`. ++ kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020, ++ ++ //! \brief Indicates the validity of all registers ++ kMinidumpContextPPC64All = kMinidumpContextPPC64Base | ++ kMinidumpContextPPC64Floating | ++ kMinidumpContextPPC64Vector ++}; ++ ++//! \brief A PPC64 CPU context carried in a minidump file. ++//! Based on minidump_cpu_ppc64.h from breakpad. ++struct MinidumpContextPPC64 { ++ uint64_t context_flags; ++ ++ //! \brief General purpose registers. ++ uint64_t nip; ++ uint64_t msr; ++ uint64_t regs[32]; ++ uint64_t ccr; ++ uint64_t xer; ++ uint64_t lnk; ++ uint64_t ctr; ++ ++ //! \brief Floating point registers. ++ double fpregs[32]; ++ ++ //! \brief FPU status register. ++ double fpscr; ++ ++ //! \brief Altivec/VMX vector registers. ++ struct { ++ //! \brief Vector registers are 128bits. ++ uint128_struct save_vr[32]; ++ uint128_struct save_vscr; ++ ++ //! \brief Padding included for breakpad compatibiltiy. ++ uint32_t save_pad5[4]; ++ ++ //! \brief VRSAVE register. ++ uint32_t save_vrsave; ++ ++ //! \brief Padding included for breakpad compatibiltiy. ++ uint32_t save_pad6[7]; ++ } vregs; ++}; ++ + } // namespace crashpad + + #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_ +diff --git a/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc b/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc +index d7e53a493..d89eb9e01 100644 +--- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc ++++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc +@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapshot(const CPUContext* context_snapshot) { + break; + } + ++ case kCPUArchitecturePPC64: { ++ context = std::make_unique(); ++ reinterpret_cast(context.get()) ++ ->InitalizeFromSnapshot(context_snapshot->ppc64); ++ break; ++ } ++ + default: { + LOG(ERROR) << "unknown context architecture " + << context_snapshot->architecture; +@@ -453,4 +460,47 @@ size_t MinidumpContextMIPS64Writer::ContextSize() const { + return sizeof(context_); + } + ++MinidumpContextPPC64Writer::MinidumpContextPPC64Writer() ++ : MinidumpContextWriter(), context_() { ++ context_.context_flags = kMinidumpContextPPC64; ++} ++ ++MinidumpContextPPC64Writer::~MinidumpContextPPC64Writer() = default; ++ ++void MinidumpContextPPC64Writer::InitalizeFromSnapshot( ++ const CPUContextPPC64* context_snapshot) { ++ DCHECK_EQ(state(), kStateMutable); ++ DCHECK_EQ(context_.context_flags, kMinidumpContextPPC64); ++ ++ context_.context_flags = kMinidumpContextPPC64All; ++ ++ memcpy(context_.regs, context_snapshot->regs, sizeof(context_.regs)); ++ context_.nip = context_snapshot->nip; ++ context_.msr = context_snapshot->msr; ++ context_.ccr = context_snapshot->ccr; ++ context_.xer = context_snapshot->xer; ++ context_.lnk = context_snapshot->lnk; ++ context_.ctr = context_snapshot->ctr; ++ ++ memcpy(context_.fpregs, context_snapshot->fpregs, sizeof(context_.fpregs)); ++ context_.fpscr = context_snapshot->fpscr; ++ ++ memcpy(context_.vregs.save_vr, context_snapshot->vregs.save_vr, ++ sizeof(context_.vregs.save_vr)); ++ memcpy(&context_.vregs.save_vscr, &context_snapshot->vregs.save_vscr, ++ sizeof(context_.vregs.save_vscr)); ++ context_.vregs.save_vrsave = context_snapshot->vregs.save_vrsave; ++} ++ ++bool MinidumpContextPPC64Writer::WriteObject( ++ FileWriterInterface* file_writer) { ++ DCHECK_EQ(state(), kStateWritable); ++ return file_writer->Write(&context_, sizeof(context_)); ++} ++ ++size_t MinidumpContextPPC64Writer::ContextSize() const { ++ DCHECK_GE(state(), kStateFrozen); ++ return sizeof(context_); ++} ++ + } // namespace crashpad +diff --git a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h b/third_party/crashpad/crashpad/minidump/minidump_context_writer.h +index d4ab936ee..1d22fc59c 100644 +--- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h ++++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.h +@@ -315,6 +315,43 @@ class MinidumpContextMIPS64Writer final : public MinidumpContextWriter { + MinidumpContextMIPS64 context_; + }; + ++class MinidumpContextPPC64Writer final : public MinidumpContextWriter { ++ public: ++ MinidumpContextPPC64Writer(); ++ ~MinidumpContextPPC64Writer() override; ++ ++ //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot. ++ //! ++ //! \param[in] context_snapshot The context snapshot to use as source data. ++ //! ++ //! \note Valid in #kStateMutable. No mutation of context() may be done before ++ //! calling this method, and it is not normally necessary to alter ++ //! context() after calling this method. ++ void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot); ++ ++ //! \brief Returns a pointer to the context structure that this object will ++ //! write. ++ //! ++ //! \attention This returns a non-`const` pointer to this object’s private ++ //! data so that a caller can populate the context structure directly. ++ //! This is done because providing setter interfaces to each field in the ++ //! context structure would be unwieldy and cumbersome. Care must be taken ++ //! to populate the context structure correctly. The context structure ++ //! must only be modified while this object is in the #kStateMutable ++ //! state. ++ MinidumpContextPPC64* context() { return &context_; } ++ ++ protected: ++ // MinidumpWritable: ++ bool WriteObject(FileWriterInterface* file_writer) override; ++ ++ // MinidumpContextWriter: ++ size_t ContextSize() const override; ++ ++ private: ++ MinidumpContextPPC64 context_; ++}; ++ + } // namespace crashpad + + #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_ +diff --git a/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc +index 3216a906b..a9fcbe9d8 100644 +--- a/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc ++++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc +@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromSnapshot) { + context, ExpectMinidumpContextMIPS64, kSeed); + } + ++TEST(MinidumpContextWriter, PPC64_Zeros) { ++ EmptyContextTest( ++ ExpectMinidumpContextPPC64); ++} ++ ++TEST(MinidumpContextWriter, PPC64_FromSnapshot) { ++ constexpr uint32_t kSeed = 64; ++ CPUContextPPC64 context_ppc64; ++ CPUContext context; ++ context.ppc64 = &context_ppc64; ++ InitializeCPUContextPPC64(&context, kSeed); ++ FromSnapshotTest( ++ context, ExpectMinidumpContextPPC64, kSeed); ++} ++ + } // namespace + } // namespace test + } // namespace crashpad +diff --git a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc +index 0974e3ddf..b71ec5880 100644 +--- a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc ++++ b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc +@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildString() { + static constexpr char kCPU[] = "mips"; + #elif defined(ARCH_CPU_MIPS64EL) + static constexpr char kCPU[] = "mips64"; ++#elif defined(ARCH_CPU_PPC64) ++ static constexpr char kCPU[] = "ppc64"; + #else + #error define kCPU for this CPU + #endif +diff --git a/third_party/crashpad/crashpad/snapshot/capture_memory.cc b/third_party/crashpad/crashpad/snapshot/capture_memory.cc +index 7a1b2763c..beda8da9e 100644 +--- a/third_party/crashpad/crashpad/snapshot/capture_memory.cc ++++ b/third_party/crashpad/crashpad/snapshot/capture_memory.cc +@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(const CPUContext& context, + for (size_t i = 0; i < std::size(context.mipsel->regs); ++i) { + MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]); + } ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ MaybeCaptureMemoryAround(delegate, context.ppc64->nip); ++ for (size_t i = 0; i < std::size(context.ppc64->regs); ++i) { ++ MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]); ++ } + #else + #error Port. + #endif +diff --git a/third_party/crashpad/crashpad/snapshot/cpu_architecture.h b/third_party/crashpad/crashpad/snapshot/cpu_architecture.h +index 811a72095..f4f83981d 100644 +--- a/third_party/crashpad/crashpad/snapshot/cpu_architecture.h ++++ b/third_party/crashpad/crashpad/snapshot/cpu_architecture.h +@@ -43,7 +43,10 @@ enum CPUArchitecture { + kCPUArchitectureMIPSEL, + + //! \brief 64-bit MIPSEL. +- kCPUArchitectureMIPS64EL ++ kCPUArchitectureMIPS64EL, ++ ++ //! \brief 64-bit PPC64. ++ kCPUArchitecturePPC64 + }; + + } // namespace crashpad +diff --git a/third_party/crashpad/crashpad/snapshot/cpu_context.cc b/third_party/crashpad/crashpad/snapshot/cpu_context.cc +index c75b5555e..aeade577a 100644 +--- a/third_party/crashpad/crashpad/snapshot/cpu_context.cc ++++ b/third_party/crashpad/crashpad/snapshot/cpu_context.cc +@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer() const { + return arm->pc; + case kCPUArchitectureARM64: + return arm64->pc; ++ case kCPUArchitecturePPC64: ++ return ppc64->nip; + default: + NOTREACHED(); + return ~0ull; +@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() const { + return arm->sp; + case kCPUArchitectureARM64: + return arm64->sp; ++ case kCPUArchitecturePPC64: ++ return ppc64->regs[1]; + default: + NOTREACHED(); + return ~0ull; +@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const { + case kCPUArchitectureX86_64: + case kCPUArchitectureARM64: + case kCPUArchitectureMIPS64EL: ++ case kCPUArchitecturePPC64: + return true; + case kCPUArchitectureX86: + case kCPUArchitectureARM: +diff --git a/third_party/crashpad/crashpad/snapshot/cpu_context.h b/third_party/crashpad/crashpad/snapshot/cpu_context.h +index fb23c4679..eebede63c 100644 +--- a/third_party/crashpad/crashpad/snapshot/cpu_context.h ++++ b/third_party/crashpad/crashpad/snapshot/cpu_context.h +@@ -352,6 +352,24 @@ struct CPUContextMIPS64 { + uint64_t fir; + }; + ++//! \brief A context structure carrying PPC64 CPU state. ++struct CPUContextPPC64 { ++ uint64_t nip; ++ uint64_t msr; ++ uint64_t regs[32]; ++ uint64_t ccr; ++ uint64_t xer; ++ uint64_t lnk; ++ uint64_t ctr; ++ double fpregs[32]; ++ double fpscr; ++ struct { ++ uint128_struct save_vr[32]; ++ uint128_struct save_vscr; ++ uint32_t save_vrsave; ++ } vregs; ++}; ++ + //! \brief A context structure capable of carrying the context of any supported + //! CPU architecture. + struct CPUContext { +@@ -382,6 +400,7 @@ struct CPUContext { + CPUContextARM64* arm64; + CPUContextMIPS* mipsel; + CPUContextMIPS64* mips64; ++ CPUContextPPC64* ppc64; + }; + }; + +diff --git a/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h b/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h +index 9f46a4897..aa677c4eb 100644 +--- a/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h ++++ b/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h +@@ -15,6 +15,7 @@ + #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_ + #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_ + ++#include + #include "build/build_config.h" + #include "snapshot/cpu_context.h" + #include "snapshot/linux/signal_context.h" +@@ -174,6 +175,78 @@ void InitializeCPUContextMIPS( + + #endif // ARCH_CPU_MIPS_FAMILY || DOXYGEN + ++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN ++ ++//! \brief Initalizes a CPUContextPPC64 structure from native context ++//! structures on Linux. ++//! ++//! \param[in] thread_context The native thread context. ++//! \param[in] float_context The native float context. ++//! \param[in] vector_context The native vector context. ++//! \param[out] context The CPUContextPPC64 structure to initalize. ++template ++void InitializeCPUContextPPC64( ++ const ThreadContext::t64_t& thread_context, ++ const FloatContext::f64_t& float_context, ++ const VectorContext::v64_t& vector_context, ++ typename Traits::CPUContext* context) { ++ ++ memcpy(context->regs, thread_context.gpr, sizeof(context->regs)); ++ context->nip = thread_context.nip; ++ context->msr = thread_context.msr; ++ context->ccr = thread_context.ccr; ++ context->xer = thread_context.xer; ++ context->lnk = thread_context.lnk; ++ context->ctr = thread_context.ctr; ++ ++ memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs)); ++ context->fpscr = float_context.fpscr; ++ ++ for (uint8_t i = 0; i < 32; i++) { ++ context->vregs.save_vr[i] = { ++ (((uint64_t)vector_context.vrregs[i][0]) << 32) | ++ vector_context.vrregs[i][1], ++ (((uint64_t)vector_context.vrregs[i][2]) << 32) | ++ vector_context.vrregs[i][3] ++ }; ++ } ++ context->vregs.save_vrsave = vector_context.vrsave; ++ context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word}; ++} ++ ++template ++void InitializeCPUContextPPC64( ++ const SignalThreadContext64 &thread_context, ++ const SignalFloatContext64 &float_context, ++ const SignalVectorContext64 &vector_context, ++ typename Traits::CPUContext* context) { ++ ++ memcpy(context->regs, thread_context.regs, sizeof(context->regs)); ++ context->nip = thread_context.nip; ++ context->msr = thread_context.msr; ++ context->ccr = thread_context.ccr; ++ context->xer = thread_context.xer; ++ context->lnk = thread_context.lnk; ++ context->ctr = thread_context.ctr; ++ ++ memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs)); ++ context->fpscr = float_context.fpscr; ++ ++ for (uint8_t i = 0; i < 32; i++) { ++ context->vregs.save_vr[i] = { ++ (((uint64_t)vector_context.vrregs[i][0]) << 32) | ++ vector_context.vrregs[i][1], ++ (((uint64_t)vector_context.vrregs[i][2]) << 32) | ++ vector_context.vrregs[i][3] ++ }; ++ } ++ context->vregs.save_vrsave = vector_context.vrsave; ++ context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word}; ++} ++ ++ ++#endif ++ + } // namespace internal + } // namespace crashpad + +diff --git a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc +index d32bd1937..2dd538c2b 100644 +--- a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc +@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection* connection) { + device == 0 && inode == 0 && mapping_name == "[vdso]"; + #if defined(ARCH_CPU_X86) + static constexpr char kPrefix[] = "linux-gate.so."; ++#elif defined(ARCH_CPU_PPC64) ++ static constexpr char kPrefix[] = "linux-vdso64.so."; + #else + static constexpr char kPrefix[] = "linux-vdso.so."; + #endif +diff --git a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc +index cd40b3b12..6bcf23b6f 100644 +--- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc +@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext( + reader, context_address, context_.mips64); + } + ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ ++template ++static bool ReadContext(ProcessReaderLinux* reader, ++ LinuxVMAddress context_address, ++ typename Traits::CPUContext* dest_context) { ++ const ProcessMemory* memory = reader->Memory(); ++ ++ LinuxVMAddress gp_regs_address = context_address + ++ offsetof(UContext, mcontext) + ++ offsetof(typename Traits::MContext, gp_regs); ++ ++ typename Traits::SignalThreadContext thread_context; ++ if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) { ++ LOG(ERROR) << "Couldn't read gp_regs!"; ++ return false; ++ } ++ ++ LinuxVMAddress fp_regs_address = context_address + ++ offsetof(UContext, mcontext) + ++ offsetof(typename Traits::MContext, fp_regs); ++ ++ typename Traits::SignalFloatContext fp_context; ++ if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) { ++ LOG(ERROR) << "Couldn't read fp_regs!"; ++ return false; ++ } ++ ++ LinuxVMAddress v_regs_ptr_address = context_address + ++ offsetof(UContext, mcontext) + ++ offsetof(typename Traits::MContext, vmx_reserve) + 8; ++ ++ typename Traits::SignalVectorContext v_context; ++ if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) { ++ LOG(ERROR) << "Couldn't read v_regs!"; ++ return false; ++ } ++ ++ InitializeCPUContextPPC64(thread_context, fp_context, ++ v_context, dest_context); ++ ++ return true; ++} ++ ++template<> ++bool ExceptionSnapshotLinux::ReadContext( ++ ProcessReaderLinux* reader, ++ LinuxVMAddress context_address) { ++ context_.architecture = kCPUArchitecturePPC64; ++ context_.ppc64 = &context_union_.ppc64; ++ ++ return internal::ReadContext( ++ reader, context_address, context_.ppc64); ++} ++ ++template<> ++bool ExceptionSnapshotLinux::ReadContext( ++ ProcessReaderLinux* reader, ++ LinuxVMAddress context_address) { ++ // PPC64 is 64-bit ++ return false; ++} ++ + #endif // ARCH_CPU_X86_FAMILY + + bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader, +diff --git a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h +index ea0cd2106..e42df520f 100644 +--- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h ++++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h +@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : public ExceptionSnapshot { + #elif defined(ARCH_CPU_MIPS_FAMILY) + CPUContextMIPS mipsel; + CPUContextMIPS64 mips64; ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ CPUContextPPC64 ppc64; + #endif + } context_union_; + CPUContext context_; +diff --git a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc +index c17170b43..b6a714cc6 100644 +--- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc +@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) { + 0); + #undef CPU_ARCH_NAME + } ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++using NativeCPUContext = ucontext_t; ++ ++void InitializeContext(NativeCPUContext* context) { ++ for (size_t reg = 0; reg < 32; ++reg) { ++ context->uc_mcontext.gp_regs[reg] = reg; ++ } ++ ++ memset(&context->uc_mcontext.fp_regs, 44, ++ sizeof(context->uc_mcontext.fp_regs)); ++} + ++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) { ++ EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64); ++ ++ for (size_t reg = 0; reg < 32; ++reg) { ++ EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]); ++ } ++ ++ EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs, ++ sizeof(actual.ppc64->fpregs)), 0); ++} + #else + #error Port. + #endif +diff --git a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc +index ee246e8bc..9555dce04 100644 +--- a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc +@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::InitializeStack(ProcessReaderLinux* reader) { + #elif defined(ARCH_CPU_MIPS_FAMILY) + stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29] + : thread_info.thread_context.t32.regs[29]; ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ stack_pointer = thread_info.thread_context.t64.gpr[1]; + #else + #error Port. + #endif +diff --git a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h +index 110024680..a1f2da259 100644 +--- a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h ++++ b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h +@@ -422,6 +422,89 @@ static_assert(offsetof(UContext, mcontext.fpregs) == + "context offset mismatch"); + #endif + ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ ++struct SignalThreadContext64 { ++ uint64_t regs[32]; ++ uint64_t nip; ++ uint64_t msr; ++ uint64_t orig_r3; ++ uint64_t ctr; ++ uint64_t lnk; ++ uint64_t xer; ++ uint64_t ccr; ++ uint64_t softe; ++ uint64_t trap; ++ uint64_t dar; ++ uint64_t dsisr; ++ uint64_t result; ++ uint64_t dscr; ++ uint64_t fpr0[3]; ++}; ++ ++struct SignalFloatContext64 { ++ double regs[32]; ++ double fpscr; ++}; ++ ++struct SignalVectorContext64 { ++ int32_t vrregs[32][4]; ++ struct { ++ int32_t __pad[3]; ++ int32_t vscr_word; ++ } vscr; ++ int32_t vrsave; ++ int32_t __pad[3]; ++} __attribute__((__aligned__(16))); ++ ++ ++#pragma pack(pop) ++struct MContext64 { ++ uint64_t reserved[4]; ++ int32_t signal; ++ int32_t __pad0; ++ uint64_t handler; ++ uint64_t oldmask; ++ uint64_t pt_regs_ptr; ++ SignalThreadContext64 gp_regs; ++ SignalFloatContext64 fp_regs; ++ SignalVectorContext64 *v_regs; ++ int64_t vmx_reserve[69]; ++}; ++ ++struct ContextTraits64 : public Traits64 { ++ using MContext = MContext64; ++ using SignalThreadContext = SignalThreadContext64; ++ using SignalFloatContext = SignalFloatContext64; ++ using SignalVectorContext = SignalVectorContext64; ++ using CPUContext = CPUContextPPC64; ++}; ++ ++struct ContextTraits32 : public Traits32 {}; ++ ++struct UContext { ++ uint64_t flags; ++ uint64_t link; ++ SignalStack stack; ++ Sigset sigmask; ++ MContext64 mcontext; ++}; ++#pragma pack(push, 1) ++ ++static_assert(sizeof(UContext) == sizeof(ucontext_t), ++ "ucontext_t size mismatch"); ++static_assert(sizeof(MContext64) == sizeof(mcontext_t), ++ "mcontext_t size mismatch"); ++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t), ++ "gregset_t size mismatch"); ++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t), ++ "fpregset_t size mismatch"); ++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t), ++ "vrregset_t size mismatch"); ++static_assert(offsetof(UContext, mcontext) == ++ offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch"); ++static_assert(offsetof(MContext64, gp_regs) == ++ offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch"); + #else + #error Port. + #endif // ARCH_CPU_X86_FAMILY +diff --git a/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc b/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc +index a99da3e4b..03b973083 100644 +--- a/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc +@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::GetCPUArchitecture() const { + #elif defined(ARCH_CPU_MIPS_FAMILY) + return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL + : kCPUArchitectureMIPSEL; ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ return kCPUArchitecturePPC64; + #else + #error port to your architecture + #endif +@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevision() const { + #elif defined(ARCH_CPU_MIPS_FAMILY) + // Not implementable on MIPS + return 0; ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ // Not yet implemented on PPC64 ++ return 0; + #else + #error port to your architecture + #endif +@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVendor() const { + #elif defined(ARCH_CPU_MIPS_FAMILY) + // Not implementable on MIPS + return std::string(); ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ // Not yet implemented on PPC64 ++ return std::string(); + #else + #error port to your architecture + #endif +@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() const { + #elif defined(ARCH_CPU_MIPS_FAMILY) + // Not implementable on MIPS + return false; ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ // Not yet implemented on PPC64 ++ return false; + #else + #error Port. + #endif // ARCH_CPU_X86_FAMILY +diff --git a/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc b/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc +index b2450c206..7ba78b2ae 100644 +--- a/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc +@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePath& module_path, + module.ehdr.e_machine = EM_AARCH64; + #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL) + module.ehdr.e_machine = EM_MIPS; ++#elif defined(ARCH_CPU_PPC64) ++ module.ehdr.e_machine = EM_PPC64; + #endif + + module.ehdr.e_version = EV_CURRENT; +diff --git a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc +index e3e2bebdd..8ef43752e 100644 +--- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc +@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(ProcessReaderLinux* process_reader, + thread.thread_info.float_context.f32, + context_.mipsel); + } ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ context_.architecture = kCPUArchitecturePPC64; ++ context_.ppc64 = &context_union_.ppc64; ++ InitializeCPUContextPPC64( ++ thread.thread_info.thread_context.t64, ++ thread.thread_info.float_context.f64, ++ thread.thread_info.vector_context.v64, ++ context_.ppc64); + #else + #error Port. + #endif +diff --git a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h +index 44cc6f6d9..d4136461e 100644 +--- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h ++++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h +@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public ThreadSnapshot { + #elif defined(ARCH_CPU_MIPS_FAMILY) + CPUContextMIPS mipsel; + CPUContextMIPS64 mips64; ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ CPUContextPPC64 ppc64; + #else + #error Port. + #endif // ARCH_CPU_X86_FAMILY +--- a/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc ++++ b/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc +@@ -236,6 +236,12 @@ + #elif defined(ARCH_CPU_BIG_ENDIAN) + static constexpr char arch[] = "aarch64_be"; + #endif ++#elif defined(__powerpc64__) ++#if defined(ARCH_CPU_LITTLE_ENDIAN) ++ static constexpr char arch[] = "ppc64le"; ++#elif defined(ARCH_CPU_BIG_ENDIAN) ++ static constexpr char arch[] = "ppc64"; ++#endif + #else + #error Port + #endif +diff --git a/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc b/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc +index d3d5ebdfb..3fd730cb5 100644 +--- a/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc ++++ b/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc +@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnection* connection) { + if (type == AT_IGNORE) { + continue; + } ++#if defined(ARCH_CPU_PPC64_FAMILY) ++ if (type == AT_IGNOREPPC) { ++ continue; ++ } ++#endif + if (!MapInsertOrReplace(&values_, type, value, nullptr)) { + LOG(ERROR) << "duplicate auxv entry"; + return false; +diff --git a/third_party/crashpad/crashpad/util/linux/ptracer.cc b/third_party/crashpad/crashpad/util/linux/ptracer.cc +index 557e0d363..08ae434b8 100644 +--- a/third_party/crashpad/crashpad/util/linux/ptracer.cc ++++ b/third_party/crashpad/crashpad/util/linux/ptracer.cc +@@ -398,6 +398,64 @@ bool GetThreadArea64(pid_t tid, + return true; + } + ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it). ++// That means we can simply use PTRACE_GETREGESET. ++ ++template ++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) { ++ iovec iov; ++ iov.iov_base = reinterpret_cast(dest); ++ iov.iov_len = sizeof(*dest); ++ if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast(set), &iov) != 0) { ++ PLOG_IF(ERROR, can_log) << "ptrace"; ++ return false; ++ } ++ if (iov.iov_len != sizeof(*dest)) { ++ LOG_IF(ERROR, can_log) << "Unexpected registers size"; ++ return false; ++ } ++ return true; ++} ++ ++bool GetVectorRegisters64(pid_t tid, ++ VectorContext* context, ++ bool can_log) { ++ return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log); ++} ++ ++bool GetFloatingPointRegisters64(pid_t tid, ++ FloatContext* context, ++ bool can_log) { ++ return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log); ++} ++ ++bool GetThreadArea64(pid_t tid, ++ const ThreadContext& context, ++ LinuxVMAddress* address, ++ bool can_log) { ++ // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer ++ // is stored in GPR 13. ++ ThreadContext::t64_t tc; ++ if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) { ++ LOG_IF(ERROR, can_log) << "Unable to get thread pointer!"; ++ return false; ++ } ++ ++ *address = tc.gpr[13]; ++ ++ return true; ++} ++ ++// Stubs for 32-bit functions not applicable on PPC64 ++bool GetFloatingPointRegisters32(pid_t tid, ++ FloatContext* context, ++ bool can_log) { return false; } ++bool GetThreadArea32(pid_t tid, ++ const ThreadContext &context, ++ LinuxVMAddress *address, ++ bool can_log) { return false; } ++ + #else + #error Port. + #endif // ARCH_CPU_X86_FAMILY +@@ -494,6 +552,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, ThreadInfo* info) { + if (is_64_bit_) { + return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) && + GetFloatingPointRegisters64(tid, &info->float_context, can_log_) && ++#if defined(ARCH_CPU_PPC64_FAMILY) ++ GetVectorRegisters64(tid, &info->vector_context, can_log_) && ++#endif + GetThreadArea64(tid, + info->thread_context, + &info->thread_specific_data_address, +diff --git a/third_party/crashpad/crashpad/util/linux/thread_info.h b/third_party/crashpad/crashpad/util/linux/thread_info.h +index 5b55c24a7..dea0d1f39 100644 +--- a/third_party/crashpad/crashpad/util/linux/thread_info.h ++++ b/third_party/crashpad/crashpad/util/linux/thread_info.h +@@ -28,6 +28,10 @@ + #include + #endif + ++#if defined(ARCH_CPU_PPC64_FAMILY) ++#include ++#endif ++ + namespace crashpad { + + //! \brief The set of general purpose registers for an architecture family. +@@ -79,6 +83,8 @@ union ThreadContext { + uint32_t cp0_status; + uint32_t cp0_cause; + uint32_t padding1_; ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ // PPC64 is 64-bit + #else + #error Port. + #endif // ARCH_CPU_X86_FAMILY +@@ -132,6 +138,21 @@ union ThreadContext { + uint64_t cp0_badvaddr; + uint64_t cp0_status; + uint64_t cp0_cause; ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ // Reflects struct pt_regs in asm/ptrace.h. ++ uint64_t gpr[32]; ++ uint64_t nip; ++ uint64_t msr; ++ uint64_t orig_gpr3; ++ uint64_t ctr; ++ uint64_t lnk; ++ uint64_t xer; ++ uint64_t ccr; ++ uint64_t softe; ++ uint64_t trap; ++ uint64_t dar; ++ uint64_t dsisr; ++ uint64_t result; + #else + #error Port. + #endif // ARCH_CPU_X86_FAMILY +@@ -143,6 +164,8 @@ union ThreadContext { + using NativeThreadContext = user_regs; + #elif defined(ARCH_CPU_MIPS_FAMILY) + // No appropriate NativeThreadsContext type available for MIPS ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ using NativeThreadContext = struct pt_regs; + #else + #error Port. + #endif // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64 +@@ -218,6 +241,9 @@ union FloatContext { + } fpregs[32]; + uint32_t fpcsr; + uint32_t fpu_id; ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ // Crashpad's PPC support is 64-bit only, so this ++ // 32bit-only struct is declared as empty. + #else + #error Port. + #endif // ARCH_CPU_X86_FAMILY +@@ -252,6 +278,10 @@ union FloatContext { + double fpregs[32]; + uint32_t fpcsr; + uint32_t fpu_id; ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ // Reflects fpregset_t in sys/ucontext.h ++ double fpregs[32]; ++ double fpscr; + #else + #error Port. + #endif // ARCH_CPU_X86_FAMILY +@@ -280,6 +310,8 @@ union FloatContext { + static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch"); + #elif defined(ARCH_CPU_MIPS_FAMILY) + // No appropriate floating point context native type for available MIPS. ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch"); + #else + #error Port. + #endif // ARCH_CPU_X86 +@@ -287,6 +319,26 @@ union FloatContext { + static_assert(std::is_standard_layout::value, + "Not standard layout"); + ++//! \brief The vector registers used for an architecture family ++union VectorContext { ++ struct v32_t {} v32; ++#if defined(ARCH_CPU_PPC64_FAMILY) ++ __attribute__((__aligned__(16))) // Vector context must be doubleword aligned. ++#endif ++ struct v64_t { ++#if defined(ARCH_CPU_PPC64_FAMILY) ++ // Reflects vrregset_t in sys/ucontext.h ++ uint32_t vrregs[32][4]; ++ struct { ++ uint32_t __pad[3]; ++ uint32_t vscr_word; ++ } vscr; ++ uint32_t vrsave; ++ uint32_t __pad[3]; ++#endif ++ } v64; ++}; ++ + //! \brief A collection of `ptrace`-able information about a thread. + struct ThreadInfo { + ThreadInfo(); +@@ -298,6 +350,9 @@ struct ThreadInfo { + //! \brief The floating point registers for the thread. + FloatContext float_context; + ++ //! \brief (Optional) The vector registers used for the thread. ++ VectorContext vector_context; ++ + //! \brief The thread-local storage address for the thread. + LinuxVMAddress thread_specific_data_address; + }; +diff --git a/third_party/crashpad/crashpad/util/misc/capture_context.h b/third_party/crashpad/crashpad/util/misc/capture_context.h +index d21a24f19..acc325349 100644 +--- a/third_party/crashpad/crashpad/util/misc/capture_context.h ++++ b/third_party/crashpad/crashpad/util/misc/capture_context.h +@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t; + //! macOS/Linux/Fuchsia | x86_64 | `%%rdi` + //! Linux | ARM/ARM64 | `r0`/`x0` + //! Linux | MIPS/MIPS64 | `$a0` ++//! Linux | PPC64 | `r3` + //! + //! Additionally, the value `LR` on ARM/ARM64 will be the return address of + //! this function. +diff --git a/third_party/crashpad/crashpad/util/misc/capture_context_linux.S b/third_party/crashpad/crashpad/util/misc/capture_context_linux.S +index 52215ee5d..b3e4a3ec7 100644 +--- a/third_party/crashpad/crashpad/util/misc/capture_context_linux.S ++++ b/third_party/crashpad/crashpad/util/misc/capture_context_linux.S +@@ -32,7 +32,7 @@ + .balign 4, 0x0 + .type CAPTURECONTEXT_SYMBOL, %function + .type CAPTURECONTEXT_SYMBOL2, %function +-#elif defined(__mips__) ++#elif defined(__mips__) || defined(__powerpc64__) + .balign 4, 0x0 + #endif + +@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2: + jr $ra + + .set at ++#elif defined(__powerpc64__) ++ // Store r0-r31 ++ std 0, 0xe8(3) // context->uc_mcontext.gp_regs[0] ++ std 1, 0xf0(3) // context->uc_mcontext.gp_regs[1] ++ std 2, 0xf8(3) // context->uc_mcontext.gp_regs[2] ++ // note that r3's original value was lost ++ std 3, 0x100(3) // context->uc_mcontext.gp_regs[3] ++ std 4, 0x108(3) // context->uc_mcontext.gp_regs[4] ++ std 5, 0x110(3) // context->uc_mcontext.gp_regs[5] ++ std 6, 0x118(3) // context->uc_mcontext.gp_regs[6] ++ std 7, 0x120(3) // context->uc_mcontext.gp_regs[7] ++ std 8, 0x128(3) // context->uc_mcontext.gp_regs[8] ++ std 9, 0x130(3) // context->uc_mcontext.gp_regs[9] ++ std 10, 0x138(3) // context->uc_mcontext.gp_regs[10] ++ std 11, 0x140(3) // context->uc_mcontext.gp_regs[11] ++ std 12, 0x148(3) // context->uc_mcontext.gp_regs[12] ++ std 13, 0x150(3) // context->uc_mcontext.gp_regs[13] ++ std 14, 0x158(3) // context->uc_mcontext.gp_regs[14] ++ std 15, 0x160(3) // context->uc_mcontext.gp_regs[15] ++ std 16, 0x168(3) // context->uc_mcontext.gp_regs[16] ++ std 17, 0x170(3) // context->uc_mcontext.gp_regs[17] ++ std 18, 0x178(3) // context->uc_mcontext.gp_regs[18] ++ std 19, 0x180(3) // context->uc_mcontext.gp_regs[19] ++ std 20, 0x188(3) // context->uc_mcontext.gp_regs[20] ++ std 21, 0x190(3) // context->uc_mcontext.gp_regs[21] ++ std 22, 0x198(3) // context->uc_mcontext.gp_regs[22] ++ std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23] ++ std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24] ++ std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25] ++ std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26] ++ std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27] ++ std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28] ++ std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29] ++ std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30] ++ std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31] ++ ++ // For NIP, we can use the value in the link register ++ mflr 0 ++ std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP] ++ ++ // CTR ++ mfctr 0 ++ std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR] ++ ++ // For LNK, we'll use the caller's LR save area (2 stack frames up). ++ // r4 can be used as a scratch register since it has already been saved. ++ ld 4, 0(1) ++ ld 4, 16(4) ++ std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK] ++ ++ // XER ++ mfxer 0 ++ std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER] ++ ++ // CCR ++ mfcr 0 ++ std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR] ++ ++ // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR, ++ // not used or not relevant, zero them out. ++ li 4, 0 ++ std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR] ++ std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3] ++ std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ] ++ std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP] ++ std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR] ++ std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR] ++ std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT] ++ std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR] ++ ++ // Update context->uc_mcontext.regs to point to gp_regs ++ addi 0, 3, 0xe8 ++ std 0, 0xe0(3) ++ ++ // Save floating point registers 0-31 ++ stfd 0, 0x268(3) // context->uc_mcontext.fp_regs[0] ++ stfd 1, 0x270(3) // context->uc_mcontext.fp_regs[1] ++ stfd 2, 0x278(3) // context->uc_mcontext.fp_regs[2] ++ stfd 3, 0x280(3) // context->uc_mcontext.fp_regs[3] ++ stfd 4, 0x288(3) // context->uc_mcontext.fp_regs[4] ++ stfd 5, 0x290(3) // context->uc_mcontext.fp_regs[5] ++ stfd 6, 0x298(3) // context->uc_mcontext.fp_regs[6] ++ stfd 7, 0x2a0(3) // context->uc_mcontext.fp_regs[7] ++ stfd 8, 0x2a8(3) // context->uc_mcontext.fp_regs[8] ++ stfd 9, 0x2b0(3) // context->uc_mcontext.fp_regs[9] ++ stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10] ++ stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11] ++ stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12] ++ stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13] ++ stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14] ++ stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15] ++ stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16] ++ stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17] ++ stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18] ++ stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19] ++ stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20] ++ stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21] ++ stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22] ++ stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23] ++ stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24] ++ stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25] ++ stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26] ++ stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27] ++ stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28] ++ stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29] ++ stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30] ++ stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31] ++ ++ // FPSCR ++ mffs 0 ++ stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32] ++ ++ // Save VMX Vector registers ++ // Update r4 to contain the base address of vmx_reserve ++ addi 4, 3, 0x378 ++ // Ensure that it is quadword aligned ++ andi. 5, 4, 0xF ++ beq 1f // No alignment is necessary ++ // Address is doubleword aligned and not quadword aligned, add 8 ++ addi 4, 4, 8 ++ ++1: ++ // Store VMX registers 0-31 ++ // r4 will contain the base address ++ // r5 will contain the index ++ li 5, 0 ++ stvx 0, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 0] ++ addi 5, 5, 16 ++ stvx 1, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 1] ++ addi 5, 5, 16 ++ stvx 2, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 2] ++ addi 5, 5, 16 ++ stvx 3, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 3] ++ addi 5, 5, 16 ++ stvx 4, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 4] ++ addi 5, 5, 16 ++ stvx 5, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 5] ++ addi 5, 5, 16 ++ stvx 6, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 6] ++ addi 5, 5, 16 ++ stvx 7, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 7] ++ addi 5, 5, 16 ++ stvx 8, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 8] ++ addi 5, 5, 16 ++ stvx 9, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 9] ++ addi 5, 5, 16 ++ stvx 10, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 10] ++ addi 5, 5, 16 ++ stvx 11, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 11] ++ addi 5, 5, 16 ++ stvx 12, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 12] ++ addi 5, 5, 16 ++ stvx 13, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 13] ++ addi 5, 5, 16 ++ stvx 14, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 14] ++ addi 5, 5, 16 ++ stvx 15, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 15] ++ addi 5, 5, 16 ++ stvx 16, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 16] ++ addi 5, 5, 16 ++ stvx 17, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 17] ++ addi 5, 5, 16 ++ stvx 18, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 18] ++ addi 5, 5, 16 ++ stvx 19, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 19] ++ addi 5, 5, 16 ++ stvx 20, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 20] ++ addi 5, 5, 16 ++ stvx 21, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 21] ++ addi 5, 5, 16 ++ stvx 22, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 22] ++ addi 5, 5, 16 ++ stvx 23, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 23] ++ addi 5, 5, 16 ++ stvx 24, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 24] ++ addi 5, 5, 16 ++ stvx 25, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 25] ++ addi 5, 5, 16 ++ stvx 26, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 26] ++ addi 5, 5, 16 ++ stvx 27, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 27] ++ addi 5, 5, 16 ++ stvx 28, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 28] ++ addi 5, 5, 16 ++ stvx 29, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 29] ++ addi 5, 5, 16 ++ stvx 30, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 30] ++ addi 5, 5, 16 ++ stvx 31, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 31] ++ addi 5, 5, 16 ++ ++ // VSCR ++ mfvscr 0 ++ stvx 0, 4, 5 ++ addi 5, 5, 16 ++ ++ // VRSAVE ++ mfvrsave 0 ++ stwx 0, 4, 5 ++ ++ // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment. ++ std 4, 0x370(3) ++ ++ // Zero out all unused fields ++ li 4, 0 ++ std 4, 0xc8(3) // context->uc_mcontext.signal ++ std 4, 0xd0(3) // context->uc_mcontext.handler ++ std 4, 0xd8(3) // context->uc_mcontext.oldmask ++ ++ blr + #endif // __i386__ +diff --git a/third_party/crashpad/crashpad/util/misc/capture_context_test.cc b/third_party/crashpad/crashpad/util/misc/capture_context_test.cc +index cf23c2def..5f264bc92 100644 +--- a/third_party/crashpad/crashpad/util/misc/capture_context_test.cc ++++ b/third_party/crashpad/crashpad/util/misc/capture_context_test.cc +@@ -57,7 +57,7 @@ void TestCaptureContext() { + uintptr_t pc = ProgramCounterFromContext(context_1); + + #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \ +- !defined(MEMORY_SANITIZER) ++ !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY) + // Sanitizers can cause enough code bloat that the “nearby” check would + // likely fail. + const uintptr_t kReferencePC = +diff --git a/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc b/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc +index 30a2ab21d..60509f21d 100644 +--- a/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc ++++ b/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc +@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUContext& context) { + EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast(&context)); + #elif defined(ARCH_CPU_MIPS_FAMILY) + EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast(&context)); ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast(&context)); + #endif + } + +@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(const NativeCPUContext& context) { + return context.uc_mcontext.pc; + #elif defined(ARCH_CPU_MIPS_FAMILY) + return context.uc_mcontext.pc; ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ return context.uc_mcontext.gp_regs[PT_NIP]; + #endif + } + +@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const NativeCPUContext& context) { + return context.uc_mcontext.sp; + #elif defined(ARCH_CPU_MIPS_FAMILY) + return context.uc_mcontext.gregs[29]; ++#elif defined(ARCH_CPU_PPC64_FAMILY) ++ return context.uc_mcontext.gp_regs[1]; + #endif + } + +diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn +index 6b4566fc3..c07f732ad 100644 +--- a/third_party/dav1d/BUILD.gn ++++ b/third_party/dav1d/BUILD.gn +@@ -184,6 +184,8 @@ static_library("dav1d_8bit") { + sources += arm_template_sources + } else if (current_cpu == "arm64") { + sources += arm_template_sources ++ } else if (current_cpu == "ppc64") { ++ sources += ppc64_template_sources + } + + cflags = dav1d_copts +@@ -212,6 +214,8 @@ static_library("dav1d_10bit") { + sources += arm_template_sources + } else if (current_cpu == "arm64") { + sources += arm_template_sources ++ } else if (current_cpu == "ppc64") { ++ sources += ppc64_template_sources + } + + cflags = dav1d_copts +@@ -263,6 +267,21 @@ if (current_cpu == "x86" || current_cpu == "x64") { + defines = [ "PREFIX" ] + } + ++ cflags = dav1d_copts ++ } ++} else if (current_cpu == "ppc64") { ++ static_library("dav1d_ppc") { ++ sources = [ ++ "libdav1d/src/ppc/cpu.c", ++ "libdav1d/src/ppc/cpu.h", ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ ++ "//build/config/compiler:no_chromium_code", ++ ":dav1d_config", ++ ] ++ + cflags = dav1d_copts + } + } +@@ -292,5 +311,7 @@ static_library("dav1d") { + } + } else if (current_cpu == "arm" || current_cpu == "arm64") { + deps += [ ":dav1d_arm" ] ++ } else if (current_cpu == "ppc64") { ++ deps += [ ":dav1d_ppc" ] + } + } +diff --git a/third_party/dav1d/config/linux/ppc64/config.h b/third_party/dav1d/config/linux/ppc64/config.h +new file mode 100644 +index 000000000..9fbbf75cc +--- /dev/null ++++ b/third_party/dav1d/config/linux/ppc64/config.h +@@ -0,0 +1,39 @@ ++/* ++ * Autogenerated by the Meson build system. ++ * Do not edit, your changes will be lost. ++ */ ++ ++#pragma once ++ ++#define ARCH_AARCH64 0 ++ ++#define ARCH_ARM 0 ++ ++#define ARCH_PPC64LE 1 ++ ++#define ARCH_X86 0 ++ ++#define ARCH_X86_32 0 ++ ++#define ARCH_X86_64 0 ++ ++#define CONFIG_16BPC 1 ++ ++#define CONFIG_8BPC 1 ++ ++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium ++ ++#define ENDIANNESS_BIG 0 ++ ++#define HAVE_ASM 1 ++ ++#define HAVE_CLOCK_GETTIME 1 ++ ++#define HAVE_DLSYM 1 ++ ++#define HAVE_GETAUXVAL 1 ++ ++#define HAVE_POSIX_MEMALIGN 1 ++ ++#define HAVE_UNISTD_H 1 ++ +diff --git a/third_party/dav1d/dav1d_generated.gni b/third_party/dav1d/dav1d_generated.gni +index c59cb0821..3060284a8 100644 +--- a/third_party/dav1d/dav1d_generated.gni ++++ b/third_party/dav1d/dav1d_generated.gni +@@ -82,6 +82,11 @@ arm_template_sources = [ + "libdav1d/src/arm/mc_init_tmpl.c", + ] + ++ppc64_template_sources = [ ++ "libdav1d/src/ppc/cdef_init_tmpl.c", ++ "libdav1d/src/ppc/looprestoration_init_tmpl.c", ++] ++ + template_sources = [ + "libdav1d/src/cdef_apply_tmpl.c", + "libdav1d/src/cdef_tmpl.c", +--- a/third_party/dav1d/generate_source.py ++++ b/third_party/dav1d/generate_source.py +@@ -61,6 +61,8 @@ + _Glob("libdav1d/src/arm/64/*_tmpl.S") + ["libdav1d/src/arm/64/util.S"]) + _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c")) + ++ _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c")) ++ + template_sources = _Glob("libdav1d/src/*_tmpl.c") + _WriteArray(fd, "template_sources", template_sources) + +diff --git a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h b/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h +index 0b4bd72f0..a0caa5e71 100644 +--- a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h ++++ b/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h +@@ -51,4 +51,19 @@ + #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0))) + #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v)) + ++#if defined(__clang__) ++#undef vec_splats ++#define vec_splats(N) \ ++ _Generic((N), \ ++ unsigned char: ((u8x16)(N)), \ ++ signed char: ((i8x16)(N)), \ ++ unsigned short: ((u16x8)(N)), \ ++ signed short: ((i16x8)(N)), \ ++ unsigned int: ((u32x4)(N)), \ ++ signed int: ((i32x4)(N)), \ ++ unsigned long long: ((u64x2)(N)), \ ++ signed long long: ((i64x2)(N)) \ ++ ) ++#endif ++ + #endif /* DAV1D_SRC_PPC_TYPES_H */ +diff --git a/third_party/eigen3/BUILD.gn b/third_party/eigen3/BUILD.gn +index 0d4e184..f2ce484 100644 +--- a/third_party/eigen3/BUILD.gn ++++ b/third_party/eigen3/BUILD.gn +@@ -22,4 +22,8 @@ config("eigen_includes") { + # for this component on Windows on Arm due to compilation errors. + defines += [ "EIGEN_DONT_VECTORIZE" ] + } ++ ++ if (target_cpu == "ppc64") { ++ defines += [ "EIGEN_DONT_VECTORIZE" ] ++ } + } + +diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn +index 9b065bd..df3af02 100644 +--- a/third_party/libaom/BUILD.gn ++++ b/third_party/libaom/BUILD.gn +@@ -36,6 +36,8 @@ if (enable_libaom) { + } else { + cpu_arch_full = "arm" + } ++} else if (current_cpu == "ppc64") { ++ cpu_arch_full = "generic" + } else { + cpu_arch_full = current_cpu + } +diff --git a/third_party/libgav1/options.gni b/third_party/libgav1/options.gni +index 11af801..4b13d05 100644 +--- a/third_party/libgav1/options.gni ++++ b/third_party/libgav1/options.gni +@@ -12,5 +12,5 @@ declare_args() { + is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64") + use_libgav1_parser = + (is_chromeos || is_linux || is_win) && +- (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64") ++ (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64") + } +diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h +index e4ac22644..1c57015db 100644 +--- a/third_party/lss/linux_syscall_support.h ++++ b/third_party/lss/linux_syscall_support.h +@@ -3947,7 +3947,7 @@ struct kernel_statfs { + LSS_REG(2, buf); + LSS_BODY(void*, mmap2, "0"(__r2)); + } +-#else ++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */ + #define __NR__mmap2 __NR_mmap2 + LSS_INLINE _syscall6(void*, _mmap2, void*, s, + size_t, l, int, p, +@@ -4058,7 +4058,7 @@ struct kernel_statfs { + #if defined(__i386__) || \ + defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ + (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) || \ +- defined(__PPC__) || \ ++ (defined(__PPC__) && !defined(__powerpc64__)) || \ + (defined(__s390__) && !defined(__s390x__)) + /* On these architectures, implement mmap() with mmap2(). */ + LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d, +diff --git a/third_party/pdfium/third_party/libpng16/pngpriv.h b/third_party/pdfium/third_party/libpng16/pngpriv.h +index 583c26f..e03d697 100644 +--- a/third_party/pdfium/third_party/libpng16/pngpriv.h ++++ b/third_party/pdfium/third_party/libpng16/pngpriv.h +@@ -196,11 +196,7 @@ + #endif + + #ifndef PNG_POWERPC_VSX_OPT +-# if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__) +-# define PNG_POWERPC_VSX_OPT 2 +-# else +-# define PNG_POWERPC_VSX_OPT 0 +-# endif ++# define PNG_POWERPC_VSX_OPT 0 + #endif + + #ifndef PNG_INTEL_SSE_OPT +diff --git a/third_party/pffft/src/pffft.c b/third_party/pffft/src/pffft.c +index bdac4d784..51e0f2cac 100644 +--- a/third_party/pffft/src/pffft.c ++++ b/third_party/pffft/src/pffft.c +@@ -100,6 +100,7 @@ + Altivec support macros + */ + #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__)) ++#include + typedef vector float v4sf; + # define SIMD_SZ 4 + # define VZERO() ((vector float) vec_splat_u8(0)) +diff --git a/third_party/skia/src/sksl/SkSLString.cpp b/third_party/skia/src/sksl/SkSLString.cpp +index ec3e56964..4cf8999a2 100644 +--- a/third_party/skia/src/sksl/SkSLString.cpp ++++ b/third_party/skia/src/sksl/SkSLString.cpp +@@ -37,7 +37,12 @@ String to_string(double value) { + if (needsDotZero) { + buffer << ".0"; + } +- return buffer.str(); ++ ++ std::string ret(buffer.str()); ++ if (std::signbit(value) && ret[0] == '.') { ++ ret[0] = '-'; ++ } ++ return ret; + } + + bool stod(const StringFragment& s, SKSL_FLOAT* value) { +diff --git a/third_party/sqlite/src/amalgamation/sqlite3.c b/third_party/sqlite/src/amalgamation/sqlite3.c +index 6b4a7899d..b8c7fe414 100644 +--- a/third_party/sqlite/src/amalgamation/sqlite3.c ++++ b/third_party/sqlite/src/amalgamation/sqlite3.c +@@ -14474,7 +14474,8 @@ typedef INT16_TYPE LogEst; + # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ + defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ + defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ +- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ++ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \ ++ defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) + # define SQLITE_BYTEORDER 1234 + # elif defined(sparc) || defined(__ppc__) || \ + defined(__ARMEB__) || defined(__AARCH64EB__) +diff --git a/third_party/sqlite/src/amalgamation_dev/sqlite3.c b/third_party/sqlite/src/amalgamation_dev/sqlite3.c +index d30c9b7de..cf75a69d9 100644 +--- a/third_party/sqlite/src/amalgamation_dev/sqlite3.c ++++ b/third_party/sqlite/src/amalgamation_dev/sqlite3.c +@@ -14487,7 +14487,8 @@ typedef INT16_TYPE LogEst; + # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ + defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ + defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ +- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ++ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \ ++ defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) + # define SQLITE_BYTEORDER 1234 + # elif defined(sparc) || defined(__ppc__) || \ + defined(__ARMEB__) || defined(__AARCH64EB__) +diff --git a/third_party/sqlite/src/ext/rtree/rtree.c b/third_party/sqlite/src/ext/rtree/rtree.c +index f5b57a5e2..80a2d0ad8 100644 +--- a/third_party/sqlite/src/ext/rtree/rtree.c ++++ b/third_party/sqlite/src/ext/rtree/rtree.c +@@ -450,7 +450,7 @@ struct RtreeMatchArg { + #if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ + defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ + defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ +- defined(__arm__) ++ defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) + # define SQLITE_BYTEORDER 1234 + #elif defined(sparc) || defined(__ppc__) + # define SQLITE_BYTEORDER 4321 +diff --git a/third_party/sqlite/src/src/sqliteInt.h b/third_party/sqlite/src/src/sqliteInt.h +index 245070d4f..b25164e95 100644 +--- a/third_party/sqlite/src/src/sqliteInt.h ++++ b/third_party/sqlite/src/src/sqliteInt.h +@@ -877,7 +877,8 @@ typedef INT16_TYPE LogEst; + # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ + defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ + defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ +- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ++ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \ ++ defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) + # define SQLITE_BYTEORDER 1234 + # elif defined(sparc) || defined(__ppc__) || \ + defined(__ARMEB__) || defined(__AARCH64EB__) +diff --git a/third_party/webrtc/modules/desktop_capture/differ_block.cc b/third_party/webrtc/modules/desktop_capture/differ_block.cc +index 4f0c5430c..54ee0829e 100644 +--- a/third_party/webrtc/modules/desktop_capture/differ_block.cc ++++ b/third_party/webrtc/modules/desktop_capture/differ_block.cc +@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) { + static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr; + + if (!diff_proc) { +-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY) +- // For ARM and MIPS processors, always use C version. +- // TODO(hclam): Implement a NEON version. +- diff_proc = &VectorDifference_C; +-#else ++#if defined(WEBRTC_ARCH_X86_FAMILY) + bool have_sse2 = GetCPUInfo(kSSE2) != 0; + // For x86 processors, check if SSE2 is supported. + if (have_sse2 && kBlockSize == 32) { +@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) { + } else { + diff_proc = &VectorDifference_C; + } ++#else ++ // For other processors, always use C version. ++ // TODO(hclam): Implement a NEON version. ++ diff_proc = &VectorDifference_C; + #endif + } + +diff --git a/third_party/webrtc/rtc_base/system/arch.h b/third_party/webrtc/rtc_base/system/arch.h +index be2367b85..be4ee4233 100644 +--- a/third_party/webrtc/rtc_base/system/arch.h ++++ b/third_party/webrtc/rtc_base/system/arch.h +@@ -79,6 +79,18 @@ + #elif defined(__EMSCRIPTEN__) + #define WEBRTC_ARCH_32_BITS + #define WEBRTC_ARCH_LITTLE_ENDIAN ++#elif defined(__PPC__) ++#define WEBRTC_ARCH_PPC_FAMILY ++#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ ++#define WEBRTC_ARCH_LITTLE_ENDIAN ++#else ++#define WEBRTC_ARCH_BIG_ENDIAN ++#endif ++#if defined(__LP64__) ++#define WEBRTC_ARCH_64_BITS ++#else ++#define WEBRTC_ARCH_32_BITS ++#endif + #else + #error Please add support for your architecture in rtc_base/system/arch.h + #endif +diff --git a/v8/BUILD.gn b/v8/BUILD.gn +index f39529a3a..e84fc449e 100644 +--- a/v8/BUILD.gn ++++ b/v8/BUILD.gn +@@ -850,6 +850,12 @@ config("toolchain") { + } + if (host_byteorder == "little") { + defines += [ "V8_TARGET_ARCH_PPC_LE" ] ++ cflags += [ ++ # Enable usage of AltiVec, VSX, and other POWER8 and higher features ++ "-mcpu=power8", ++ "-maltivec", ++ "-mvsx", ++ ] + } else if (host_byteorder == "big") { + defines += [ "V8_TARGET_ARCH_PPC_BE" ] + if (current_os == "aix") { +diff --git a/ui/gl/features.gni b/ui/gl/features.gni +index 5fda9b6..3d2dd8b 100644 +--- a/ui/gl/features.gni ++++ b/ui/gl/features.gni +@@ -32,5 +32,6 @@ declare_args() { + (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) && + (target_cpu == "x86" || target_cpu == "x64" || + target_cpu == "arm" || target_cpu == "arm64" || +- target_cpu == "mipsel" || target_cpu == "mips64el") ++ target_cpu == "mipsel" || target_cpu == "mips64el" || ++ target_cpu == "ppc64") + } +diff --git a/v8/test/BUILD.gn b/v8/test/BUILD.gn +index fb872ad39..45fc585dd 100644 +--- a/v8/test/BUILD.gn ++++ b/v8/test/BUILD.gn +@@ -36,7 +36,7 @@ group("gn_all") { + "benchmarks/cpp:gn_all", + "cctest:cctest", + "cctest:generate-bytecode-expectations", +- "unittests:unittests", ++ #"unittests:unittests", + ] + } + } +@@ -83,7 +83,7 @@ + "message:v8_message", + "mjsunit:v8_mjsunit", + "mkgrokdump:mkgrokdump", +- "unittests:unittests", ++ #"unittests:unittests", + "webkit:v8_webkit", + ] + +@@ -108,7 +108,7 @@ + "message:v8_message", + "mjsunit:v8_mjsunit", + "mkgrokdump:mkgrokdump", +- "unittests:unittests", ++ #"unittests:unittests", + ] + + if (v8_enable_webassembly) { diff --git a/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-swiftshader.patch b/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-swiftshader.patch new file mode 100644 index 000000000000..df453f491d8c --- /dev/null +++ b/srcpkgs/electron19/files/patches/chromium-xxx-ppc64le-swiftshader.patch @@ -0,0 +1,18 @@ +--- a/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn ++++ b/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn +@@ -574,6 +574,7 @@ swiftshader_llvm_source_set("swiftshader + "llvm/lib/MC/MCAsmInfoCOFF.cpp", + "llvm/lib/MC/MCAsmInfoDarwin.cpp", + "llvm/lib/MC/MCAsmInfoELF.cpp", ++ "llvm/lib/MC/MCAsmInfoXCOFF.cpp", + "llvm/lib/MC/MCAsmMacro.cpp", + "llvm/lib/MC/MCAsmStreamer.cpp", + "llvm/lib/MC/MCAssembler.cpp", +@@ -629,6 +630,7 @@ swiftshader_llvm_source_set("swiftshader + "llvm/lib/MC/MCWinCOFFStreamer.cpp", + "llvm/lib/MC/MCWinEH.cpp", + "llvm/lib/MC/MCXCOFFStreamer.cpp", ++ "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp", + "llvm/lib/MC/MachObjectWriter.cpp", + "llvm/lib/MC/StringTableBuilder.cpp", + "llvm/lib/MC/SubtargetFeature.cpp", diff --git a/srcpkgs/electron19/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch b/srcpkgs/electron19/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch new file mode 100644 index 000000000000..916dba9dc3bc --- /dev/null +++ b/srcpkgs/electron19/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch @@ -0,0 +1,42 @@ +From ff4122f236b70c272c746d0c336cdbd588d78cd1 Mon Sep 17 00:00:00 2001 +From: Elvis Pranskevichus +Date: Thu, 12 Dec 2019 16:12:18 -0500 +Subject: [PATCH] Add a script to list patch targets + +--- + script/list_patch_targets.py | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + create mode 100755 script/list_patch_targets.py + +diff --git a/script/list_patch_targets.py b/script/list_patch_targets.py +new file mode 100755 +index 000000000..55173bac9 +--- /dev/null ++++ b/script/list_patch_targets.py +@@ -0,0 +1,23 @@ ++#!/usr/bin/env python ++ ++import argparse ++import json ++ ++ ++def parse_args(): ++ parser = argparse.ArgumentParser(description='Apply Electron patches') ++ parser.add_argument('config', nargs='+', ++ type=argparse.FileType('r'), ++ help='patches\' config(s) in the JSON format') ++ return parser.parse_args() ++ ++ ++def main(): ++ configs = parse_args().config ++ for config_json in configs: ++ for patch_dir, repo in json.load(config_json).iteritems(): ++ print(repo) ++ ++ ++if __name__ == '__main__': ++ main() +-- +2.23.0 + diff --git a/srcpkgs/electron19/files/patches/electron-Build-fixes.patch.patch b/srcpkgs/electron19/files/patches/electron-Build-fixes.patch.patch new file mode 100644 index 000000000000..f0036676458f --- /dev/null +++ b/srcpkgs/electron19/files/patches/electron-Build-fixes.patch.patch @@ -0,0 +1,33 @@ +diff --git a/build/args/release.gn b/build/args/release.gn +index e5017f6e1..59207b389 100644 +--- a/build/args/release.gn ++++ b/build/args/release.gn +@@ -1,6 +1,4 @@ + import("all.gn") +-is_component_build = false +-is_official_build = true + + # This may be guarded behind is_chrome_branded alongside + # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321, +@@ -8,9 +6,3 @@ is_official_build = true + # The initialization of the decoder depends on whether ffmpeg has + # been built with H.264 support. + rtc_use_h264 = proprietary_codecs +- +-# By default, Electron builds ffmpeg with proprietary codecs enabled. In order +-# to facilitate users who don't want to ship proprietary codecs in ffmpeg, or +-# who have an LGPL requirement to ship ffmpeg as a dynamically linked library, +-# we build ffmpeg as a shared library. +-is_component_ffmpeg = true +diff --git a/build/npm.gni b/build/npm.gni +index a1987d095..fb33a14c3 100644 +--- a/build/npm.gni ++++ b/build/npm.gni +@@ -35,7 +35,6 @@ template("npm_action") { + if (!defined(deps)) { + deps = [] + } +- deps += [ ":npm_pre_flight_" + target_name ] + + script = "//electron/build/npm-run.py" + args = [ diff --git a/srcpkgs/electron19/files/patches/electron-exclude-content-test-patches.patch b/srcpkgs/electron19/files/patches/electron-exclude-content-test-patches.patch new file mode 100644 index 000000000000..d3fda271ca5b --- /dev/null +++ b/srcpkgs/electron19/files/patches/electron-exclude-content-test-patches.patch @@ -0,0 +1,10 @@ +--- a/script/apply_all_patches.py 2020-08-22 17:46:41.796707506 +0200 ++++ - 2020-08-22 17:47:05.887813512 +0200 +@@ -14,6 +14,7 @@ + for patch_dir, repo in dirs.items(): + git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir), + threeway=threeway is not None, ++ exclude=['third_party/blink/tools/**', 'test/mjsunit/**', 'content/test/**', 'test/cctest/**', 'test/unittests/**', 'third_party/blink/web_tests/**'], + committer_name="Electron Scripts", committer_email="scripts@electron") + + diff --git a/srcpkgs/electron19/files/patches/electron-no-need-for-husky.patch b/srcpkgs/electron19/files/patches/electron-no-need-for-husky.patch new file mode 100644 index 000000000000..436d146f1353 --- /dev/null +++ b/srcpkgs/electron19/files/patches/electron-no-need-for-husky.patch @@ -0,0 +1,17 @@ +--- a/package.json 2022-07-06 17:31:50.000000000 +0200 ++++ - 2022-07-08 23:04:43.654812957 +0200 +@@ -98,7 +98,6 @@ + "precommit": "lint-staged", + "preinstall": "node -e 'process.exit(0)'", + "prepack": "check-for-leaks", +- "prepare": "husky install", + "repl": "node ./script/start.js --interactive", + "start": "node ./script/start.js", + "test": "node ./script/spec-runner.js", +@@ -143,4 +142,4 @@ + "node script/gen-hunspell-filenames.js" + ] + } +-} +\ No newline at end of file ++} diff --git a/srcpkgs/electron19/files/patches/electron-std-vector-non-const.patch b/srcpkgs/electron19/files/patches/electron-std-vector-non-const.patch new file mode 100644 index 000000000000..89de8a1afff5 --- /dev/null +++ b/srcpkgs/electron19/files/patches/electron-std-vector-non-const.patch @@ -0,0 +1,109 @@ +--- a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch ++++ b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch +@@ -32,7 +32,7 @@ index 5a64220aaf1309832dc0ad543e353de67fe0a779..e75c4f0d7cf1cac2e5862eb858800359 + - const base::FilePath& current_directory)>; + + base::RepeatingCallback additional_data)>; +++ const std::vector additional_data)>; + + #if BUILDFLAG(IS_WIN) + ProcessSingleton(const std::string& program_name, +@@ -73,7 +73,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 + // |reader| is for sending back ACK message. + void HandleMessage(const std::string& current_dir, + const std::vector& argv, +-+ const std::vector additional_data, +++ const std::vector additional_data, + SocketReader* reader); + + private: +@@ -84,7 +84,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 + - const std::string& current_dir, const std::vector& argv, + + const std::string& current_dir, + + const std::vector& argv, +-+ const std::vector additional_data, +++ const std::vector additional_data, + SocketReader* reader) { + DCHECK(ui_task_runner_->BelongsToCurrentThread()); + DCHECK(reader); +@@ -114,7 +114,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 + + base::StringToSizeT(tokens[0], &num_args); + + std::vector command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args); + + +-+ std::vector additional_data; +++ std::vector additional_data; + + if (tokens.size() >= 3 + num_args) { + + size_t additional_data_size; + + base::StringToSizeT(tokens[1 + num_args], &additional_data_size); +@@ -123,7 +123,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 + + std::string(1, kTokenDelimiter)); + + const uint8_t* additional_data_bits = + + reinterpret_cast(remaining_args.c_str()); +-+ additional_data = std::vector( +++ additional_data = std::vector( + + additional_data_bits, additional_data_bits + additional_data_size); + + } + + +@@ -189,7 +189,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f + base::CommandLine* parsed_command_line, + - base::FilePath* current_directory) { + + base::FilePath* current_directory, +-+ std::vector* parsed_additional_data) { +++ std::vector* parsed_additional_data) { + // We should have enough room for the shortest command (min_message_size) + // and also be a multiple of wchar_t bytes. The shortest command + - // possible is L"START\0\0" (empty current directory and command line). +@@ -230,7 +230,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f + + msg.substr(fourth_null + 1, fifth_null - fourth_null); + + const uint8_t* additional_data_bytes = + + reinterpret_cast(additional_data.c_str()); +-+ *parsed_additional_data = std::vector(additional_data_bytes, +++ *parsed_additional_data = std::vector(additional_data_bytes, + + additional_data_bytes + additional_data_length); + + + return true; +@@ -241,7 +241,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f + base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM); + base::FilePath current_directory; + - if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory)) { +-+ std::vector additional_data; +++ std::vector additional_data; + + if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory, &additional_data)) { + *result = TRUE; + return true; +--- a/shell/browser/api/electron_api_app.cc ++++ b/shell/browser/api/electron_api_app.cc +@@ -519,10 +519,10 @@ bool NotificationCallbackWrapper( + const base::RepeatingCallback< + void(const base::CommandLine& command_line, + const base::FilePath& current_directory, +- const std::vector additional_data)>& callback, ++ const std::vector additional_data)>& callback, + const base::CommandLine& cmd, + const base::FilePath& cwd, +- const std::vector additional_data) { ++ const std::vector additional_data) { + // Make sure the callback is called after app gets ready. + if (Browser::Get()->is_ready()) { + callback.Run(cmd, cwd, std::move(additional_data)); +@@ -1083,7 +1083,7 @@ std::string App::GetLocaleCountryCode() { + + void App::OnSecondInstance(const base::CommandLine& cmd, + const base::FilePath& cwd, +- const std::vector additional_data) { ++ const std::vector additional_data) { + v8::Isolate* isolate = JavascriptEnvironment::GetIsolate(); + v8::Locker locker(isolate); + v8::HandleScope handle_scope(isolate); +--- a/shell/browser/api/electron_api_app.h ++++ b/shell/browser/api/electron_api_app.h +@@ -195,7 +195,7 @@ class App : public ElectronBrowserClient::Delegate, + std::string GetLocaleCountryCode(); + void OnSecondInstance(const base::CommandLine& cmd, + const base::FilePath& cwd, +- const std::vector additional_data); ++ const std::vector additional_data); + bool HasSingleInstanceLock() const; + bool RequestSingleInstanceLock(gin::Arguments* args); + void ReleaseSingleInstanceLock(); diff --git a/srcpkgs/electron19/files/sndio-files/audio_manager_openbsd.cc b/srcpkgs/electron19/files/sndio-files/audio_manager_openbsd.cc new file mode 100644 index 000000000000..2c7aa8efa66f --- /dev/null +++ b/srcpkgs/electron19/files/sndio-files/audio_manager_openbsd.cc @@ -0,0 +1,148 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/metrics/histogram_macros.h" +#include "base/memory/ptr_util.h" + +#include "media/audio/openbsd/audio_manager_openbsd.h" + +#include "media/audio/audio_device_description.h" +#include "media/audio/audio_output_dispatcher.h" +#include "media/audio/sndio/sndio_input.h" +#include "media/audio/sndio/sndio_output.h" +#include "media/base/limits.h" +#include "media/base/media_switches.h" + +namespace media { + +// Maximum number of output streams that can be open simultaneously. +static const int kMaxOutputStreams = 4; + +// Default sample rate for input and output streams. +static const int kDefaultSampleRate = 48000; + +void AddDefaultDevice(AudioDeviceNames* device_names) { + DCHECK(device_names->empty()); + device_names->push_front(AudioDeviceName::CreateDefault()); +} + +bool AudioManagerOpenBSD::HasAudioOutputDevices() { + return true; +} + +bool AudioManagerOpenBSD::HasAudioInputDevices() { + return true; +} + +void AudioManagerOpenBSD::GetAudioInputDeviceNames( + AudioDeviceNames* device_names) { + DCHECK(device_names->empty()); + AddDefaultDevice(device_names); +} + +void AudioManagerOpenBSD::GetAudioOutputDeviceNames( + AudioDeviceNames* device_names) { + AddDefaultDevice(device_names); +} + +const char* AudioManagerOpenBSD::GetName() { + return "SNDIO"; +} + +AudioParameters AudioManagerOpenBSD::GetInputStreamParameters( + const std::string& device_id) { + static const int kDefaultInputBufferSize = 1024; + + int user_buffer_size = GetUserBufferSize(); + int buffer_size = user_buffer_size ? + user_buffer_size : kDefaultInputBufferSize; + + return AudioParameters( + AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, + kDefaultSampleRate, buffer_size); +} + +AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr audio_thread, + AudioLogFactory* audio_log_factory) + : AudioManagerBase(std::move(audio_thread), + audio_log_factory) { + DLOG(WARNING) << "AudioManagerOpenBSD"; + SetMaxOutputStreamsAllowed(kMaxOutputStreams); +} + +AudioManagerOpenBSD::~AudioManagerOpenBSD() { + Shutdown(); +} + +AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream( + const AudioParameters& params, + const LogCallback& log_callback) { + DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); + return MakeOutputStream(params); +} + +AudioOutputStream* AudioManagerOpenBSD::MakeLowLatencyOutputStream( + const AudioParameters& params, + const std::string& device_id, + const LogCallback& log_callback) { + DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!"; + DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); + return MakeOutputStream(params); +} + +AudioInputStream* AudioManagerOpenBSD::MakeLinearInputStream( + const AudioParameters& params, + const std::string& device_id, + const LogCallback& log_callback) { + DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); + return MakeInputStream(params); +} + +AudioInputStream* AudioManagerOpenBSD::MakeLowLatencyInputStream( + const AudioParameters& params, + const std::string& device_id, + const LogCallback& log_callback) { + DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); + return MakeInputStream(params); +} + +AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters( + const std::string& output_device_id, + const AudioParameters& input_params) { + // TODO(tommi): Support |output_device_id|. + DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!"; + static const int kDefaultOutputBufferSize = 2048; + + ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; + int sample_rate = kDefaultSampleRate; + int buffer_size = kDefaultOutputBufferSize; + if (input_params.IsValid()) { + sample_rate = input_params.sample_rate(); + channel_layout = input_params.channel_layout(); + buffer_size = std::min(buffer_size, input_params.frames_per_buffer()); + } + + int user_buffer_size = GetUserBufferSize(); + if (user_buffer_size) + buffer_size = user_buffer_size; + + return AudioParameters( + AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, + sample_rate, buffer_size); +} + +AudioInputStream* AudioManagerOpenBSD::MakeInputStream( + const AudioParameters& params) { + DLOG(WARNING) << "MakeInputStream"; + return new SndioAudioInputStream(this, + AudioDeviceDescription::kDefaultDeviceId, params); +} + +AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream( + const AudioParameters& params) { + DLOG(WARNING) << "MakeOutputStream"; + return new SndioAudioOutputStream(params, this); +} + +} // namespace media diff --git a/srcpkgs/electron19/files/sndio-files/audio_manager_openbsd.h b/srcpkgs/electron19/files/sndio-files/audio_manager_openbsd.h new file mode 100644 index 000000000000..8c99db966d65 --- /dev/null +++ b/srcpkgs/electron19/files/sndio-files/audio_manager_openbsd.h @@ -0,0 +1,65 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_ +#define MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_ + +#include + +#include "base/compiler_specific.h" +#include "base/macros.h" +#include "base/memory/ref_counted.h" +#include "base/threading/thread.h" +#include "media/audio/audio_manager_base.h" + +namespace media { + +class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase { + public: + AudioManagerOpenBSD(std::unique_ptr audio_thread, + AudioLogFactory* audio_log_factory); + ~AudioManagerOpenBSD() override; + + // Implementation of AudioManager. + bool HasAudioOutputDevices() override; + bool HasAudioInputDevices() override; + void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override; + void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; + AudioParameters GetInputStreamParameters( + const std::string& device_id) override; + const char* GetName() override; + + // Implementation of AudioManagerBase. + AudioOutputStream* MakeLinearOutputStream( + const AudioParameters& params, + const LogCallback& log_callback) override; + AudioOutputStream* MakeLowLatencyOutputStream( + const AudioParameters& params, + const std::string& device_id, + const LogCallback& log_callback) override; + AudioInputStream* MakeLinearInputStream( + const AudioParameters& params, + const std::string& device_id, + const LogCallback& log_callback) override; + AudioInputStream* MakeLowLatencyInputStream( + const AudioParameters& params, + const std::string& device_id, + const LogCallback& log_callback) override; + + protected: + AudioParameters GetPreferredOutputStreamParameters( + const std::string& output_device_id, + const AudioParameters& input_params) override; + + private: + // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream. + AudioOutputStream* MakeOutputStream(const AudioParameters& params); + AudioInputStream* MakeInputStream(const AudioParameters& params); + + DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD); +}; + +} // namespace media + +#endif // MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_ diff --git a/srcpkgs/electron19/files/sndio-files/sndio_input.cc b/srcpkgs/electron19/files/sndio-files/sndio_input.cc new file mode 100644 index 000000000000..ef5439b49a07 --- /dev/null +++ b/srcpkgs/electron19/files/sndio-files/sndio_input.cc @@ -0,0 +1,200 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/bind.h" +#include "base/logging.h" +#include "base/macros.h" +#include "media/base/audio_timestamp_helper.h" +#include "media/audio/openbsd/audio_manager_openbsd.h" +#include "media/audio/audio_manager.h" +#include "media/audio/sndio/sndio_input.h" + +namespace media { + +static const SampleFormat kSampleFormat = kSampleFormatS16; + +void SndioAudioInputStream::OnMoveCallback(void *arg, int delta) +{ + SndioAudioInputStream* self = static_cast(arg); + + self->hw_delay += delta; +} + +void *SndioAudioInputStream::ThreadEntry(void *arg) { + SndioAudioInputStream* self = static_cast(arg); + + self->ThreadLoop(); + return NULL; +} + +SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager, + const std::string& device_name, + const AudioParameters& params) + : manager(manager), + params(params), + audio_bus(AudioBus::Create(params)), + state(kClosed) { +} + +SndioAudioInputStream::~SndioAudioInputStream() { + if (state != kClosed) + Close(); +} + +bool SndioAudioInputStream::Open() { + struct sio_par par; + int sig; + + if (state != kClosed) + return false; + + if (params.format() != AudioParameters::AUDIO_PCM_LINEAR && + params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) { + LOG(WARNING) << "Unsupported audio format."; + return false; + } + + sio_initpar(&par); + par.rate = params.sample_rate(); + par.rchan = params.channels(); + par.bits = SampleFormatToBitsPerChannel(kSampleFormat); + par.bps = par.bits / 8; + par.sig = sig = par.bits != 8 ? 1 : 0; + par.le = SIO_LE_NATIVE; + par.appbufsz = params.frames_per_buffer(); + + hdl = sio_open(SIO_DEVANY, SIO_REC, 0); + + if (hdl == NULL) { + LOG(ERROR) << "Couldn't open audio device."; + return false; + } + + if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) { + LOG(ERROR) << "Couldn't set audio parameters."; + goto bad_close; + } + + if (par.rate != (unsigned int)params.sample_rate() || + par.rchan != (unsigned int)params.channels() || + par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) || + par.sig != (unsigned int)sig || + (par.bps > 1 && par.le != SIO_LE_NATIVE) || + (par.bits != par.bps * 8)) { + LOG(ERROR) << "Unsupported audio parameters."; + goto bad_close; + } + state = kStopped; + buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; + sio_onmove(hdl, &OnMoveCallback, this); + return true; +bad_close: + sio_close(hdl); + return false; +} + +void SndioAudioInputStream::Start(AudioInputCallback* cb) { + + StartAgc(); + + state = kRunning; + hw_delay = 0; + callback = cb; + sio_start(hdl); + if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) { + LOG(ERROR) << "Failed to create real-time thread for recording."; + sio_stop(hdl); + state = kStopped; + } +} + +void SndioAudioInputStream::Stop() { + + if (state == kStopped) + return; + + state = kStopWait; + pthread_join(thread, NULL); + sio_stop(hdl); + state = kStopped; + + StopAgc(); +} + +void SndioAudioInputStream::Close() { + + if (state == kClosed) + return; + + if (state == kRunning) + Stop(); + + state = kClosed; + delete [] buffer; + sio_close(hdl); + + manager->ReleaseInputStream(this); +} + +double SndioAudioInputStream::GetMaxVolume() { + // Not supported + return 0.0; +} + +void SndioAudioInputStream::SetVolume(double volume) { + // Not supported. Do nothing. +} + +double SndioAudioInputStream::GetVolume() { + // Not supported. + return 0.0; +} + +bool SndioAudioInputStream::IsMuted() { + // Not supported. + return false; +} + +void SndioAudioInputStream::SetOutputDeviceForAec( + const std::string& output_device_id) { + // Not supported. +} + +void SndioAudioInputStream::ThreadLoop(void) { + size_t todo, n; + char *data; + unsigned int nframes; + double normalized_volume = 0.0; + + nframes = audio_bus->frames(); + + while (state == kRunning && !sio_eof(hdl)) { + + GetAgcVolume(&normalized_volume); + + // read one block + todo = nframes * params.GetBytesPerFrame(kSampleFormat); + data = buffer; + while (todo > 0) { + n = sio_read(hdl, data, todo); + if (n == 0) + return; // unrecoverable I/O error + todo -= n; + data += n; + } + hw_delay -= nframes; + + // convert frames count to TimeDelta + const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, + params.sample_rate()); + + // push into bus + audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat)); + + // invoke callback + callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.); + } +} + +} // namespace media diff --git a/srcpkgs/electron19/files/sndio-files/sndio_input.h b/srcpkgs/electron19/files/sndio-files/sndio_input.h new file mode 100644 index 000000000000..d868e0469db5 --- /dev/null +++ b/srcpkgs/electron19/files/sndio-files/sndio_input.h @@ -0,0 +1,91 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_ +#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_ + +#include +#include +#include + +#include "base/compiler_specific.h" +#include "base/macros.h" +#include "base/memory/weak_ptr.h" +#include "base/time/time.h" +#include "media/audio/agc_audio_stream.h" +#include "media/audio/audio_io.h" +#include "media/audio/audio_device_description.h" +#include "media/base/audio_parameters.h" + +namespace media { + +class AudioManagerBase; + +// Implementation of AudioOutputStream using sndio(7) +class SndioAudioInputStream : public AgcAudioStream { + public: + // Pass this to the constructor if you want to attempt auto-selection + // of the audio recording device. + static const char kAutoSelectDevice[]; + + // Create a PCM Output stream for the SNDIO device identified by + // |device_name|. If unsure of what to use for |device_name|, use + // |kAutoSelectDevice|. + SndioAudioInputStream(AudioManagerBase* audio_manager, + const std::string& device_name, + const AudioParameters& params); + + ~SndioAudioInputStream() override; + + // Implementation of AudioInputStream. + bool Open() override; + void Start(AudioInputCallback* callback) override; + void Stop() override; + void Close() override; + double GetMaxVolume() override; + void SetVolume(double volume) override; + double GetVolume() override; + bool IsMuted() override; + void SetOutputDeviceForAec(const std::string& output_device_id) override; + + private: + + enum StreamState { + kClosed, // Not opened yet + kStopped, // Device opened, but not started yet + kRunning, // Started, device playing + kStopWait // Stopping, waiting for the real-time thread to exit + }; + + // C-style call-backs + static void OnMoveCallback(void *arg, int delta); + static void* ThreadEntry(void *arg); + + // Continuously moves data from the device to the consumer + void ThreadLoop(); + // Our creator, the audio manager needs to be notified when we close. + AudioManagerBase* manager; + // Parameters of the source + AudioParameters params; + // We store data here for consumer + std::unique_ptr audio_bus; + // Call-back that consumes recorded data + AudioInputCallback* callback; // Valid during a recording session. + // Handle of the audio device + struct sio_hdl* hdl; + // Current state of the stream + enum StreamState state; + // High priority thread running ThreadLoop() + pthread_t thread; + // Number of frames buffered in the hardware + int hw_delay; + // Temporary buffer where data is stored sndio-compatible format + char* buffer; + + DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream); +}; + +} // namespace media + +#endif // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_ diff --git a/srcpkgs/electron19/files/sndio-files/sndio_output.cc b/srcpkgs/electron19/files/sndio-files/sndio_output.cc new file mode 100644 index 000000000000..a6719f9aac8d --- /dev/null +++ b/srcpkgs/electron19/files/sndio-files/sndio_output.cc @@ -0,0 +1,183 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/logging.h" +#include "base/time/time.h" +#include "base/time/default_tick_clock.h" +#include "media/audio/audio_manager_base.h" +#include "media/base/audio_timestamp_helper.h" +#include "media/audio/sndio/sndio_output.h" + +namespace media { + +static const SampleFormat kSampleFormat = kSampleFormatS16; + +void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) { + SndioAudioOutputStream* self = static_cast(arg); + + self->hw_delay -= delta; +} + +void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) { + SndioAudioOutputStream* self = static_cast(arg); + + self->vol = vol; +} + +void *SndioAudioOutputStream::ThreadEntry(void *arg) { + SndioAudioOutputStream* self = static_cast(arg); + + self->ThreadLoop(); + return NULL; +} + +SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params, + AudioManagerBase* manager) + : manager(manager), + params(params), + audio_bus(AudioBus::Create(params)), + state(kClosed), + mutex(PTHREAD_MUTEX_INITIALIZER) { +} + +SndioAudioOutputStream::~SndioAudioOutputStream() { + if (state != kClosed) + Close(); +} + +bool SndioAudioOutputStream::Open() { + struct sio_par par; + int sig; + + if (params.format() != AudioParameters::AUDIO_PCM_LINEAR && + params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) { + LOG(WARNING) << "Unsupported audio format."; + return false; + } + sio_initpar(&par); + par.rate = params.sample_rate(); + par.pchan = params.channels(); + par.bits = SampleFormatToBitsPerChannel(kSampleFormat); + par.bps = par.bits / 8; + par.sig = sig = par.bits != 8 ? 1 : 0; + par.le = SIO_LE_NATIVE; + par.appbufsz = params.frames_per_buffer(); + + hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0); + if (hdl == NULL) { + LOG(ERROR) << "Couldn't open audio device."; + return false; + } + if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) { + LOG(ERROR) << "Couldn't set audio parameters."; + goto bad_close; + } + if (par.rate != (unsigned int)params.sample_rate() || + par.pchan != (unsigned int)params.channels() || + par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) || + par.sig != (unsigned int)sig || + (par.bps > 1 && par.le != SIO_LE_NATIVE) || + (par.bits != par.bps * 8)) { + LOG(ERROR) << "Unsupported audio parameters."; + goto bad_close; + } + state = kStopped; + volpending = 0; + vol = 0; + buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; + sio_onmove(hdl, &OnMoveCallback, this); + sio_onvol(hdl, &OnVolCallback, this); + return true; + bad_close: + sio_close(hdl); + return false; +} + +void SndioAudioOutputStream::Close() { + if (state == kClosed) + return; + if (state == kRunning) + Stop(); + state = kClosed; + delete [] buffer; + sio_close(hdl); + manager->ReleaseOutputStream(this); // Calls the destructor +} + +void SndioAudioOutputStream::Start(AudioSourceCallback* callback) { + state = kRunning; + hw_delay = 0; + source = callback; + sio_start(hdl); + if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) { + LOG(ERROR) << "Failed to create real-time thread."; + sio_stop(hdl); + state = kStopped; + } +} + +void SndioAudioOutputStream::Stop() { + if (state == kStopped) + return; + state = kStopWait; + pthread_join(thread, NULL); + sio_stop(hdl); + state = kStopped; +} + +void SndioAudioOutputStream::SetVolume(double v) { + pthread_mutex_lock(&mutex); + vol = v * SIO_MAXVOL; + volpending = 1; + pthread_mutex_unlock(&mutex); +} + +void SndioAudioOutputStream::GetVolume(double* v) { + pthread_mutex_lock(&mutex); + *v = vol * (1. / SIO_MAXVOL); + pthread_mutex_unlock(&mutex); +} + +// This stream is always used with sub second buffer sizes, where it's +// sufficient to simply always flush upon Start(). +void SndioAudioOutputStream::Flush() {} + +void SndioAudioOutputStream::ThreadLoop(void) { + int avail, count, result; + + while (state == kRunning) { + // Update volume if needed + pthread_mutex_lock(&mutex); + if (volpending) { + volpending = 0; + sio_setvol(hdl, vol); + } + pthread_mutex_unlock(&mutex); + + // Get data to play + const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, + params.sample_rate()); + count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get()); + audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer); + if (count == 0) { + // We have to submit something to the device + count = audio_bus->frames(); + memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat)); + LOG(WARNING) << "No data to play, running empty cycle."; + } + + // Submit data to the device + avail = count * params.GetBytesPerFrame(kSampleFormat); + result = sio_write(hdl, buffer, avail); + if (result == 0) { + LOG(WARNING) << "Audio device disconnected."; + break; + } + + // Update hardware pointer + hw_delay += count; + } +} + +} // namespace media diff --git a/srcpkgs/electron19/files/sndio-files/sndio_output.h b/srcpkgs/electron19/files/sndio-files/sndio_output.h new file mode 100644 index 000000000000..ead220ca96e7 --- /dev/null +++ b/srcpkgs/electron19/files/sndio-files/sndio_output.h @@ -0,0 +1,86 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ +#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ + +#include +#include + +#include "base/time/tick_clock.h" +#include "base/time/time.h" +#include "media/audio/audio_io.h" + +namespace media { + +class AudioManagerBase; + +// Implementation of AudioOutputStream using sndio(7) +class SndioAudioOutputStream : public AudioOutputStream { + public: + // The manager is creating this object + SndioAudioOutputStream(const AudioParameters& params, + AudioManagerBase* manager); + virtual ~SndioAudioOutputStream(); + + // Implementation of AudioOutputStream. + bool Open() override; + void Close() override; + void Start(AudioSourceCallback* callback) override; + void Stop() override; + void SetVolume(double volume) override; + void GetVolume(double* volume) override; + void Flush() override; + + friend void sndio_onmove(void *arg, int delta); + friend void sndio_onvol(void *arg, unsigned int vol); + friend void *sndio_threadstart(void *arg); + + private: + enum StreamState { + kClosed, // Not opened yet + kStopped, // Device opened, but not started yet + kRunning, // Started, device playing + kStopWait // Stopping, waiting for the real-time thread to exit + }; + + // C-style call-backs + static void OnMoveCallback(void *arg, int delta); + static void OnVolCallback(void *arg, unsigned int vol); + static void* ThreadEntry(void *arg); + + // Continuously moves data from the producer to the device + void ThreadLoop(void); + + // Our creator, the audio manager needs to be notified when we close. + AudioManagerBase* manager; + // Parameters of the source + AudioParameters params; + // Source stores data here + std::unique_ptr audio_bus; + // Call-back that produces data to play + AudioSourceCallback* source; + // Handle of the audio device + struct sio_hdl* hdl; + // Current state of the stream + enum StreamState state; + // High priority thread running ThreadLoop() + pthread_t thread; + // Protects vol, volpending and hw_delay + pthread_mutex_t mutex; + // Current volume in the 0..SIO_MAXVOL range + int vol; + // Set to 1 if volumes must be refreshed in the realtime thread + int volpending; + // Number of frames buffered in the hardware + int hw_delay; + // Temporary buffer where data is stored sndio-compatible format + char* buffer; + + DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream); +}; + +} // namespace media + +#endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ diff --git a/srcpkgs/electron19/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch b/srcpkgs/electron19/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch new file mode 100644 index 000000000000..cf8e81b11d67 --- /dev/null +++ b/srcpkgs/electron19/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch @@ -0,0 +1,43 @@ +diff --git a/chromium/media/audio/linux/audio_manager_linux.cc b/chromium/media/audio/linux/audio_manager_linux.cc +index 5d703549372..9e60b40c749 100644 +--- media/audio/linux/audio_manager_linux.cc ++++ media/audio/linux/audio_manager_linux.cc +@@ -20,6 +20,10 @@ + #include "media/audio/pulse/audio_manager_pulse.h" + #include "media/audio/pulse/pulse_util.h" + #endif ++#if defined(USE_SNDIO) ++#include ++#include "media/audio/openbsd/audio_manager_openbsd.h" ++#endif + + namespace media { + +@@ -27,7 +31,8 @@ enum LinuxAudioIO { + kPulse, + kAlsa, + kCras, +- kAudioIOMax = kCras // Must always be equal to largest logged entry. ++ kSndio, ++ kAudioIOMax = kSndio // Must always be equal to largest logged entry. + }; + + std::unique_ptr CreateAudioManager( +@@ -41,6 +46,17 @@ std::unique_ptr CreateAudioManager( + } + #endif + ++#if defined(USE_SNDIO) ++ struct sio_hdl * hdl = NULL; ++ if ((hdl=sio_open(SIO_DEVANY, SIO_PLAY, 1)) != NULL) { ++ sio_close(hdl); ++ UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax +1); ++ return std::make_unique(std::move(audio_thread), ++ audio_log_factory); ++ } ++ DVLOG(1) << "Sndio is not available on the OS"; ++#endif ++ + #if defined(USE_PULSEAUDIO) + pa_threaded_mainloop* pa_mainloop = nullptr; + pa_context* pa_context = nullptr; diff --git a/srcpkgs/electron19/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch b/srcpkgs/electron19/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch new file mode 100644 index 000000000000..ec6040026688 --- /dev/null +++ b/srcpkgs/electron19/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch @@ -0,0 +1,12 @@ +--- media/BUILD.gn 2020-03-24 10:16:30.000000000 +0100 ++++ - 2020-04-06 14:32:27.960817513 +0200 +@@ -65,6 +65,9 @@ + if (use_cras) { + defines += [ "USE_CRAS" ] + } ++ if (use_sndio) { ++ defines += [ "USE_SNDIO" ] ++ } + } + + # Internal grouping of the configs necessary to support sub-folders having their diff --git a/srcpkgs/electron19/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch b/srcpkgs/electron19/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch new file mode 100644 index 000000000000..c856de0bf2ec --- /dev/null +++ b/srcpkgs/electron19/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch @@ -0,0 +1,23 @@ +--- media/audio/BUILD.gn 2020-03-24 10:16:30.000000000 +0100 ++++ - 2020-04-06 14:31:28.871450217 +0200 +@@ -232,9 +232,19 @@ + deps += [ "//media/base/android:media_jni_headers" ] + } + +- if (is_linux) { ++ if (is_linux) { + sources += [ "linux/audio_manager_linux.cc" ] + } ++ if (use_sndio) { ++ libs += [ "sndio" ] ++ sources += [ ++ "openbsd/audio_manager_openbsd.cc", ++ "sndio/sndio_input.cc", ++ "sndio/sndio_input.h", ++ "sndio/sndio_output.cc", ++ "sndio/sndio_output.h" ++ ] ++ } + + if (use_alsa) { + libs += [ "asound" ] diff --git a/srcpkgs/electron19/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch b/srcpkgs/electron19/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch new file mode 100644 index 000000000000..14807d8e1d36 --- /dev/null +++ b/srcpkgs/electron19/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch @@ -0,0 +1,12 @@ +--- media/media_options.gni 2020-03-24 10:16:30.000000000 +0100 ++++ - 2020-04-06 14:29:22.958630783 +0200 +@@ -114,6 +114,9 @@ + # Enables runtime selection of ALSA library for audio. + use_alsa = false + ++ # Enables runtime selection of sndio library for audio. ++ use_sndio = false ++ + # Alsa should be used on non-Android, non-Mac POSIX systems. + # Alsa should be used on desktop Chromecast and audio-only Chromecast builds. + if (is_posix && !is_android && !is_mac && diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template new file mode 100644 index 000000000000..1a8fbb2820ad --- /dev/null +++ b/srcpkgs/electron19/template @@ -0,0 +1,409 @@ +# Template file for 'electron19' +pkgname=electron19 +version=19.0.8 +revision=1 +_nodever=16.14.2 +_chromiumver=102.0.5005.125 +archs="x86_64* aarch64* ppc64le*" +create_wrksrc=yes +build_wrksrc="src" +hostmakedepends="$(vopt_if clang clang) python pkgconf perl gperf bison ninja nodejs hwids + libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel + pciutils-devel libatomic-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel + opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel + alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel) + $(vopt_if sndio sndio-devel) jq" +makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel + libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel + libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel + libXScrnSaver-devel alsa-lib-devel snappy-devel libdrm-devel + libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel + libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel + libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel + minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel + re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel + $(vopt_if sndio sndio-devel) ffmpeg-devel libva-devel libuv-devel c-ares-devel libnotify-devel + $(vopt_if pipewire pipewire-devel) wayland-devel libcurl-devel libxshmfence-devel" +short_desc="Cross platform application framework based on web technologies" +maintainer="John " +license="BSD-3-Clause" +homepage="https://electronjs.org" +distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz + https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz + https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz" +checksum="d8ee01db95dfe24aa89a67424498b67102a4977ff9a3ccbfbc3f36801fdba7d5 + f33363565a3c8868f5f67f0852ccf8d19ada209af8ddd4e27774e50206700464 + cc2331a5c35d3dda0035d9cba71c3b8e234bc68e18ffd955b385c1e97062528f" + +case "$XBPS_TARGET_MACHINE" in + ppc64*-musl) makedepends+=" libucontext-devel" ;; +esac + +no_generic_pkgconfig_link=yes +lib32disabled=yes +nopie=yes # contains tools that are not PIE, enables PIE itself + +build_options="pulseaudio sndio clang pipewire" +build_options_default="pulseaudio clang pipewire" + +#if [ "$build_option_clang" ]; then +nocross="Yes" +#elif [ "${XBPS_TARGET_MACHINE%%-musl}" = "aarch64" ]; then +# broken="Falls apart at runtime when compiled with gcc" +#fi + +_buildtype=Release +_is_debug=false + +CFLAGS="-Wno-unknown-warning-option -fPIC" +CXXFLAGS="-Wno-unknown-warning-option -fPIC" + +_apply_patch() { + local args="$1" pname="$(basename $2)" + + if [ ! -f ".${pname}_done" ]; then + if [ -f "${2}.args" ]; then + args=$(<"${2}.args") + fi + msg_normal "$pkgver: patching: ${pname}.\n" + patch -N $args -i $2 + touch .${pname}_done + fi +} + +_git_am() { + local pname="$(basename $1)" + + if [ ! -f ".${pname}_done" ]; then + msg_normal "$pkgver: patching: ${pname}.\n" + git -c 'user.name=Electron build' -c 'user.email=electron@ebuild' \ + am --exclude "third_party/blink/tools/**" \ + --exclude "test/mjsunit/**" --exclude "content/test/**" \ + --exclude "test/cctest/**" --exclude "test/unittests/**" \ + --exclude "third_party/blink/web_tests/**" \ + --exclude "chrome/test/**" \ + $1 + touch .${pname}_done + fi +} + + +_get_chromium_arch() { + case "$1" in + x86_64*) echo x64 ;; + i686*) echo x86 ;; + arm*) echo arm ;; + aarch64*) echo arm64 ;; + ppc64*) echo ppc64 ;; + ppc*) echo ppc ;; + mipsel*) echo mipsel ;; + mips*) echo mips ;; + *) msg_error "$pkgver: cannot be compiled for ${XBPS_TARGET_MACHINE}.\n" ;; + esac +} + +post_extract() { + mv chromium-${_chromiumver} src + mkdir -p src/third_party/ + mv node-$_nodever src/third_party/electron_node + mv electron-${version} src/electron +} + +post_patch() { + cd $wrksrc + for x in $FILESDIR/patches/*.patch; do + case "${x##*/}" in + electron*.patch) + cd src/electron + _apply_patch -p1 "$x" + cd "$wrksrc";; + esac + done + + # Sigh, electron uses git am... + if [ ! -f ".electron_patches_done" ]; then + mv src/electron/patches/config.json config.json.old + jq 'del(."src/electron/patches/Mantle", ."src/electron/patches/ReactiveObjC", + ."src/electron/patches/squirrel.mac", ."src/electron/patches/nan")' \ + config.json.old > src/electron/patches/config.json + + python2 src/electron/script/list_patch_targets.py src/electron/patches/config.json | while read -r repopath; do + cd "$wrksrc"/"$repopath" + git init -q + git config "gc.auto" 0 + if [ "$repopath" != "src" ]; then + echo "/${repopath#src/}" >> "$wrksrc/$build_wrksrc/.gitignore" + fi + git add . + git -c 'user.name=Electron build' -c 'user.email=electron@ebuild' \ + commit -q -m "." || true + done + cd $wrksrc + + for x in $FILESDIR/chromium-upstream-patches/*.patch; do + cd src + _git_am "$x" + cd "$wrksrc" + done + + python2 src/electron/script/apply_all_patches.py src/electron/patches/config.json + touch .electron_patches_done + fi + + for x in $FILESDIR/patches/*; do + case "${x##*/}" in + chromium*.patch) + cd src + _apply_patch -p1 "$x" + cd "$wrksrc";; + esac + done + + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + for x in $FILESDIR/musl-patches/*; do + case "${x##*/}" in + chromium*.patch) + cd src + _apply_patch -p0 "$x" + cd "$wrksrc";; + electron*.patch) + cd src/electron + _apply_patch -p1 "$x" + cd "$wrksrc";; + esac + done + fi + if [ "$build_option_sndio" ]; then + mkdir -p ${wrksrc}/${build_wrksrc}/media/audio/{sndio,openbsd} + cp ${FILESDIR}/sndio-files/sndio_*put.* \ + ${wrksrc}/${build_wrksrc}/media/audio/sndio + cp ${FILESDIR}/sndio-files/audio_manager_openbsd.* \ + ${wrksrc}/${build_wrksrc}/media/audio/openbsd + for f in "${FILESDIR}"/sndio-patches/*.patch; do + cd src + _apply_patch -p0 "$f" + cd "$wrksrc" + done + fi +} + +pre_configure() { + cd "$wrksrc/$build_wrksrc" + + # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion + touch chrome/test/data/webui/i18n_process_css_test.html + # Use the file at run time instead of effectively compiling it in + sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \ + -i services/device/public/cpp/usb/BUILD.gn + + mkdir -p third_party/node/linux/node-linux-x64/bin + ln -sf /usr/bin/node third_party/node/linux/node-linux-x64/bin/ + rm -f third_party/devtools-frontend/src/third_party/esbuild/esbuild + + # compile gn early, so it can be used to generate gni stuff + msg_normal "Bootstrapping GN\n" + CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \ + CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS}" \ + LDFLAGS="${XBPS_LDFLAGS}" \ + python2 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles + + # we need to generate ppc64 stuff for libvpx as it's not shipped + # this has to be done before unbundling, but after gn is built + # comment out if we switch back to system libvpx again later + case "$XBPS_TARGET_MACHINE" in + ppc64*) + pushd third_party/libvpx + mkdir -p source/config/linux/ppc64 + # need PATH to find gn + PATH="${wrksrc}/${build_wrksrc}/out/Release:$PATH" \ + ./generate_gni.sh || \ + msg_error "failed to generate libvpx gni" + popd + ;; + esac + + # reusable system library settings + local use_system=" + ffmpeg + flac + fontconfig + freetype + harfbuzz-ng + libdrm + libevent + libjpeg + libpng + libwebp + libxml + libxslt + opus + re2 + snappy + " + for _lib in $use_system libjpeg_turbo; do + msg_normal "Removing buildscripts for system provided $_lib\n" + find -type f -path "*third_party/$_lib/*" \ + \! -path "*third_party/$_lib/chromium/*" \ + \! -path "*third_party/$_lib/google/*" \ + \! -path './base/third_party/icu/*' \ + \! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \ + \! -path './third_party/harfbuzz-ng/utils/hb_scoped.h' \ + \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ + -delete + done + + + msg_normal "Replacing gn files\n" + python3 build/linux/unbundle/replace_gn_files.py --system-libraries \ + $use_system + third_party/libaddressinput/chromium/tools/update-strings.py +} + +do_configure() { + local target_arch="$(_get_chromium_arch ${XBPS_TARGET_MACHINE})" + local host_arch="$(_get_chromium_arch ${XBPS_MACHINE})" + # the build system will set march for use, adding it to cflags will break builds + export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} ) + export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} ) + export CFLAGS=${CFLAGS/-g/} + export CXXFLAGS=${CXXFLAGS/-g/} + local conf=() + cd third_party/electron_node + if [ "$CROSS_BUILD" ]; then + conf_args=" --dest-cpu=${target_arch} --cross-compiling" + fi + ./configure --prefix=/usr \ + --shared-zlib \ + --shared-libuv \ + --shared-openssl \ + --shared-cares \ + --openssl-use-def-ca-store \ + --without-npm \ + --without-dtrace \ + --without-bundled-v8 \ + ${conf_args} + + cd "$wrksrc/$build_wrksrc"/electron + yarn install --frozen-lockfile + cd "$wrksrc/$build_wrksrc" + + if [ "$build_option_clang" ]; then + export CC=clang + export CXX=clang++ + export HOST_CC=clang + export HOST_CXX=clang++ + else + export CXXFLAGS="$CXXFLAGS -fpermissive" + export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive" + export BUILD_AR="$AR_host" + export BUILD_NM="$NM_host" + fi + + conf+=( + 'blink_symbol_level=0' + 'clang_use_chrome_plugins=false' + 'custom_toolchain="//build/toolchain/linux/unbundle:default"' + ) + if [ "$CROSS_BUILD" ]; then + conf+=( + 'host_toolchain="//build/toolchain/linux/unbundle:host"' + 'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"' + "host_pkg_config=\"$PKG_CONFIG_FOR_BUILD\"" + "pkg_config=\"$PKG_CONFIG\"" + ) + else + conf+=( + 'host_toolchain="//build/toolchain/linux/unbundle:default"' + 'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"' + ) + fi + if [ "$build_option_sndio" ]; then + conf+=( + 'use_sndio=true' + ) + fi + if [ -n "$XBPS_DEBUG_PKGS" ]; then + conf+=('symbol_level=1') + else + conf+=('symbol_level=0') + fi + + # this does not work on ppc64 yet + case "$XBPS_TARGET_MACHINE" in + ppc64*) conf+=( "enable_jxl_decoder=false" );; + esac + + conf+=( + 'devtools_skip_typecheck=false' + 'enable_hangout_services_extension=true' + 'enable_nacl=false' + 'enable_precompiled_headers=false' + 'fatal_linker_warnings=false' + 'ffmpeg_branding="Chrome"' + 'gold_path="/usr/bin/ld.gold"' + 'icu_use_data_file=true' + "is_clang=$(vopt_if clang true false)" + 'is_component_build=false' + "is_debug=$_is_debug" + 'proprietary_codecs=true' + 'treat_warnings_as_errors=false' + 'use_allocator_shim=false' + 'use_allocator="none"' + 'use_cups=true' + 'use_custom_libcxx=false' + 'use_gnome_keyring=false' + 'use_gold=false' + 'use_lld=false' + 'use_system_libwayland=true' + "use_pulseaudio=$(vopt_if pulseaudio 'true' 'false')" + "rtc_use_pipewire=$(vopt_if pipewire true false)" + 'use_sysroot=false' + 'use_system_harfbuzz=true' + "target_cpu=\"$target_arch\"" + "host_cpu=\"$host_arch\"" + 'import("//electron/build/args/release.gn")' + ) + + msg_normal "Configuring build\n" + out/Release/gn gen out/$_buildtype --args="${conf[*]}" +} + +do_build() { + export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} ) + export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} ) + export CFLAGS=${CFLAGS/-g/} + export CXXFLAGS=${CXXFLAGS/-g/} + if [ "$build_option_clang" ]; then + export CC=clang + export CXX=clang++ + export HOST_CC=clang + export HOST_CXX=clang++ + else + export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive" + export CXXFLAGS="$CXXFLAGS -fpermissive" + export BUILD_AR="$AR_host" + export BUILD_NM="$NM_host" + fi + msg_normal "Ninja turtles GO!\n" + ninja ${makejobs} -C out/$_buildtype electron third_party/electron_node:headers + # finish rest of the build + strip -s out/$_buildtype/electron + ninja ${makejobs} -C out/$_buildtype electron_dist_zip +} + +do_install() { + vmkdir /usr/lib/$pkgname + vmkdir /usr/include/$pkgname + bsdtar -xf out/$_buildtype/dist.zip -C "$DESTDIR/usr/lib/$pkgname" + + chmod u+s "$DESTDIR/usr/lib/$pkgname/chrome-sandbox" + + cp out/$_buildtype/gen/node_headers.tar.gz "$DESTDIR"/usr/include/$pkgname + + vlicense ${wrksrc}/src/LICENSE chromium.LICENSE + vlicense ${wrksrc}/src/electron/LICENSE electron.LICENSE + vlicense ${wrksrc}/src/third_party/electron_node/LICENSE node.LICENSE + + vmkdir /usr/bin + ln -s ../lib/$pkgname/electron "$DESTDIR"/usr/bin/$pkgname +} diff --git a/srcpkgs/electron19/update b/srcpkgs/electron19/update new file mode 100644 index 000000000000..3af8e58b5358 --- /dev/null +++ b/srcpkgs/electron19/update @@ -0,0 +1,2 @@ +site=https://www.electronjs.org/releases/stable?version=${version%%.*} +pattern='tag/v\K[\d\.]+(?=")' From ffe2b2626b58a4c3f5f40ab0bf92ca8a3584976c Mon Sep 17 00:00:00 2001 From: John Date: Sat, 9 Jul 2022 23:12:34 +0200 Subject: [PATCH 03/85] Rocket.Chat-Desktop: update to 3.8.7. --- srcpkgs/Rocket.Chat-Desktop/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template index 065bb05d4a24..70e0bd7a7bc7 100644 --- a/srcpkgs/Rocket.Chat-Desktop/template +++ b/srcpkgs/Rocket.Chat-Desktop/template @@ -1,8 +1,8 @@ # Template file for 'Rocket.Chat-Desktop' pkgname=Rocket.Chat-Desktop -version=3.7.7 +version=3.8.7 revision=1 -_electron_ver=13 +_electron_ver=19 wrksrc="Rocket.Chat.Electron-${version}" hostmakedepends="yarn nodejs python3 pkg-config app-builder" makedepends="electron${_electron_ver} libvips-devel" @@ -12,7 +12,7 @@ maintainer="John " license="MIT" homepage="https://rocket.chat/" distfiles="https://github.com/RocketChat/Rocket.Chat.Electron/archive/${version}.tar.gz" -checksum=13ec93b1d531d5d82ee729e5952933def6457c62edcad0ac2fa869fd014abb48 +checksum=ac46390b4ae9e193efa92d5a38947c99fa94140604302b6850b9167e49eea453 export USE_SYSTEM_APP_BUILDER=true From b4991c67082b4b3aa966421723db33dea1884229 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 10 Jul 2022 00:40:44 -0700 Subject: [PATCH 04/85] kitty: update to 0.25.2. --- srcpkgs/kitty/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template index 7f4507a6f0aa..7ba32f5d3638 100644 --- a/srcpkgs/kitty/template +++ b/srcpkgs/kitty/template @@ -1,6 +1,6 @@ # Template file for 'kitty' pkgname=kitty -version=0.25.0 +version=0.25.2 revision=1 pycompile_dirs="usr/lib/kitty" hostmakedepends="pkg-config python3 wayland-devel wayland-protocols" @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://sw.kovidgoyal.net/kitty/" changelog="https://sw.kovidgoyal.net/kitty/changelog.html" distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz" -checksum=1a2c81bf46687d4141d3182dc984bbc0330791705af152199e5b5815dae933de +checksum=a20a470490fee05bd4bd0ce0964b5b87df1fabe51f05fa076364bbfe2ee4e03c python_version=3 LDFLAGS+=" -Wl,-z,stack-size=2097152" From 22f6123b881da4de8e4226a88ddb82663edafed3 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 10 Jul 2022 01:29:22 -0700 Subject: [PATCH 05/85] gnome-sudoku: update to 42.0. --- srcpkgs/gnome-sudoku/patches/meson-0.61.patch | 38 ------------------- srcpkgs/gnome-sudoku/template | 5 ++- 2 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/gnome-sudoku/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-sudoku/patches/meson-0.61.patch b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch deleted file mode 100644 index 93549d0158d5..000000000000 --- a/srcpkgs/gnome-sudoku/patches/meson-0.61.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7c9935a02b48f332f67bad3e4ee020b75591084a Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Mon, 24 Jan 2022 11:44:06 +0000 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. - -data/meson.build:5:0: ERROR: Function does not take positional arguments. -data/meson.build:24:0: ERROR: Function does not take positional arguments. ---- - data/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index f18f247..9c95e02 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml') - - resources = gnome.compile_resources('gnome-sudoku', resource_files) - --desktop_file = i18n.merge_file('desktop', -+desktop_file = i18n.merge_file( - input: '@0@.desktop.in'.format(application_id), - output: '@0@.desktop'.format(application_id), - install: true, -@@ -21,7 +21,7 @@ if desktop_file_validate.found() - ) - endif - --appdata_file = i18n.merge_file('appdata', -+appdata_file = i18n.merge_file( - input: '@0@.appdata.xml.in'.format(application_id), - output: '@0@.appdata.xml'.format(application_id), - install: true, --- -GitLab - diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template index 6e0af45248ff..52519e0ebb0a 100644 --- a/srcpkgs/gnome-sudoku/template +++ b/srcpkgs/gnome-sudoku/template @@ -1,6 +1,6 @@ # Template file for 'gnome-sudoku' pkgname=gnome-sudoku -version=40.2 +version=42.0 revision=1 build_helper="gir" build_style=meson @@ -10,5 +10,6 @@ short_desc="GNOME Sudoku Japanese logic game" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Sudoku" +changelog="https://gitlab.gnome.org/GNOME/gnome-sudoku/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=36120531e3c7139581ea3800fbfe3c2b31694c440145ecc897ac34e562d754a3 +checksum=1d2eb4ddb8026b443645cf3585b8df1244e3828ee1c07518052b2599e1c5c28f From 008cf4d00cce9b649a3209a78286f38a1785e94a Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 9 Jul 2022 14:37:31 -0700 Subject: [PATCH 06/85] tokei: add unreleased patch for bug https: //github.com/XAMPPRocky/tokei/issues/875 Close: #37954 --- ...c4487ef2a8f53c29124b0aa3e9e793bfaadc.patch | 25 +++++++++++++++++++ srcpkgs/tokei/template | 4 +-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/tokei/patches/067fc4487ef2a8f53c29124b0aa3e9e793bfaadc.patch diff --git a/srcpkgs/tokei/patches/067fc4487ef2a8f53c29124b0aa3e9e793bfaadc.patch b/srcpkgs/tokei/patches/067fc4487ef2a8f53c29124b0aa3e9e793bfaadc.patch new file mode 100644 index 000000000000..46415c14aeba --- /dev/null +++ b/srcpkgs/tokei/patches/067fc4487ef2a8f53c29124b0aa3e9e793bfaadc.patch @@ -0,0 +1,25 @@ +Upstream: yes + +From 067fc4487ef2a8f53c29124b0aa3e9e793bfaadc Mon Sep 17 00:00:00 2001 +From: Max Sharnoff +Date: Mon, 4 Apr 2022 12:06:32 +0100 +Subject: [PATCH] Summarise language before adding to total (#903) + +--- + src/language/languages.rs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/language/languages.rs b/src/language/languages.rs +index 141cae28..2b0fc584 100644 +--- a/src/language/languages.rs ++++ b/src/language/languages.rs +@@ -102,7 +102,8 @@ impl Languages { + #[must_use] + pub fn total(self: &Languages) -> Language { + let mut total = Language::new(); +- for (ty, language) in self { ++ for (ty, l) in self { ++ let language = l.summarise(); + total.comments += language.comments; + total.blanks += language.blanks; + total.code += language.code; diff --git a/srcpkgs/tokei/template b/srcpkgs/tokei/template index 8e5da7ab3923..aec931841af2 100644 --- a/srcpkgs/tokei/template +++ b/srcpkgs/tokei/template @@ -1,14 +1,14 @@ # Template file for 'tokei' pkgname=tokei version=12.1.2 -revision=2 +revision=3 build_style=cargo configure_args="--features all" short_desc="Count lines of code" maintainer="Jan Christian Grünhage " license="Apache-2.0, MIT" homepage="https://github.com/XAMPPRocky/tokei" -distfiles="https://github.com/XAMPPRocky/tokei/archive/v${version}.tar.gz" +distfiles="https://github.com/XAMPPRocky/tokei/archive/v$version.tar.gz" checksum=81ef14ab8eaa70a68249a299f26f26eba22f342fb8e22fca463b08080f436e50 # on i686 LLVM has problems with compiling doctests From 2ff6b9abe81419f2f1cd6f1a368c377457601830 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 10 Jul 2022 01:10:58 -0700 Subject: [PATCH 07/85] gnome-chess: update to 42.0. --- srcpkgs/gnome-chess/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template index 629a10229d9d..3deedebba570 100644 --- a/srcpkgs/gnome-chess/template +++ b/srcpkgs/gnome-chess/template @@ -1,14 +1,14 @@ # Template file for 'gnome-chess' pkgname=gnome-chess -version=41.1 +version=42.0 revision=1 build_style=meson hostmakedepends="gettext pkg-config vala glib-devel itstool librsvg-devel" -makedepends="gtk4-devel librsvg-devel" +makedepends="gtk4-devel libadwaita-devel librsvg-devel" depends="gnuchess" short_desc="GNOME chess user interface" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Chess" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=eb619886596396b4033a3f28a3c2e3004b54ebe1b38b40d6422c17b9f2cc17d0 +checksum=12af5493a62205ac6bb74540f0a858413da8928966a346e854330b41d73bc393 From 880470bf9033309aaa30a9c61bb3b33306773ee1 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 10 Jul 2022 00:59:28 -0700 Subject: [PATCH 08/85] gnome-shell: update to 42.3.1 --- ...-Fix-updating-suggestions-visibility.patch | 37 ------------------- srcpkgs/gnome-shell/template | 8 ++-- 2 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch diff --git a/srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch b/srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch deleted file mode 100644 index b2e4df1052ae..000000000000 --- a/srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch +++ /dev/null @@ -1,37 +0,0 @@ -From aca79c027483f86e85043f403321a8d8016ca007 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Sun, 3 Jul 2022 16:44:39 +0200 -Subject: [PATCH] keyboard: Fix updating suggestions visibility - -Commit 237ba24dbeae added corresponding API to the keyboard actor, -but ended up calling it on the KeyboardManager. - -Add the expected method to KeyboardManager that forwards the request -to the keyboard. - -https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5630 - -Part-of: -(cherry picked from commit eff23a87c36a6a96c9abab09ab27a4bb35ab1b1f) ---- - js/ui/keyboard.js | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js -index 9e5dbffbb1..e13652bdfe 100644 ---- a/js/ui/keyboard.js -+++ b/js/ui/keyboard.js -@@ -1273,6 +1273,10 @@ var KeyboardManager = class KeyBoardManager { - this._keyboard.resetSuggestions(); - } - -+ setSuggestionsVisible(visible) { -+ this._keyboard?.setSuggestionsVisible(visible); -+ } -+ - maybeHandleEvent(event) { - if (!this._keyboard) - return false; --- -GitLab - diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index e0a73c48c1a5..f273156d7138 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,7 +1,7 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=42.3 -revision=2 +version=42.3.1 +revision=1 build_style=meson build_helper=gir configure_args="-Dsystemd=false -Dtests=false" @@ -20,8 +20,8 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz" -checksum=964f520c28d7f412254298676f9cceed6adf81ff489ff1ded69c42987d4c1888 +distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz" +checksum=7dfab32dfac3cd64d4612918ca987cfb33238efa092798753c8845ff16935f7d do_check() { mkdir /tmp/gnome-shell-xdg From 19ce3bd1199051d41b91c64b71ab0935e0acf6e9 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 10 Jul 2022 11:50:07 +0200 Subject: [PATCH 09/85] PolyMC: add qt5-svg dependency closes #37960 --- srcpkgs/PolyMC/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template index 90e20adb26fa..3e02c8c9f0d9 100644 --- a/srcpkgs/PolyMC/template +++ b/srcpkgs/PolyMC/template @@ -1,13 +1,13 @@ # Template file for 'PolyMC' pkgname=PolyMC version=1.3.2 -revision=1 +revision=2 build_style=cmake configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_VERSION_BUILD=${revision}" hostmakedepends="openjdk8 qt5-host-tools qt5-qmake" makedepends="qt5-devel" -depends="virtual?java-runtime qt5-imageformats xrandr" +depends="virtual?java-runtime qt5-svg qt5-imageformats xrandr" short_desc="Custom launcher for Minecraft" maintainer="Philipp David " license="GPL-3.0-only" From 434a1930d75a9566d1517fcf255352699e039b6c Mon Sep 17 00:00:00 2001 From: J Farkas Date: Sat, 9 Jul 2022 17:22:28 +0000 Subject: [PATCH 10/85] polari: allow build with new glib environment --- srcpkgs/polari/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template index eb7c9d2dd3df..53233e83acd3 100644 --- a/srcpkgs/polari/template +++ b/srcpkgs/polari/template @@ -3,7 +3,7 @@ pkgname=polari version=41.0 revision=1 build_style=meson -hostmakedepends="pkg-config itstool gobject-introspection gettext" +hostmakedepends="pkg-config itstool gobject-introspection gettext glib-devel" makedepends="gjs-devel gspell-devel gtk+3-devel libsecret-devel libsoup-gnome-devel telepathy-glib-devel telepathy-logger-devel" depends="gspell telepathy-idle telepathy-logger telepathy-mission-control" From 35c9373bcb1895d14401059e4894ad2b8dcd4bf8 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 24 Jun 2022 18:54:00 +0200 Subject: [PATCH 11/85] qt5-speech: fix version in Qt5TextToSpeechConfig.cmake closes #37815 --- srcpkgs/qt5-speech/files/Qt5TextToSpeechConfig.cmake | 10 +++++----- srcpkgs/qt5-speech/template | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/qt5-speech/files/Qt5TextToSpeechConfig.cmake b/srcpkgs/qt5-speech/files/Qt5TextToSpeechConfig.cmake index 34280b9ee763..2bcb2ee2c7e1 100644 --- a/srcpkgs/qt5-speech/files/Qt5TextToSpeechConfig.cmake +++ b/srcpkgs/qt5-speech/files/Qt5TextToSpeechConfig.cmake @@ -5,7 +5,7 @@ endif() get_filename_component(_qt5TextToSpeech_install_prefix "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE) # For backwards compatibility only. Use Qt5TextToSpeech_VERSION instead. -set(Qt5TextToSpeech_VERSION_STRING 5.15.2) +set(Qt5TextToSpeech_VERSION_STRING 5.15.4) set(Qt5TextToSpeech_LIBRARIES Qt5::TextToSpeech) @@ -53,8 +53,8 @@ if (NOT TARGET Qt5::TextToSpeech) set(_Qt5TextToSpeech_OWN_INCLUDE_DIRS "${_qt5TextToSpeech_install_prefix}/include/qt5/" "${_qt5TextToSpeech_install_prefix}/include/qt5/QtTextToSpeech") set(Qt5TextToSpeech_PRIVATE_INCLUDE_DIRS - "${_qt5TextToSpeech_install_prefix}/include/qt5/QtTextToSpeech/5.15.2" - "${_qt5TextToSpeech_install_prefix}/include/qt5/QtTextToSpeech/5.15.2/QtTextToSpeech" + "${_qt5TextToSpeech_install_prefix}/include/qt5/QtTextToSpeech/5.15.4" + "${_qt5TextToSpeech_install_prefix}/include/qt5/QtTextToSpeech/5.15.4/QtTextToSpeech" ) foreach(_dir ${_Qt5TextToSpeech_OWN_INCLUDE_DIRS}) @@ -97,7 +97,7 @@ if (NOT TARGET Qt5::TextToSpeech) foreach(_module_dep ${_Qt5TextToSpeech_MODULE_DEPENDENCIES}) if (NOT Qt5${_module_dep}_FOUND) find_package(Qt5${_module_dep} - 5.15.2 ${_Qt5TextToSpeech_FIND_VERSION_EXACT} + 5.15.4 ${_Qt5TextToSpeech_FIND_VERSION_EXACT} ${_Qt5TextToSpeech_DEPENDENCIES_FIND_QUIET} ${_Qt5TextToSpeech_FIND_DEPENDENCIES_REQUIRED} PATHS "${CMAKE_CURRENT_LIST_DIR}/.." NO_DEFAULT_PATH @@ -198,7 +198,7 @@ if (NOT TARGET Qt5::TextToSpeech) endif() endif() - _populate_TextToSpeech_target_properties(RELEASE "libQt5TextToSpeech.so.5.15.2" "" FALSE) + _populate_TextToSpeech_target_properties(RELEASE "libQt5TextToSpeech.so.5.15.4" "" FALSE) diff --git a/srcpkgs/qt5-speech/template b/srcpkgs/qt5-speech/template index 5fa7f74de8c3..8d112d82c316 100644 --- a/srcpkgs/qt5-speech/template +++ b/srcpkgs/qt5-speech/template @@ -1,7 +1,7 @@ # Template file for 'qt5-speech' pkgname=qt5-speech version=5.15.4 -revision=1 +revision=2 _commit=c8a1dadc46ccdbeaef45aa805a9dc98d4b3220bd wrksrc="qtspeech-${_commit}" build_style=qmake From 81b2ee1c6ae17b3bf8d78dee4336953d9ae07787 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 10 Jul 2022 01:39:10 -0700 Subject: [PATCH 12/85] lightsoff: update to 40.0.1. --- srcpkgs/lightsoff/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lightsoff/template b/srcpkgs/lightsoff/template index 48a6475a6a67..97cda1f8abb6 100644 --- a/srcpkgs/lightsoff/template +++ b/srcpkgs/lightsoff/template @@ -1,6 +1,6 @@ # Template file for 'lightsoff' pkgname=lightsoff -version=3.38.0 +version=40.0.1 revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config vala" @@ -9,5 +9,6 @@ short_desc="GNOME puzzlle game where you turn off lights" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Lightsoff" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d0b6ebd7172e5a948e49d6b5813aaa1473fd664f2c39043cb861fab011b7f636 +changelog="https://gitlab.gnome.org/GNOME/lightsoff/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz" +checksum=acd38d4706f11c6cbb18a1afae77637afbf481d02e0eebfe407595f088f1f1ab From e8accb6193e95dfe07ffed147419d6fac3a829ef Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 9 Jul 2022 14:47:44 +0300 Subject: [PATCH 13/85] opera: update to 89.0.4447.38. --- srcpkgs/opera/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index c01a1bc005a7..94daaf576bb4 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=88.0.4412.53 +version=89.0.4447.38 revision=1 archs="x86_64" create_wrksrc=yes @@ -11,7 +11,7 @@ maintainer="mobinmob " license="custom:Proprietary" homepage="https://www.opera.com/computer" distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm" -checksum=de19fbbb16f00c53867e62058f0b34b046157f5277f687dc3345b20f160a9e43 +checksum=959e34218ebae056f439c3c62c71ed722568c7e979545d27a08271cfbf45f88b repository="nonfree" nostrip=yes From 4907c13bd8e46c015188171762d06c94dc819623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Sun, 10 Jul 2022 16:43:25 +0200 Subject: [PATCH 14/85] bombadillo: fix update-check pattern --- srcpkgs/bombadillo/update | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 srcpkgs/bombadillo/update diff --git a/srcpkgs/bombadillo/update b/srcpkgs/bombadillo/update new file mode 100644 index 000000000000..28643b80bad4 --- /dev/null +++ b/srcpkgs/bombadillo/update @@ -0,0 +1,2 @@ +site="https://tildegit.org/sloum/bombadillo/releases" +pattern='/archive/?\K[\d\.Q]+(?=\.tar\.gz")' From 8cb28550fe93d11fa33d06f5a9f58c41d163666a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 10 Jul 2022 21:12:30 +0200 Subject: [PATCH 15/85] scite: update to 5.2.4. --- srcpkgs/scite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template index 0d5851a23d70..226cf45d84ac 100644 --- a/srcpkgs/scite/template +++ b/srcpkgs/scite/template @@ -1,6 +1,6 @@ # Template file for 'scite' pkgname=scite -version=5.2.3 +version=5.2.4 revision=1 create_wrksrc=yes hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://www.scintilla.org/SciTEDownload.html" distfiles="https://www.scintilla.org/scite${version//./}.tgz" -checksum=e0dbc30cfe5a3c255b5b00b9491796561de68eea36203811acabbcb7127aa6ae +checksum=d546165b06f01aa06bb3735484c392856e1defebf29f14160dfd7f8a2000d930 post_extract() { sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile From cdf237319e685244dd37cf860d77ea3f1f67c886 Mon Sep 17 00:00:00 2001 From: Zach Dykstra Date: Wed, 6 Jul 2022 11:20:55 -0500 Subject: [PATCH 16/85] perl-Alien-Build: update to 2.50. --- srcpkgs/perl-Alien-Build/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Alien-Build/template b/srcpkgs/perl-Alien-Build/template index 362dbbff873b..3281d9e38756 100644 --- a/srcpkgs/perl-Alien-Build/template +++ b/srcpkgs/perl-Alien-Build/template @@ -1,6 +1,6 @@ # Template file for 'perl-Alien-Build' pkgname=perl-Alien-Build -version=2.48 +version=2.50 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="Zach Dykstra " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/pod/Alien::Build" distfiles="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-${version}.tar.gz" -checksum=3b26e4794f83c681f3eff8f9d052ba74262c1ca5bad30477a41e66ba64391696 +checksum=4ed2e175ba2d46d77fc8bb3b726a583cd3b28dc5c2885c375cfa2bf2a7c17347 From 99451135fdf4ac60792db5740d559192fbdaaa7c Mon Sep 17 00:00:00 2001 From: Zach Dykstra Date: Wed, 6 Jul 2022 11:19:29 -0500 Subject: [PATCH 17/85] perl-Test-MockModule: update to 0.177.0. --- srcpkgs/perl-Test-MockModule/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Test-MockModule/template b/srcpkgs/perl-Test-MockModule/template index 0b306844aab0..6f4421b95b5b 100644 --- a/srcpkgs/perl-Test-MockModule/template +++ b/srcpkgs/perl-Test-MockModule/template @@ -1,6 +1,6 @@ # Template file for 'perl-Test-MockModule' pkgname=perl-Test-MockModule -version=0.176.0 +version=0.177.0 revision=1 wrksrc="${pkgname/perl-/}-v${version}" build_style=perl-ModuleBuild @@ -13,4 +13,4 @@ maintainer="Zach Dykstra " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Test-MockModule" distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-v${version}.tar.gz" -checksum=b71e16657c71b682f045e04d115bd532b85d7a96091e7319a1a85447ff97326e +checksum=1bda7a49dcea76076d40a7b6a6c3f3e15e6b19c84b6171df44534d91138f1045 From cd16d810ebb30cf7cc8d69c4dc796ba94dc80284 Mon Sep 17 00:00:00 2001 From: Zach Dykstra Date: Wed, 6 Jul 2022 11:15:15 -0500 Subject: [PATCH 18/85] perl-YAML-PP: update to 0.034. --- srcpkgs/perl-YAML-PP/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-YAML-PP/template b/srcpkgs/perl-YAML-PP/template index 353d6aa67d08..fcc6e1f15f18 100644 --- a/srcpkgs/perl-YAML-PP/template +++ b/srcpkgs/perl-YAML-PP/template @@ -1,6 +1,6 @@ # Template file for 'perl-YAML-PP' pkgname=perl-YAML-PP -version=0.032 +version=0.034 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -12,4 +12,4 @@ maintainer="Zach Dykstra " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/YAML-PP" distfiles="${CPAN_SITE}/YAML/YAML-PP-${version}.tar.gz" -checksum=27dd0b1e39cef3d12bb5a07b2841c558484a9a430c49d3c6f9ae2e6065abda90 +checksum=6af37ff0757ee962cbda32184177b5282a772adfb126461f744659058dd1eab3 From 17fa7cc93b459458fa68ab3d182fba2a0839d805 Mon Sep 17 00:00:00 2001 From: Ishaan Bhimwal Date: Tue, 5 Jul 2022 20:21:58 +0530 Subject: [PATCH 19/85] Solaar: update to 1.1.4 --- srcpkgs/Solaar/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/Solaar/template b/srcpkgs/Solaar/template index 9377d7a11fa6..88c52a0d8f62 100644 --- a/srcpkgs/Solaar/template +++ b/srcpkgs/Solaar/template @@ -1,15 +1,16 @@ # Template file for 'Solaar' pkgname=Solaar -version=1.0.7 +version=1.1.4 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-pyudev python3-psutil python3-yaml python3-xlib" +depends="python3-evdev python3-pyudev python3-psutil python3-yaml python3-xlib" short_desc="Linux device manager for a wide range of Logitech devices" maintainer="Young Jin Park " license="GPL-3.0-or-later" homepage="https://pwr-solaar.github.io/Solaar/" +changelog="https://raw.githubusercontent.com/pwr-Solaar/Solaar/master/ChangeLog.md" distfiles="https://github.com/pwr-Solaar/Solaar/archive/${version}.tar.gz" -checksum=39c025b4186b6cb4620bc52d1d20e2d841082982c8be0fed155398faee7a9cd1 +checksum=4a6745d1a7cd78873980ce39fec8e44ecb3e5447875335a0237e1fa755217984 # Package provides no tests make_check=no From b2aea0c2d6fe39b11ca09b17440290768763cec0 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 10 Jul 2022 22:24:22 +0200 Subject: [PATCH 20/85] telegram-desktop: update to 4.0.2. --- srcpkgs/telegram-desktop/patches/cross.patch | 19 ------------------- srcpkgs/telegram-desktop/template | 4 ++-- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 srcpkgs/telegram-desktop/patches/cross.patch diff --git a/srcpkgs/telegram-desktop/patches/cross.patch b/srcpkgs/telegram-desktop/patches/cross.patch deleted file mode 100644 index e1fef852c391..000000000000 --- a/srcpkgs/telegram-desktop/patches/cross.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/cmake/external/kwayland/CMakeLists.txt 2022-04-19 14:57:00.000000000 +0200 -+++ - 2022-04-26 18:18:21.919838146 +0200 -@@ -32,6 +32,8 @@ - -DCMAKE_INSTALL_PREFIX= - -DCMAKE_INSTALL_DATADIR=share - -DBUILD_TESTING=OFF -+ -DQT_HOST_PATH=/usr -+ -DQtWaylandScanner_EXECUTABLE=/usr/lib/qt6/libexec/qtwaylandscanner - BUILD_COMMAND ${CMAKE_COMMAND} --build - COMMAND ${CMAKE_COMMAND} --install - STEP_TARGETS build -@@ -83,6 +82,7 @@ - -DCMAKE_PREFIX_PATH=${CMAKE_CURRENT_BINARY_DIR} - -DECM_DIR=${extra_cmake_modules_binary_dir}/share/ECM/cmake - -DPlasmaWaylandProtocols_DIR=${plasma_wayland_protocols_binary_dir}/lib/cmake/PlasmaWaylandProtocols -+ -D_qtpaths_executable=/usr/lib/qt6/bin/qtpaths - STEP_TARGETS build - EXCLUDE_FROM_ALL TRUE - BUILD_BYPRODUCTS /lib/libKF5WaylandClient.a diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 0199fe9ddceb..f791061e47d5 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,6 +1,6 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop -version=3.7.3 +version=4.0.2 revision=1 wrksrc="tdesktop-${version}-full" build_style=cmake @@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL" homepage="https://desktop.telegram.org/" changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt" distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz" -checksum=9735f30610ff62b01cbdb0b945d32c494cec245961023c9860d9dd5268b9fe1e +checksum=44659a7b2db3eff2e5c42e372dac14d1b03ffae19e005007ce580719615b59b1 build_options="spellcheck" build_options_default="spellcheck" From 4d6a6dd659e25fdaf2084fa8822f3f4112ec7fb4 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 10 Jul 2022 22:24:26 +0200 Subject: [PATCH 21/85] tg_owt: update to 0.0.0.20220508. --- srcpkgs/tg_owt/template | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template index 3022048a7e76..1b81a7475ac0 100644 --- a/srcpkgs/tg_owt/template +++ b/srcpkgs/tg_owt/template @@ -1,9 +1,10 @@ # Template file for 'tg_owt' pkgname=tg_owt -version=0.0.0.20220413 +version=0.0.0.20220508 revision=1 -_commit=63a934db1ed212ebf8aaaa20f0010dd7b0d7b396 +_commit=10d5f4bf77333ef6b43516f90d2ce13273255f41 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452 +_crc32c_commit=21fc8ef30415a635e7351ffa0e5d5367943d4a94 wrksrc="tg_owt-$_commit" build_style=cmake configure_args="-DBUILD_SHARED_LIBS=OFF -DTG_OWT_ARCH_ARMV7_USE_NEON=OFF" @@ -19,10 +20,12 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://github.com/desktop-app/tg_owt" distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz - https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz" -checksum="@677f3dff8619e8e9e38ece55579ad10a5e162145644ec9afa11ac45dcd96904e - @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3" -skip_extraction="${_libyuv_commit}.tar.gz" + https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz + https://github.com/google/crc32c/archive/${_crc32c_commit}.tar.gz" +checksum="@b8a4b1a9e4f8936c02b4a31c19d6282a914df976b9cbdfadb3ae40ca1a185ac6 + @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3 + @b359ed4f5fd0321d807fd7301e66399c311c1fe6ab4c6a0f5538587d97ba4a8d" +skip_extraction="${_libyuv_commit}.tar.gz ${_crc32c_commit}" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" @@ -34,4 +37,5 @@ fi post_extract() { bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_libyuv_commit}.tar.gz -C ${wrksrc}/src/third_party/libyuv + bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_crc32c_commit}.tar.gz --strip-components 1 -C ${wrksrc}/src/third_party/crc32c/src } From 87ee019663f1b93aeba2b9a53b80965f67530434 Mon Sep 17 00:00:00 2001 From: lemmi Date: Wed, 6 Jul 2022 20:17:54 +0200 Subject: [PATCH 22/85] gerbera: runit fixes --- srcpkgs/gerbera/files/gerbera/log/run | 1 + srcpkgs/gerbera/files/gerbera/run | 9 ++++++++- srcpkgs/gerbera/template | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/gerbera/files/gerbera/log/run diff --git a/srcpkgs/gerbera/files/gerbera/log/run b/srcpkgs/gerbera/files/gerbera/log/run new file mode 120000 index 000000000000..3a5b4a586051 --- /dev/null +++ b/srcpkgs/gerbera/files/gerbera/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/gerbera/files/gerbera/run b/srcpkgs/gerbera/files/gerbera/run index 925a4d7fde23..cab802769fe9 100755 --- a/srcpkgs/gerbera/files/gerbera/run +++ b/srcpkgs/gerbera/files/gerbera/run @@ -1,2 +1,9 @@ #!/bin/sh -chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera + +if [ ! -d /var/lib/gerbera/.config ]; then + mkdir -p /var/lib/gerbera/.config/gerbera + chown -R gerbera:gerbera /var/lib/gerbera + chpst -u gerbera sh -c 'HOME=/var/lib/gerbera gerbera --create-config > /var/lib/gerbera/.config/gerbera/config.xml' +fi + +exec chpst -u gerbera:gerbera gerbera --home /var/lib/gerbera diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template index 7b4f1a5f1f3d..35136708b3e5 100644 --- a/srcpkgs/gerbera/template +++ b/srcpkgs/gerbera/template @@ -1,7 +1,7 @@ # Template file for 'gerbera' pkgname=gerbera version=1.11.0 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1" hostmakedepends="pkg-config" From def75680ca0f16dc42b0f1863f0900599113519a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 28 Feb 2021 21:26:00 +0100 Subject: [PATCH 23/85] New package: megapixels-1.4.3 Closes: #29129 [via git-merge-pr] --- srcpkgs/megapixels/template | 13 +++++++++++++ srcpkgs/megapixels/update | 1 + 2 files changed, 14 insertions(+) create mode 100644 srcpkgs/megapixels/template create mode 100644 srcpkgs/megapixels/update diff --git a/srcpkgs/megapixels/template b/srcpkgs/megapixels/template new file mode 100644 index 000000000000..867f3c825eef --- /dev/null +++ b/srcpkgs/megapixels/template @@ -0,0 +1,13 @@ +# Template file for 'megapixels' +pkgname=megapixels +version=1.4.3 +revision=1 +build_style=meson +hostmakedepends="pkg-config glib-devel" +makedepends="gtk4-devel libzbar-devel" +short_desc="GTK4 camera app for ARM devices" +maintainer="Jan Christian Grünhage " +license="GPL-3.0-or-later" +homepage="https://gitlab.com/postmarketOS/megapixels" +distfiles="${homepage}/-/archive/${version}/megapixels-${version}.tar.gz" +checksum=8976fa727fa5650499fe1ae923a93d56fedd62e02d92def24d4bf4b0d25a902f diff --git a/srcpkgs/megapixels/update b/srcpkgs/megapixels/update new file mode 100644 index 000000000000..3172862eef09 --- /dev/null +++ b/srcpkgs/megapixels/update @@ -0,0 +1 @@ +site="https://gitlab.com/postmarketOS/megapixels/-/tags" From e0b28ee09e2b135a3859385d9a0a6c6fb0d0e807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Sat, 9 Jul 2022 22:36:36 +0200 Subject: [PATCH 24/85] croc: update to 9.6.0. --- srcpkgs/croc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template index 2a0795951d15..558d180274e2 100644 --- a/srcpkgs/croc/template +++ b/srcpkgs/croc/template @@ -1,6 +1,6 @@ # Template file for 'croc' pkgname=croc -version=9.5.6 +version=9.6.0 revision=1 build_style=go go_import_path=github.com/schollz/croc/v${version%%.*} @@ -9,7 +9,7 @@ maintainer="Benjamín Albiñana " license="MIT" homepage="https://github.com/schollz/croc" distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz" -checksum=c03c7b9daf2ba841d373d9c43abb68dc27ab1d7e01bbadead771918d499dea9e +checksum=15fccb905872ae160c626ef7e47a92a8d78915b738d097865f177dfec925480b post_install() { vlicense LICENSE From f708a90882b8a72492096fd266a43379c298dde6 Mon Sep 17 00:00:00 2001 From: Ishaan Bhimwal Date: Sun, 10 Jul 2022 04:06:31 +0530 Subject: [PATCH 25/85] ristretto: update to 0.12.3 --- srcpkgs/ristretto/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ristretto/template b/srcpkgs/ristretto/template index 80395b0e265d..cd6094d5c4ed 100644 --- a/srcpkgs/ristretto/template +++ b/srcpkgs/ristretto/template @@ -1,6 +1,6 @@ # Template file for 'ristretto' pkgname=ristretto -version=0.12.2 +version=0.12.3 revision=1 build_style=gnu-configure configure_args="--with-locales-dir=/usr/share/locale" @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://docs.xfce.org/apps/ristretto/start" changelog="https://gitlab.xfce.org/apps/ristretto/-/raw/master/NEWS" distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=0eee869922ec00a253dafa446c2aad2a2f98e07e1db7262e8337ce9ec2dad969 +checksum=868f7021225fa170a2f4716c1d7823bf25ad7aab237687755855799588cd3f3e From 3dd253ed422f6eabb56daea8b41077edf912cd64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 11 Jul 2022 10:20:51 +0700 Subject: [PATCH 26/85] python: update checksum Only change was vendor expat, which we won't use anyway: M cpython-2.7.18.5/Modules/expat/ascii.h M cpython-2.7.18.5/Modules/expat/asciitab.h M cpython-2.7.18.5/Modules/expat/expat.h M cpython-2.7.18.5/Modules/expat/expat_external.h M cpython-2.7.18.5/Modules/expat/iasciitab.h M cpython-2.7.18.5/Modules/expat/internal.h M cpython-2.7.18.5/Modules/expat/latin1tab.h M cpython-2.7.18.5/Modules/expat/nametab.h M cpython-2.7.18.5/Modules/expat/pyexpatns.h M cpython-2.7.18.5/Modules/expat/siphash.h M cpython-2.7.18.5/Modules/expat/utf8tab.h M cpython-2.7.18.5/Modules/expat/winconfig.h M cpython-2.7.18.5/Modules/expat/xmlparse.c M cpython-2.7.18.5/Modules/expat/xmlrole.c M cpython-2.7.18.5/Modules/expat/xmlrole.h M cpython-2.7.18.5/Modules/expat/xmltok.c M cpython-2.7.18.5/Modules/expat/xmltok.h M cpython-2.7.18.5/Modules/expat/xmltok_impl.c M cpython-2.7.18.5/Modules/expat/xmltok_impl.h M cpython-2.7.18.5/Modules/expat/xmltok_ns.c --- srcpkgs/python/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python/template b/srcpkgs/python/template index bae1327ad821..c5f5e4cf2304 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -16,7 +16,7 @@ maintainer="Leah Neukirchen " license="Python-2.0" homepage="https://www.python.org" distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz" -checksum=a046ddfd75f439ec2e65af840caa267d1edb4d914d7777d2fbd2f88041c6f3a2 +checksum=e5e80ae00e20994150f2acfe4acfc541cbe6e4e77d334e1e7f9f33f303ab89ba alternatives=" python:idle:/usr/bin/idle2.7 From 77297cd0344fa08c9e8a725184e2ee828b9c084b Mon Sep 17 00:00:00 2001 From: Ishaan Bhimwal Date: Mon, 11 Jul 2022 03:48:22 +0530 Subject: [PATCH 27/85] papirus-icon-theme: update to 20220710 --- srcpkgs/papirus-icon-theme/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template index ea263424dc46..a839f9da67fa 100644 --- a/srcpkgs/papirus-icon-theme/template +++ b/srcpkgs/papirus-icon-theme/template @@ -1,13 +1,13 @@ # Template file for 'papirus-icon-theme' pkgname=papirus-icon-theme -version=20220606 +version=20220710 revision=1 short_desc="SVG icon theme for Linux, based on Paper Icon Set" maintainer="Giuseppe Fierro " license="GPL-3.0-or-later" homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme" distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz" -checksum=139d18bada63d72779f2b604dbe893987d74000de728165ef1cb8baa4624b9c6 +checksum=9aa81b51b73bfafeae7dbf7ef411db7c74fcff983e4b13c0e05e481dc65971b2 do_install() { vmkdir usr/share/icons From f92833e8c7ba8041390b8278210b6f7ba2e53f70 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Thu, 5 May 2022 21:58:04 +0200 Subject: [PATCH 28/85] vscode: update to 1.69.0 take care of new tracking server --- srcpkgs/vscode/patches/fix_dir.patch | 10 +++++----- srcpkgs/vscode/patches/product.patch | 6 +++--- srcpkgs/vscode/patches/ripgrep.patch | 6 +++--- srcpkgs/vscode/template | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/srcpkgs/vscode/patches/fix_dir.patch b/srcpkgs/vscode/patches/fix_dir.patch index da193e702524..62cef243e66e 100644 --- a/srcpkgs/vscode/patches/fix_dir.patch +++ b/srcpkgs/vscode/patches/fix_dir.patch @@ -1,13 +1,13 @@ diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh -index 06973937f14..78f72c9e9ed 100755 +index 5fe68cb4f3e..2f7eba7b9a3 100755 --- a/resources/linux/bin/code.sh +++ b/resources/linux/bin/code.sh -@@ -44,7 +44,7 @@ else +@@ -53,7 +53,7 @@ else VSCODE_PATH="$(dirname "$(readlink -f "$0")")/.." else # else use the standard install location -- VSCODE_PATH="/usr/share/@@NAME@@" -+ VSCODE_PATH="/usr/lib/@@NAME@@" +- VSCODE_PATH="/usr/share/@@APPNAME@@" ++ VSCODE_PATH="/usr/lib/@@APPNAME@@" fi fi @@ -25,7 +25,7 @@ index 7106e0e0969..faaff89d71c 100644 Type=Application NoDisplay=true diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop -index ab3b79a011b..cdc88ef68a4 100755 +index 72488b67700..c16e815d59f 100755 --- a/resources/linux/code.desktop +++ b/resources/linux/code.desktop @@ -2,7 +2,7 @@ diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index 624ca63afcbe..8ed252e575e7 100644 --- a/srcpkgs/vscode/patches/product.patch +++ b/srcpkgs/vscode/patches/product.patch @@ -1,5 +1,5 @@ diff --git a/product.json b/product.json -index df18127dcc67..d3006752bd98 100644 +index a50c00f6cf3..8dd13191377 100644 --- a/product.json +++ b/product.json @@ -27,7 +27,15 @@ @@ -9,7 +9,7 @@ index df18127dcc67..d3006752bd98 100644 + "quality": "stable", + "documentationUrl": "https://github.com/microsoft/vscode-docs", + "requestFeatureUrl": "https://github.com/Microsoft/vscode/issues", - "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/", + "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/3c8520fab514b9f56070214496b26ff68d1b1cb5/out/vs/workbench/contrib/webview/browser/pre/", + "extensionsGallery": { + "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", + "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", @@ -17,4 +17,4 @@ index df18127dcc67..d3006752bd98 100644 + }, "builtInExtensions": [ { - "name": "ms-vscode.references-view", + "name": "ms-vscode.js-debug-companion", diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch index 3fdc568a9e54..f87bc5eaab5a 100644 --- a/srcpkgs/vscode/patches/ripgrep.patch +++ b/srcpkgs/vscode/patches/ripgrep.patch @@ -5,7 +5,7 @@ during build, which unbreaks build on platforms where MS deos not ship a prebuilt ripgrep. diff --git a/package.json b/package.json -index de2cf9e04a9b..1995e3bb9a7e 100644 +index 39c3e9f5b10..198dbf3e421 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ @@ -14,11 +14,11 @@ index de2cf9e04a9b..1995e3bb9a7e 100644 "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/ripgrep": "^1.14.2", + "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git", - "@vscode/sqlite3": "5.0.7", + "@vscode/sqlite3": "5.0.8", "@vscode/sudo-prompt": "9.3.1", "@vscode/vscode-languagedetection": "1.0.21", diff --git a/remote/package.json b/remote/package.json -index c7fc7a2e931f..8842b784df2c 100644 +index 936aa5f5bab..152ba516795 100644 --- a/remote/package.json +++ b/remote/package.json @@ -6,7 +6,7 @@ diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 6d3b3d72d00c..9f11f7989152 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,18 +1,18 @@ # Template file for 'vscode' pkgname=vscode -version=1.66.2 +version=1.69.0 revision=1 -_electronver=13.6.7 +_electronver=19.0.8 _npmver=8.6.0 hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep" -makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13" -depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13" +makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron19" +depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron19" short_desc="Microsoft Code for Linux" maintainer="shizonic , Alex Lohr " license="MIT" homepage="https://code.visualstudio.com/" -distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz" -checksum=1b70f202b570763e85f67abd8693eeb9c88c6a066a4b579aca5c0c42ecb1b47f +distfiles="https://github.com/microsoft/vscode/archive/refs/tags/${version}.tar.gz" +checksum=982af5d93198b5437c3c211276c7b5fd7e3ecf19359c9605df2d6feddee93151 nocross=yes # x64 build does not cut it, it contains native code if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then @@ -29,7 +29,7 @@ do_configure() { # redirect telemetry urls to 0.0.0.0 # src: vscodium/undo_telemetry.sh - _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)" + _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)|(mobile\.events\.data\.microsoft\.com)" _REPLACEMENT="s/$_TELEMETRY_URLS/0\.0\.0\.0/g" grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT From 811092c77c84182705b8e19a3981df1601ed1636 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Mon, 11 Jul 2022 00:24:58 -0400 Subject: [PATCH 29/85] tio: update to 1.43. --- srcpkgs/tio/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tio/template b/srcpkgs/tio/template index 8b6cd9669585..4d3f61a6a0f9 100644 --- a/srcpkgs/tio/template +++ b/srcpkgs/tio/template @@ -1,6 +1,6 @@ # Template file for 'tio' pkgname=tio -version=1.40 +version=1.43 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -9,9 +9,9 @@ short_desc="Simple serial device I/O tool" maintainer="0x5c " license="GPL-2.0-or-later" homepage="https://github.com/tio/tio" -changelog="https://github.com/tio/tio/raw/master/ChangeLog" +changelog="https://github.com/tio/tio/raw/master/NEWS" distfiles="https://github.com/tio/tio/archive/refs/tags/v${version}.tar.gz" -checksum=1fe3631b9236155818cdb9bac28435499a3701a97b193c5165275952c9f56da5 +checksum=6678c61c5f713c9c9022cada559e40f4c0c4af1c89db1cb25af4ef328d9f36cf post_install() { vcompletion "build/src/bash-completion/tio" bash tio From 4276884a15fa8ee396e489f66a8abba4663fb8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Sun, 10 Jul 2022 00:23:48 +0200 Subject: [PATCH 30/85] mpd: update to 0.23.8. --- srcpkgs/mpd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index bf6aa8c73770..98195b80a38d 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd -version=0.23.7 -revision=3 +version=0.23.8 +revision=1 build_style=meson configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled @@ -39,7 +39,7 @@ license="GPL-2.0-or-later" homepage="https://www.musicpd.org/" changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS" distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz" -checksum=960dcbac717c388f5dcc4fd945e3af19a476f2b15f367e9653d4c7a948768211 +checksum=86bb569bf3b519821f36f6bb5564e484e85d2564411b34b200fe2cd3a04e78cf LDFLAGS="-Wl,-z,stack-size=1048576" system_accounts="mpd" From 4c53754bba98365d19700e0d95a72a6fccee5c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Sun, 10 Jul 2022 00:14:32 +0200 Subject: [PATCH 31/85] dasel: update to 1.26.0. --- srcpkgs/dasel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template index c6e2e67cce19..7e1108177775 100644 --- a/srcpkgs/dasel/template +++ b/srcpkgs/dasel/template @@ -1,6 +1,6 @@ # Template file for 'dasel' pkgname=dasel -version=1.25.0 +version=1.26.0 revision=1 build_style=go go_import_path=github.com/tomwright/dasel @@ -12,7 +12,7 @@ license="MIT" homepage="https://daseldocs.tomwright.me/" changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md" distfiles="https://github.com/TomWright/dasel/archive/v${version}.tar.gz" -checksum=49f7a34b31c87d27ef5c5a32b87a603ac6d7d4d1a52533942676429b747e1f7e +checksum=3c28ffd0ce63884835ce10392591624014c4d0af4444d9230a9027385559f898 post_install() { vlicense LICENSE From 9824b01bd897365d2522ecff8c25126c48d2912c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Tue, 5 Jul 2022 22:30:48 +0200 Subject: [PATCH 32/85] kopia: update to 0.11.2. --- srcpkgs/kopia/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template index 8bd4f08fc359..9002539c3181 100644 --- a/srcpkgs/kopia/template +++ b/srcpkgs/kopia/template @@ -1,6 +1,6 @@ # Template file for 'kopia' pkgname=kopia -version=0.10.7 +version=0.11.2 revision=1 build_style=go build_helper=qemu @@ -12,7 +12,7 @@ maintainer="Daniel Eyßer " license="Apache-2.0" homepage="https://kopia.io/" distfiles="https://github.com/kopia/kopia/archive/v${version}.tar.gz" -checksum=d797330d39c099c10e8d7bdb4654b254790ea180543971214e8aeec31ad66da4 +checksum=bc30f6fe2637be4a7f0628e6a6c9d593dc0e93b364348b7781705600310ed98d post_install() { for shell in bash zsh; do From 81d4b32a12fa28cd9cae5405827feeb524862a8e Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sat, 9 Jul 2022 22:33:02 +0530 Subject: [PATCH 33/85] libzip: update to 1.9.2, adopt --- srcpkgs/libzip/template | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template index 582bda07a977..7642a4f475d0 100644 --- a/srcpkgs/libzip/template +++ b/srcpkgs/libzip/template @@ -1,22 +1,17 @@ # Template file for 'libzip' pkgname=libzip -version=1.8.0 +version=1.9.2 revision=1 build_style=cmake hostmakedepends="perl groff pkg-config" makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel libzstd-devel" short_desc="C library for reading, creating, and modifying zip archives" -maintainer="Orphaned " +maintainer="Subhaditya Nath " license="BSD-3-Clause" homepage="https://libzip.org/" changelog="https://raw.githubusercontent.com/nih-at/libzip/master/NEWS.md" distfiles="https://libzip.org/download/libzip-${version}.tar.gz" -checksum=30ee55868c0a698d3c600492f2bea4eb62c53849bcf696d21af5eb65f3f3839e - -post_patch() { - vsed -i lib/zip_crypto_openssl.c \ - -e '/^#include /a #include ' -} +checksum=fd6a7f745de3d69cf5603edc9cb33d2890f0198e415255d0987a0cf10d824c6f post_install() { vlicense LICENSE From 8d36bfc8fc3b0c775fc3b7071ccd0995253b9f21 Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Sat, 9 Jul 2022 15:43:30 -0700 Subject: [PATCH 34/85] aircrack-ng: update to 1.7. Signed-off-by: Joseph Benden --- srcpkgs/aircrack-ng/patches/evalrev.patch | 13 ++++++ srcpkgs/aircrack-ng/patches/python.patch | 49 +++++++++++++++++++++++ srcpkgs/aircrack-ng/patches/sqlite3.patch | 25 ++++++++++++ srcpkgs/aircrack-ng/template | 31 +++++++------- 4 files changed, 103 insertions(+), 15 deletions(-) create mode 100644 srcpkgs/aircrack-ng/patches/evalrev.patch create mode 100644 srcpkgs/aircrack-ng/patches/python.patch create mode 100644 srcpkgs/aircrack-ng/patches/sqlite3.patch diff --git a/srcpkgs/aircrack-ng/patches/evalrev.patch b/srcpkgs/aircrack-ng/patches/evalrev.patch new file mode 100644 index 000000000000..fd66c0dcf1f8 --- /dev/null +++ b/srcpkgs/aircrack-ng/patches/evalrev.patch @@ -0,0 +1,13 @@ +diff --git a/evalrev b/evalrev +index 19b38d6b..afb4157e 100755 +--- a/evalrev ++++ b/evalrev +@@ -49,7 +49,7 @@ elif test -d "${DIR}/.svn"; then + SCM="_r1" + fi + else +- REVISION="$(cat ${DIR}/AC_VERSION)" ++ REVISION="$(cat ${DIR}/AC_VERSION 2>/dev/null)" + fi + + if test "x$CMD" = "xscm"; then diff --git a/srcpkgs/aircrack-ng/patches/python.patch b/srcpkgs/aircrack-ng/patches/python.patch new file mode 100644 index 000000000000..29f41f59124c --- /dev/null +++ b/srcpkgs/aircrack-ng/patches/python.patch @@ -0,0 +1,49 @@ +diff --git a/build/m4/aircrack_ng_ext_scripts.m4 b/build/m4/aircrack_ng_ext_scripts.m4 +index db464944..4d0e9b62 100644 +--- a/build/m4/aircrack_ng_ext_scripts.m4 ++++ b/build/m4/aircrack_ng_ext_scripts.m4 +@@ -39,20 +39,14 @@ dnl program, then also delete it here. + + AC_DEFUN([AIRCRACK_NG_EXT_SCRIPTS], [ + +-if test "$cross_compiling" = no; +-then +- AC_CHECK_PROGS([PYTHON], [python python3 python2]) +- if test $PYTHON = no; then +- AC_MSG_FAILURE(failed to find Python) +- fi +- +- if test "x$PYTHON" != "x"; then +- pc_cv_python_site_dir=`$PYTHON -c 'import site; print(site.getsitepackages()[[-1]])'` +- dnl AC_SUBST([pythondir], [\${prefix}/$pc_cv_python_site_dir]) +- AC_SUBST([pythondir], [$pc_cv_python_site_dir]) +- AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE_NAME]) +- fi +-fi ++AC_CHECK_PROGS([PYTHON], [python python3 python2]) ++AS_IF([test x"$PYTHON" = x], [ ++ AC_MSG_RESULT(failed to find Python) ++], [ ++ pc_cv_python_site_dir=`$PYTHON -c 'import site; print(site.getsitepackages()[[-1]])'` ++ AC_SUBST([pythondir], [$pc_cv_python_site_dir]) ++ AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE_NAME]) ++]) + + AC_CHECK_PROGS([READLINK], [greadlink readlink]) + +@@ -62,12 +56,11 @@ AC_ARG_WITH(ext-scripts, + case "$with_ext_scripts" in + yes) + AC_MSG_CHECKING([for Python requirement for ext-scripts]) +- if test "x$PYTHON" = x ; then ++ AS_IF([test "x$PYTHON" = x], [ + AC_MSG_FAILURE([not found]) +- else ++ ], [ + AC_MSG_RESULT([found; $PYTHON]) +- fi +- ++ ]) + EXT_SCRIPTS=yes + ;; + *) diff --git a/srcpkgs/aircrack-ng/patches/sqlite3.patch b/srcpkgs/aircrack-ng/patches/sqlite3.patch new file mode 100644 index 000000000000..ff59c4287bd9 --- /dev/null +++ b/srcpkgs/aircrack-ng/patches/sqlite3.patch @@ -0,0 +1,25 @@ +diff --git a/build/m4/ax_lib_sqlite3.m4 b/build/m4/ax_lib_sqlite3.m4 +index 5d5c3a8d..fcb1f3c1 100644 +--- a/build/m4/ax_lib_sqlite3.m4 ++++ b/build/m4/ax_lib_sqlite3.m4 +@@ -88,7 +88,7 @@ AC_DEFUN([AX_LIB_SQLITE3], + ac_sqlite3_cppflags="-I$ac_sqlite3_path/include" + AC_MSG_RESULT([explicitly set; $ac_sqlite3_path]) + else +- for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do ++ for ac_sqlite3_path_tmp in /usr /usr/local /opt $lt_sysroot ; do + if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \ + && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then + ac_sqlite3_path=$ac_sqlite3_path_tmp +@@ -159,9 +159,9 @@ AC_DEFUN([AX_LIB_SQLITE3], + dnl Retrieve SQLite release version + if test "x$ac_sqlite3_header_path" != "x"; then + ac_sqlite3_version=`cat $ac_sqlite3_header_path \ +- | grep '#define.*SQLITE_VERSION.*\"' | sed -e 's/.* "//' \ ++ | grep '#define.*SQLITE_VERSION.*\"' | tail -n 1 | sed -e 's/.* "//' \ + | sed -e 's/"//'` +- if test $ac_sqlite3_version != ""; then ++ if test "$ac_sqlite3_version" != ""; then + SQLITE3_VERSION=$ac_sqlite3_version + else + AC_MSG_WARN([Cannot find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!]) diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template index ef5d46cebac1..10e1677483d6 100644 --- a/srcpkgs/aircrack-ng/template +++ b/srcpkgs/aircrack-ng/template @@ -1,30 +1,31 @@ # Template file for 'aircrack-ng' pkgname=aircrack-ng -version=1.6 -revision=4 +version=1.7 +revision=1 build_style=gnu-configure -hostmakedepends="automake libtool pkg-config" -makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel libcap-devel" +hostmakedepends="automake ethtool libtool pkg-config python3" +makedepends="libhwloc-devel libnl3-devel libpcap-devel libpciaccess-devel + libxml2-devel openssl-devel pcre-devel python3-devel sqlite-devel zlib-devel" +checkdepends="cmocka-devel expect" short_desc="Complete suite of tools to assess WiFi network security" -maintainer="Orphaned " +maintainer="Joseph Benden " license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL" homepage="https://www.aircrack-ng.org/" changelog="https://www.aircrack-ng.org/doku.php?id=changelog" distfiles="https://download.aircrack-ng.org/${pkgname}-${version}.tar.gz" -checksum=4f0bfd486efc6ea7229f7fbc54340ff8b2094a0d73e9f617e0a39f878999a247 - -CFLAGS="-fcommon" +checksum=05a704e3c8f7792a17315080a21214a4448fd2452c1b0dd5226a3a55f90b58c3 +configure_args+="--without-opt --with-experimental --with-ext-scripts" pre_configure() { - ACLOCAL=/usr/bin/aclocal \ - AUTOCONF=/usr/bin/autoconf \ - AUTOHEADER=/usr/bin/autoheader \ - AUTOMAKE=/usr/bin/automake \ - LIBTOOLIZE=/usr/bin/libtoolize \ - NOCONFIGURE=1 \ - ./autogen.sh + autoreconf -vif } post_install() { + vdoc AUTHORS + vdoc ChangeLog + vdoc README + vdoc README.md + vdoc SECURITY.md + vlicense LICENSE vlicense LICENSE.OpenSSL } From d7cd35444e5a62cff2cff3948ce78b65720514c4 Mon Sep 17 00:00:00 2001 From: a dinosaur Date: Sat, 9 Jul 2022 20:12:19 +1000 Subject: [PATCH 35/85] libopenmpt: update to 0.6.4 --- srcpkgs/libopenmpt/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template index be4cef907d94..f285cabc1c41 100644 --- a/srcpkgs/libopenmpt/template +++ b/srcpkgs/libopenmpt/template @@ -1,6 +1,6 @@ # Template file for 'libopenmpt' pkgname=libopenmpt -version=0.6.1 +version=0.6.4 revision=1 wrksrc="libopenmpt-${version}+release.autotools" build_style=gnu-configure @@ -12,12 +12,12 @@ makedepends="zlib-devel libsndfile-devel $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if portaudio portaudio-cpp-devel)" short_desc="Cross-platform C & C++ library to decode tracked music files (modules)" -maintainer="a dinosaur " +maintainer="a dinosaur " license="BSD-3-Clause" homepage="https://lib.openmpt.org/libopenmpt/" changelog="https://lib.openmpt.org/doc/changelog.html" distfiles="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz" -checksum=c0bada4bebfc707961111bdb5ff6bbe337f5d71e837e8278f2e362a909eb925b +checksum=e09fb845c3292700a7ac13c3b31d669ecd3bdbebcbfe1328eba2376cebe40162 post_install() { vlicense LICENSE From 918c40d5c12ac203987d38369e3ba844a8322de7 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 11 Jul 2022 09:25:38 -0400 Subject: [PATCH 36/85] rpi-eeprom: update to 2022.05.20. --- srcpkgs/rpi-eeprom/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/rpi-eeprom/template b/srcpkgs/rpi-eeprom/template index 838d81485b88..c5a5e845d2cb 100644 --- a/srcpkgs/rpi-eeprom/template +++ b/srcpkgs/rpi-eeprom/template @@ -1,29 +1,29 @@ # Template file for 'rpi-eeprom' pkgname=rpi-eeprom -version=2021.06.17 -revision=2 -_githash="cecc46f6878ff03ab87c1cdd3c17ca0b446546d2" +version=2022.05.20 +revision=1 +_githash="1c758a0904630da2ea905118bdf34fe2d8a6bb5e" archs="armv7* aarch64*" wrksrc="${pkgname}-${_githash}" -conf_files="/etc/default/rpi-eeprom-update-default" +conf_files="/etc/default/rpi-eeprom-update" depends="binutils pciutils python3 rpi-firmware rpi-userland" short_desc="Bootloader and VL805 USB controller EEPROM update tool for RPi4" maintainer="Leah Neukirchen " license="BSD-3-Clause, custom:Proprietary" homepage="https://github.com/raspberrypi/rpi-eeprom/" distfiles="https://github.com/raspberrypi/rpi-eeprom/archive/${_githash}.tar.gz" -checksum=668227625344c9dfa615eb9ec77c26f7126615fb4c054cfd4caaf25385475de9 +checksum=ab4e20ef187f1583265c0face1d7d1597df2dc5d0fef697b459794924542388a python_version=3 repository=nonfree do_install() { vbin rpi-eeprom-config vbin rpi-eeprom-update - vinstall rpi-eeprom-update-default 644 etc/default + vbin rpi-eeprom-digest + vinstall rpi-eeprom-update-default 644 etc/default rpi-eeprom-update vmkdir usr/lib/firmware/raspberrypi/bootloader vcopy firmware/* usr/lib/firmware/raspberrypi/bootloader/ - rm -rf ${DESTDIR}/usr/lib/firmware/raspberrypi/bootloader/firmware/old vlicense LICENSE } From 8e688c6a41ab6b63c9dd13e6d3627f57e3d24c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 11 Jul 2022 20:09:27 +0200 Subject: [PATCH 37/85] python3-alembic: update to 1.8.0. --- srcpkgs/python3-alembic/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-alembic/template b/srcpkgs/python3-alembic/template index 1697853ce603..d86e686e6fc6 100644 --- a/srcpkgs/python3-alembic/template +++ b/srcpkgs/python3-alembic/template @@ -1,6 +1,6 @@ # Template file for 'python3-alembic' pkgname=python3-alembic -version=1.7.5 +version=1.8.0 revision=1 wrksrc="alembic-${version}" build_style=python3-module @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/sqlalchemy/alembic" changelog="https://raw.githubusercontent.com/sqlalchemy/alembic/master/docs/build/changelog.rst" distfiles="${PYPI_SITE}/a/alembic/alembic-${version}.tar.gz" -checksum=7c328694a2e68f03ee971e63c3bd885846470373a5b532cf2c9f1601c413b153 +checksum=a2d4d90da70b30e70352cd9455e35873a255a31402a438fe24815758d7a0e5e1 make_check=no # tests require deprecated pytest behavior that throws errors post_install() { From 0bec50f216eaa2117eab16ac5a1e660734ec0519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 11 Jul 2022 20:09:28 +0200 Subject: [PATCH 38/85] python3-filelock: update to 3.7.1. --- srcpkgs/python3-filelock/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-filelock/template b/srcpkgs/python3-filelock/template index ff639a0f1366..6612043f2eeb 100644 --- a/srcpkgs/python3-filelock/template +++ b/srcpkgs/python3-filelock/template @@ -1,6 +1,6 @@ # Template file for 'python3-filelock' pkgname=python3-filelock -version=3.7.0 +version=3.7.1 revision=1 wrksrc="filelock-${version}" build_style=python3-module @@ -12,4 +12,4 @@ license="Unlicense" homepage="https://py-filelock.readthedocs.io/en/latest/" changelog="https://raw.githubusercontent.com/tox-dev/py-filelock/main/docs/changelog.rst" distfiles="${PYPI_SITE}/f/filelock/filelock-${version}.tar.gz" -checksum=b795f1b42a61bbf8ec7113c341dad679d772567b936fbd1bf43c9a238e673e20 +checksum=3a0fd85166ad9dbab54c9aec96737b744106dc5f15c0b09a6744a445299fcf04 From d31293a87b276172155dcac4cf0714c79d8f8ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 11 Jul 2022 20:09:30 +0200 Subject: [PATCH 39/85] python3-jsondiff: update to 2.0.0. --- srcpkgs/python3-jsondiff/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-jsondiff/template b/srcpkgs/python3-jsondiff/template index bf26ba630960..461a8be63e02 100644 --- a/srcpkgs/python3-jsondiff/template +++ b/srcpkgs/python3-jsondiff/template @@ -1,7 +1,7 @@ # Template file for 'python3-jsondiff' pkgname=python3-jsondiff -version=1.3.0 -revision=2 +version=2.0.0 +revision=1 wrksrc="jsondiff-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ maintainer="Piotr Wójcik " license="MIT" homepage="https://github.com/ZoomerAnalytics/jsondiff" distfiles="${PYPI_SITE}/j/jsondiff/jsondiff-${version}.tar.gz" -checksum=5122bf4708a031b02db029366184a87c5d0ddd5a327a5884ee6cf0193e599d71 +checksum=2795844ef075ec8a2b8d385c4d59f5ea48b08e7180fce3cb2787be0db00b1fb4 post_install() { vlicense LICENSE From 23c6105e74a12d6ad0b29fe8207cb97efb09f778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 11 Jul 2022 20:09:31 +0200 Subject: [PATCH 40/85] tox: update to 3.25.1. --- srcpkgs/tox/template | 4 ++-- srcpkgs/tox/update | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template index 21e40e52d16a..931d17654619 100644 --- a/srcpkgs/tox/template +++ b/srcpkgs/tox/template @@ -1,6 +1,6 @@ # Template file for 'tox' pkgname=tox -version=3.24.5 +version=3.25.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools_scm" @@ -14,7 +14,7 @@ license="MIT" homepage="https://tox.readthedocs.io/en/latest/" changelog="https://tox.readthedocs.io/en/latest/changelog.html" distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz" -checksum=67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993 +checksum=c138327815f53bc6da4fe56baec5f25f00622ae69ef3fe4e1e385720e22486f9 do_check() { # Skipped tests fail to find module or rely on missing entrypoint script diff --git a/srcpkgs/tox/update b/srcpkgs/tox/update index 2c857beffb29..e957dc43055f 100644 --- a/srcpkgs/tox/update +++ b/srcpkgs/tox/update @@ -1 +1 @@ -ignore="*a*" +ignore="*a* *b*" From 3dc19e8c285c66265415fab2e323e11deed63c4e Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 11 Jul 2022 19:21:44 +0300 Subject: [PATCH 41/85] execline: update to 2.9.0.1. --- srcpkgs/execline/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template index 5f98c27ecbe1..2df4249d34cc 100644 --- a/srcpkgs/execline/template +++ b/srcpkgs/execline/template @@ -1,6 +1,6 @@ # Template file for 'execline' pkgname=execline -version=2.9.0.0 +version=2.9.0.1 revision=1 build_style=configure configure_args="--libdir=/usr/lib --bindir=/usr/bin @@ -14,7 +14,7 @@ license="ISC" homepage="https://skarnet.org/software/execline/" changelog="https://skarnet.org/software/execline/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=d4906aad8c3671265cfdad1aef265228bda07e09abd7208b4f093ac76f615041 +checksum=01260fcaf80ffbca2a94aa55ea474dfb9e39b3033b55c8af88126791879531f6 CFLAGS="-fPIC" From 0b45265a55586cc6edbad455d8f57f767d4a6f82 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 11 Jul 2022 19:17:26 +0300 Subject: [PATCH 42/85] mousepad: update to 0.5.10. --- srcpkgs/mousepad/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template index a471702954e6..39c0f10c460d 100644 --- a/srcpkgs/mousepad/template +++ b/srcpkgs/mousepad/template @@ -1,6 +1,6 @@ # Template file for 'mousepad' pkgname=mousepad -version=0.5.9 +version=0.5.10 revision=1 build_style=gnu-configure configure_args="--with-locales-dir=/usr/share/locale" @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://xfce.org/" changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS" distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=f108a8c167ec5727266ab67666f10dbd60e972d56ea03944302fdabb2167f473 +checksum=6ebaf38d52bee5560d9650c52a693f8a6ed0a67d88cc938d73f7d5ce13552bad From 964496280e1692df2c1970239702b2f84c9b3c78 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Thu, 30 Jun 2022 20:38:21 +0300 Subject: [PATCH 43/85] xonsh: update to 0.13.0. Also: - add python3-wheel to hostmakedepends. --- srcpkgs/xonsh/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xonsh/template b/srcpkgs/xonsh/template index 69caa602e442..c4d324cd8706 100644 --- a/srcpkgs/xonsh/template +++ b/srcpkgs/xonsh/template @@ -1,9 +1,9 @@ # Template file for 'xonsh' pkgname=xonsh -version=0.11.0 +version=0.13.0 revision=1 build_style=python3-module -hostmakedepends="python3-setuptools" +hostmakedepends="python3-setuptools python3-wheel" checkdepends="python3-pytest python3-prompt_toolkit python3-Pygments" short_desc="Python-powered, cross-platform, Unix-gazing shell" maintainer="SolitudeSF " @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="https://xon.sh/" changelog="https://raw.githubusercontent.com/xonsh/xonsh/master/CHANGELOG.rst" distfiles="https://github.com/xonsh/xonsh/archive/${version}.tar.gz" -checksum=9d73273276996297920c234c7d4267a305c695f0e9e2454dbdf0655c3a8f75cb +checksum=8440abd1515e47b707624dfb8da08e230ebc7854edd3edcfca0d775018e0ad8d register_shell="/bin/xonsh" # FIXME: fails with multiple AttributeErrors make_check=extended From 901bf327af5bf556c13c65fa56d3f4196bc614a8 Mon Sep 17 00:00:00 2001 From: Ishaan Bhimwal Date: Mon, 11 Jul 2022 23:56:21 +0530 Subject: [PATCH 44/85] xclipboard: update to 1.1.4 --- srcpkgs/xclipboard/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/xclipboard/template b/srcpkgs/xclipboard/template index 69208b796231..96f1b35bd878 100644 --- a/srcpkgs/xclipboard/template +++ b/srcpkgs/xclipboard/template @@ -1,16 +1,16 @@ -# Template build file for 'xclipboard'. +# Template file for 'xclipboard' pkgname=xclipboard -version=1.1.3 -revision=3 +version=1.1.4 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libXaw-devel" short_desc="X clipboard client" -homepage="http://xorg.freedesktop.org" -license="MIT" maintainer="Leah Neukirchen " -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=9c0e0a1f4f1d49f73c6cf3ccd27b5ca0e18afc63679f1a1ee466b1d82446ebb5 +license="MIT" +homepage="http://xorg.freedesktop.org" +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz" +checksum=f43d4560d1464e8ff58e850212f6bdb703989b66d599fb61f351b5f9e077f253 post_install() { vlicense COPYING From dbdb748203434bd50e25e42354e553ce10a3106a Mon Sep 17 00:00:00 2001 From: Ishaan Bhimwal Date: Tue, 12 Jul 2022 00:08:47 +0530 Subject: [PATCH 45/85] xconsole: update to 1.0.8 --- srcpkgs/xconsole/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/xconsole/template b/srcpkgs/xconsole/template index e65cb878d70f..5aaa3671b6fd 100644 --- a/srcpkgs/xconsole/template +++ b/srcpkgs/xconsole/template @@ -1,16 +1,16 @@ -# Template build file for 'xconsole'. +# Template file for 'xconsole' pkgname=xconsole -version=1.0.7 -revision=2 +version=1.0.8 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libXaw-devel" short_desc="Monitor system console messages with X" -homepage="http://xorg.freedesktop.org" -license="MIT" maintainer="Leah Neukirchen " -distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" -checksum=d1144882df207378381bc83927906559defbf7b83a01d52c50ad44234c5851e0 +license="MIT" +homepage="http://xorg.freedesktop.org" +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" +checksum=7b4a6af068e40e2e6a4521d6f35c9253ec152c287d025fff9cc4c99f2586bba4 post_install() { vlicense COPYING From a100c0d29957ed07181cd493c49e24f793b8862e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 11 Jul 2022 15:14:26 +0200 Subject: [PATCH 46/85] weechat: update to 3.6. --- srcpkgs/weechat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template index ebd25fa21547..092615031a9e 100644 --- a/srcpkgs/weechat/template +++ b/srcpkgs/weechat/template @@ -1,6 +1,6 @@ # Template file for 'weechat' pkgname=weechat -version=3.5 +version=3.6 revision=1 build_style=cmake configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON @@ -17,7 +17,7 @@ license="GPL-3.0-or-later" homepage="https://www.weechat.org" changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc" distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz" -checksum=ea904e4cec8edd0bd24f3ea17f6d6dff97ca00ee0571ee972e79e54c8c08170c +checksum=9d85d71b3b7d04c03bd35ab6501afa8b5b3c609dce7691709ec740fecc31f2de lib32disabled=yes subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl" From 49535ebb1f82fdf2211ea4e1263a90d963a9ec5a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 11 Jul 2022 21:24:24 +0200 Subject: [PATCH 47/85] xscope: update to 1.4.3. --- srcpkgs/xscope/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xscope/template b/srcpkgs/xscope/template index fa4ee8e01601..62f3c85a0848 100644 --- a/srcpkgs/xscope/template +++ b/srcpkgs/xscope/template @@ -1,16 +1,16 @@ -# Template build file for 'xscope'. +# Template file for 'xscope' pkgname=xscope -version=1.4.2 +version=1.4.3 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libXt-devel" short_desc="X Window Protocol Viewer" -homepage="http://xorg.freedesktop.org" -license="MIT" maintainer="Leah Neukirchen " +license="MIT" +homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz" -checksum=507c107ce6969430b9d57441283a4278aecab656bf9d343a7a1ab56ec5ac4764 +checksum=50604759481ac9f747d75b3fd1ad1bab846656d5aa2b3cee5d0e4cb814273985 post_install() { vlicense COPYING From ca8c456121132fe5f66cb7a26f9baf26fbb9dc2f Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 30 Jun 2022 16:30:57 -0500 Subject: [PATCH 48/85] nvidia: update to 515.57. --- srcpkgs/nvidia/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index 9842061efe14..46036bc80874 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux" pkgname=nvidia -version=515.48.07 +version=515.57 revision=1 maintainer="Andrew Benson " license="custom:NVIDIA Proprietary" @@ -19,7 +19,7 @@ conflicts="xserver-abi-video>25_1 nvidia470>=0 nvidia390>=0" _pkg="NVIDIA-Linux-x86_64-${version}" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" -checksum=e28764cc5b13c32e76370513daeafc05c289b77ee0511552450f1a00e31ae1e3 +checksum=841d69fe1426883647112bb070fe2f29a1f849c64ac80a8d61c70970d8d3d522 # subpackages need to be processed in this specific order subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit" depends="nvidia-libs-${version}_${revision} From 4b5c662918b271b05fe34449903716b16982cb78 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 11 Jul 2022 14:31:40 -0500 Subject: [PATCH 49/85] stellarium: update to 0.22.2. --- srcpkgs/stellarium/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template index 657b3a6e97b1..7c3fdff8033a 100644 --- a/srcpkgs/stellarium/template +++ b/srcpkgs/stellarium/template @@ -1,6 +1,6 @@ # Template file for 'stellarium' pkgname=stellarium -version=0.22.1 +version=0.22.2 revision=1 build_style=cmake hostmakedepends="perl qt5-qmake qt5-host-tools" @@ -12,5 +12,5 @@ maintainer="Andrew Benson " license="GPL-2.0-or-later" homepage="https://stellarium.org/" distfiles="https://github.com/Stellarium/stellarium/releases/download/v${version}/stellarium-${version}.tar.gz" -checksum=61a595ecc345dcc7517359573d0dc772e67ecaf6d52fefab142a77c92cf3fa24 +checksum=31e965d32cafc0fbad212c7ef4efbeac988f909206013554e1fe35123ebb9376 replaces="stellarium-data>=0" From d3c3ea352a1000fcc24d823aeb388584bf2002ee Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 10 Jul 2022 20:17:37 +0200 Subject: [PATCH 50/85] libinput: split libinput-debug-gui to avoid a cycle gst-plugins-bad1 -> zbar -> qt5 -> libinput -> gtk4 -> gst-plugins-bad1 --- srcpkgs/libinput-debug-gui | 1 - srcpkgs/libinput-debug-gui/template | 29 +++++++++++++++++++++++++++++ srcpkgs/libinput/template | 15 +++------------ 3 files changed, 32 insertions(+), 13 deletions(-) delete mode 120000 srcpkgs/libinput-debug-gui create mode 100644 srcpkgs/libinput-debug-gui/template diff --git a/srcpkgs/libinput-debug-gui b/srcpkgs/libinput-debug-gui deleted file mode 120000 index b8bfebd1511c..000000000000 --- a/srcpkgs/libinput-debug-gui +++ /dev/null @@ -1 +0,0 @@ -libinput \ No newline at end of file diff --git a/srcpkgs/libinput-debug-gui/template b/srcpkgs/libinput-debug-gui/template new file mode 100644 index 000000000000..0ad4ccca9a56 --- /dev/null +++ b/srcpkgs/libinput-debug-gui/template @@ -0,0 +1,29 @@ +# Template file for 'libinput-debug-gui' +# keep in sync with libinput +# split to avoid cycle: gst-plugins-bad1 -> zbar -> qt5 -> libinput -> gtk4 -> gst-plugins-bad1 +pkgname=libinput-debug-gui +version=1.21.0 +revision=1 +wrksrc="libinput-${version}" +build_style=meson +configure_args="-Db_ndebug=false -Dtests=false -Ddebug-gui=true" +hostmakedepends="pkg-config wayland-devel" +makedepends="libevdev-devel libwacom-devel mtdev-devel eudev-libudev-devel + gtk4-devel" +short_desc="Provides handling input devices in Wayland compositors and X" +maintainer="Michal Vasilek " +license="MIT" +homepage="https://www.freedesktop.org/wiki/Software/libinput" +distfiles="https://gitlab.freedesktop.org/libinput/libinput/-/archive/${version}/libinput-${version}.tar.gz" +checksum=1b23c180f5b297303ed36f5a549910f5d320b0eb21052eac67a966d4eaa4e01d + +post_install() { + mv ${DESTDIR}/usr/libexec/libinput/libinput-debug-gui ${DESTDIR}/libinput-debug-gui + mv ${DESTDIR}/usr/share/man/man1/libinput-debug-gui.1 ${DESTDIR}/libinput-debug-gui.1 + rm -r ${DESTDIR}/usr + vmkdir usr/libexec/libinput + mv ${DESTDIR}/libinput-debug-gui ${DESTDIR}/usr/libexec/libinput/libinput-debug-gui + vmkdir usr/share/man/man1 + mv ${DESTDIR}/libinput-debug-gui.1 ${DESTDIR}/usr/share/man/man1/libinput-debug-gui.1 + vlicense COPYING +} diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template index 55f6847caa57..df6b4a4198b5 100644 --- a/srcpkgs/libinput/template +++ b/srcpkgs/libinput/template @@ -3,10 +3,9 @@ pkgname=libinput version=1.21.0 revision=1 build_style=meson -configure_args="-Db_ndebug=false" -hostmakedepends="pkg-config wayland-devel" -makedepends="libevdev-devel libwacom-devel mtdev-devel eudev-libudev-devel - gtk4-devel" +configure_args="-Db_ndebug=false -Ddebug-gui=false" +hostmakedepends="pkg-config" +makedepends="libevdev-devel libwacom-devel mtdev-devel eudev-libudev-devel" checkdepends="valgrind check-devel" short_desc="Provides handling input devices in Wayland compositors and X" maintainer="Michal Vasilek " @@ -34,11 +33,3 @@ libinput-devel_package() { vmove usr/lib/pkgconfig } } - -libinput-debug-gui_package() { - short_desc+=" - debug GUI" - pkg_install() { - vmove usr/libexec/libinput/libinput-debug-gui - vmove usr/share/man/man1/libinput-debug-gui.1 - } -} From 8b137894e6f484a7538e91a8bfaf94febebd7f1a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 10 Jul 2022 20:16:53 +0200 Subject: [PATCH 51/85] gtk4: enable tracker support this makes search in the filechooser dialog use tracker, so it can discover files faster and recursively --- srcpkgs/gtk4/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index a0c39ac378ed..842af8f4c1c9 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -1,7 +1,7 @@ # Template file for 'gtk4' pkgname=gtk4 version=4.6.6 -revision=1 +revision=2 wrksrc="gtk-${version}" build_style=meson build_helper="gir" @@ -12,7 +12,8 @@ configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true -Dintrospection=$(vopt_if gir enabled disabled) -Dcolord=$(vopt_if colord enabled disabled) -Dcloudproviders=$(vopt_if cloudproviders enabled disabled) - -Dvulkan=$(vopt_if vulkan enabled disabled)" + -Dvulkan=$(vopt_if vulkan enabled disabled) + -Dtracker=$(vopt_if tracker enabled disabled)" hostmakedepends="gettext-devel glib-devel gi-docgen perl pkg-config sassc gettext libxslt docbook-xsl python3-docutils $(vopt_if wayland 'wayland-devel wayland-protocols')" @@ -21,7 +22,8 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel') $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel') $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel') - $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')" + $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers') + $(vopt_if tracker 'tracker-devel')" depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')" short_desc="GIMP ToolKit (v4)" maintainer="Enno Boland " @@ -32,11 +34,11 @@ distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz" checksum=7bbfe4d13569f7c297ed49834ac7263e318b7bf102d3271cb466d5971f59ae70 # Package build options -build_options="broadway cloudproviders colord cups gir vulkan wayland x11" +build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker" desc_option_broadway="Enable support for the HTML5 Broadway backend" desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud" -build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11" +build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 tracker" pre_build() { # help gi-docgen find gi files on cross From dc61d0258b8b046fbd34d9b8de39d8d810e0723d Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Sun, 10 Jul 2022 22:11:38 -0400 Subject: [PATCH 52/85] dendrite: update to 0.8.9. --- srcpkgs/dendrite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template index 06e4061c9736..ce0e77935494 100644 --- a/srcpkgs/dendrite/template +++ b/srcpkgs/dendrite/template @@ -1,6 +1,6 @@ # Template file for 'dendrite' pkgname=dendrite -version=0.8.8 +version=0.8.9 revision=1 build_style=go go_import_path="github.com/matrix-org/dendrite" @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://matrix.org/docs/projects/server/dendrite" changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md" distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz" -checksum=1fdd8a3d2844cf38b7bb8ed761f3d66de83902ab502f137d1f4572e884a8fa46 +checksum=f0d43ad9269ee8290e1c55e7add4e02d8048dc2aa9c83d4f190eed6f8b21e34d system_accounts="_dendrite" _dendrite_homedir="/var/lib/dendrite" From 6b2765debd1c9a994337d3bed91af839a93a39e4 Mon Sep 17 00:00:00 2001 From: Ishaan Bhimwal Date: Tue, 12 Jul 2022 00:17:24 +0530 Subject: [PATCH 53/85] xmodmap: update to 1.0.11 and adopt --- srcpkgs/xmodmap/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xmodmap/template b/srcpkgs/xmodmap/template index 2f8678807d6e..00dae1878d52 100644 --- a/srcpkgs/xmodmap/template +++ b/srcpkgs/xmodmap/template @@ -1,16 +1,16 @@ # Template file for 'xmodmap' pkgname=xmodmap -version=1.0.10 -revision=2 +version=1.0.11 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libX11-devel" short_desc="X modmap program to modify keymaps and pointer button mappings" -maintainer="Orphaned " +maintainer="Ishaan Bhimwal " license="MIT" homepage="http://xorg.freedesktop.org" -distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" -checksum=473f0941d7439d501bb895ff358832b936ec34c749b9704c37a15e11c318487c +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" +checksum=9a2f8168f7b0bc382828847403902cb6bf175e17658b36189eac87edda877e81 post_install() { vlicense COPYING From 545ead8dc5a940df0b2cdfd0d197c3c6d77a6369 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 12 Jul 2022 14:28:51 +0200 Subject: [PATCH 54/85] ndisc6: update to 1.0.6. --- srcpkgs/ndisc6/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ndisc6/template b/srcpkgs/ndisc6/template index 05742ef53f27..964fa1857a1f 100644 --- a/srcpkgs/ndisc6/template +++ b/srcpkgs/ndisc6/template @@ -1,6 +1,6 @@ # Template file for 'ndisc6' pkgname=ndisc6 -version=1.0.5 +version=1.0.6 revision=1 build_style=gnu-configure configure_args="--disable-suid-install" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only,GPL-3.0-only" homepage="http://www.remlab.net/ndisc6/" distfiles="http://www.remlab.net/files/ndisc6/${pkgname}-${version}.tar.bz2" -checksum=3d058910680517f2d402b36aa37a54c9a53962c32178ff825ef64dd26a1bdbb8 +checksum=a713210e9be1f15cfa0809f4c2728b00cd5f25881d7585126986982055453cfb post_extract() { sed -i '/undef _GNU_SOURCE/d' src/trace-*.c From 43108ee3be59cd15ba19a84edaadf6d137c8ebbf Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 12 Jul 2022 14:31:34 +0200 Subject: [PATCH 55/85] unbound: update to 1.16.1. --- srcpkgs/unbound/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template index c1bfc1ba86a1..7c96300be53b 100644 --- a/srcpkgs/unbound/template +++ b/srcpkgs/unbound/template @@ -1,6 +1,6 @@ # Template file for 'unbound' pkgname=unbound -version=1.16.0 +version=1.16.1 revision=1 build_style=gnu-configure configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf @@ -16,7 +16,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://nlnetlabs.nl/projects/unbound/about/" distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz" -checksum=6701534c938eb019626601191edc6d012fc534c09d2418d5b92827db0cbe48a5 +checksum=2fe4762abccd564a0738d5d502f57ead273e681e92d50d7fba32d11103174e9a system_accounts="_unbound" post_install() { From 3cd20b4ba830859b3a33c83067cd1cf6ac6795f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Tue, 12 Jul 2022 13:31:47 +0200 Subject: [PATCH 56/85] gnupg: adopt, update to 2.3.7. --- srcpkgs/gnupg/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template index 77767cf0a22a..f16d68e0c541 100644 --- a/srcpkgs/gnupg/template +++ b/srcpkgs/gnupg/template @@ -1,6 +1,6 @@ # Template file for 'gnupg' pkgname=gnupg -version=2.2.35 +version=2.3.7 revision=1 build_style=gnu-configure configure_args="$(vopt_enable ldap) @@ -14,11 +14,11 @@ makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel libgcrypt-devel" depends="pinentry" short_desc="GNU Privacy Guard (2.x)" -maintainer="Orphaned " +maintainer="Jan Christian Grünhage " license="GPL-3.0-or-later" homepage="https://www.gnupg.org/" distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2" -checksum=340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690 +checksum=ee163a5fb9ec99ffc1b18e65faef8d086800c5713d15a672ab57d3799da83669 build_options="ldap" build_options_default="ldap" From 49a6f4233e7f7588dbaa58d170666bc894875ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 17 Jun 2021 11:27:56 +0200 Subject: [PATCH 57/85] New package: perl-Data-Perl-0.002011 --- srcpkgs/perl-Data-Perl/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/perl-Data-Perl/template diff --git a/srcpkgs/perl-Data-Perl/template b/srcpkgs/perl-Data-Perl/template new file mode 100644 index 000000000000..1b213d2e29b5 --- /dev/null +++ b/srcpkgs/perl-Data-Perl/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Data-Perl' +pkgname=perl-Data-Perl +version=0.002011 +revision=1 +wrksrc="${pkgname/perl-/}-$version" +build_style=perl-module +hostmakedepends="perl perl-strictures perl-List-MoreUtils perl-Class-Method-Modifiers perl-Role-Tiny perl-Module-Runtime" +makedepends="${hostmakedepends}" +depends="${makedepends}" +checkdepends="perl-Test-Deep perl-Test-Output perl-Test-Fatal" +short_desc="Base classes wrapping fundamental Perl data types" +maintainer="Jan Christian Grünhage " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Data-Perl" +distfiles="${CPAN_SITE}/Data/${pkgname/perl-/}-${version}.tar.gz" +checksum=8d34dbe314cfa2d99bd9aae546bbde94c38bb05b74b07c89bde1673a6f6c55f4 From 0432092cb4b7ce55093c73d8249bc3c6cd6e6892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 17 Jun 2021 11:28:16 +0200 Subject: [PATCH 58/85] New package: perl-Type-Tiny-1.014000 --- srcpkgs/perl-Type-Tiny/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/perl-Type-Tiny/template diff --git a/srcpkgs/perl-Type-Tiny/template b/srcpkgs/perl-Type-Tiny/template new file mode 100644 index 000000000000..8e63f9491a10 --- /dev/null +++ b/srcpkgs/perl-Type-Tiny/template @@ -0,0 +1,15 @@ +# Template file for 'perl-Type-Tiny' +pkgname=perl-Type-Tiny +version=1.014000 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl perl-Exporter-Tiny" +makedepends="${hostmakedepends}" +depends="${makedepends}" +short_desc="Perl module for type constraints" +maintainer="Jan Christian Grünhage " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Type-Tiny" +distfiles="https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/${pkgname/perl-/}-${version}.tar.gz" +checksum=ae3b784c7b86386f81f0a5a475c02e7b1f1b3e357ceb07d9f5c62761378b3086 From fa506e1cf7cf0f09ed8b7d5873723c991774668f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Tue, 12 Jul 2022 15:02:29 +0200 Subject: [PATCH 59/85] New package: perl-Role-Hooks-0.008 --- srcpkgs/perl-Role-Hooks/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/perl-Role-Hooks/template diff --git a/srcpkgs/perl-Role-Hooks/template b/srcpkgs/perl-Role-Hooks/template new file mode 100644 index 000000000000..753eff1fa78e --- /dev/null +++ b/srcpkgs/perl-Role-Hooks/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Role-Hooks' +pkgname=perl-Role-Hooks +version=0.008 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl perl-Class-Method-Modifiers" +makedepends="${hostmakedepends}" +depends="${makedepends}" +checkdepends="perl-Test-Requires" +short_desc="Perl module for role callbacks" +maintainer="Jan Christian Grünhage " +license="GPL-3.0-or-later" +homepage="https://metacpan.org/pod/Role::Hooks" +distfiles="${CPAN_SITE}/Devel/TOBYINK/${pkgname/perl-/}-${version}.tar.gz" +checksum=28d66ea0a8dc306b76da83ff0879493d808f73185bcf9c4ed372f3946fb543ec From 9b799e07538b76a0596a76aeee68c1d99efa9145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 17 Jun 2021 11:28:50 +0200 Subject: [PATCH 60/85] New package: perl-Sub-HandlesVia-0.031 --- srcpkgs/perl-Sub-HandlesVia/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/perl-Sub-HandlesVia/template diff --git a/srcpkgs/perl-Sub-HandlesVia/template b/srcpkgs/perl-Sub-HandlesVia/template new file mode 100644 index 000000000000..616d5bba4c97 --- /dev/null +++ b/srcpkgs/perl-Sub-HandlesVia/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Sub-HandlesVia' +pkgname=perl-Sub-HandlesVia +version=0.031 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl perl-Type-Tiny perl-Exporter-Tiny perl-Class-Tiny perl-Class-Method-Modifiers" +makedepends="${hostmakedepends}" +depends="${makedepends}" +checkdepends="perl-Test-Requires perl-Test-Fatal perl-Moo perl-Role-Hooks" +short_desc="Sub::HandlesVia - alternative handles_via implementation" +maintainer="Jan Christian Grünhage " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Sub-HandlesVia" +distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-${version}.tar.gz" +checksum=53824b58ba392e0ba04d39f119f6f03132f9fb22aa7c0460f29378e287d0f689 From 108a03e6e9a48bef5c2a7582f66135a0868e23aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 17 Jun 2021 11:29:06 +0200 Subject: [PATCH 61/85] New package: perl-MooX-late-0.100 --- srcpkgs/perl-MooX-late/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/perl-MooX-late/template diff --git a/srcpkgs/perl-MooX-late/template b/srcpkgs/perl-MooX-late/template new file mode 100644 index 000000000000..c4729bee6085 --- /dev/null +++ b/srcpkgs/perl-MooX-late/template @@ -0,0 +1,16 @@ +# Template file for 'perl-MooX-late' +pkgname=perl-MooX-late +version=0.100 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends} perl-Moo perl-Sub-HandlesVia perl-Type-Tiny" +depends="${makedepends}" +checkdepends="perl-Test-Fatal perl-Test-Requires" +short_desc="Easily translate Moose code to Moo" +maintainer="Jan Christian Grünhage " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/MooX-late" +distfiles="${CPAN_SITE}/MooX/${pkgname/perl-/}-${version}.tar.gz" +checksum=2ae5b1e3da5abc0e4006278ecbcfa8fa7c224ea5529a6a688acbb229c09e6a5f From 749bb7a0e7c5df94a7fca9e2d0c8ed2e0d424eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Tue, 12 Jul 2022 15:05:58 +0200 Subject: [PATCH 62/85] New package: perl-MooX-HandlesVia-0.001009 --- srcpkgs/perl-MooX-HandlesVia/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/perl-MooX-HandlesVia/template diff --git a/srcpkgs/perl-MooX-HandlesVia/template b/srcpkgs/perl-MooX-HandlesVia/template new file mode 100644 index 000000000000..a622d1f841be --- /dev/null +++ b/srcpkgs/perl-MooX-HandlesVia/template @@ -0,0 +1,16 @@ +# Template file for 'perl-MooX-HandlesVia' +pkgname=perl-MooX-HandlesVia +version=0.001009 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends} perl-Module-Runtime perl-Data-Perl perl-Moo perl-Class-Method-Modifiers perl-Role-Tiny perl-MooX-Types-MooseLike" +depends="${makedepends}" +checkdepends="perl-Test-Fatal perl-Test-Exception" +short_desc="NativeTrait-like behavior for Moo" +maintainer="Jan Christian Grünhage " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/MooX-HandlesVia" +distfiles="${CPAN_SITE}/MooX/${pkgname/perl-/}-${version}.tar.gz" +checksum=716353e38894ecb7e8e4c17bc95483db5f59002b03541b54a72c27f2a8f36c12 From d49b06066fbca3115a30dce5536f175064b7c6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 17 Jun 2021 11:29:45 +0200 Subject: [PATCH 63/85] New package: perl-GnuPG-Interface-1.02 --- .../patches/0001-disables-version-check.patch | 90 +++++++++++++++++++ .../0002-Hardcode-path-to-usr-bin-gpg.patch | 38 ++++++++ srcpkgs/perl-GnuPG-Interface/template | 15 ++++ 3 files changed, 143 insertions(+) create mode 100644 srcpkgs/perl-GnuPG-Interface/patches/0001-disables-version-check.patch create mode 100644 srcpkgs/perl-GnuPG-Interface/patches/0002-Hardcode-path-to-usr-bin-gpg.patch create mode 100644 srcpkgs/perl-GnuPG-Interface/template diff --git a/srcpkgs/perl-GnuPG-Interface/patches/0001-disables-version-check.patch b/srcpkgs/perl-GnuPG-Interface/patches/0001-disables-version-check.patch new file mode 100644 index 000000000000..2807cf114e69 --- /dev/null +++ b/srcpkgs/perl-GnuPG-Interface/patches/0001-disables-version-check.patch @@ -0,0 +1,90 @@ +From fe898b9211fd0a6d273c438c21755e39b9b221b3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= + +Date: Wed, 15 Jun 2022 13:05:40 +0200 +Subject: [PATCH 1/2] disables version check + +Void ships GnuPG in a new enough version anyway, so this check is not +necessary. The reason to disable the check is that it's broken rn: + +``` +error determining fileno for STDIN: Illegal seek at (eval 270) line 55. +Use of uninitialized value $line in pattern match (m//) at /usr/share/perl5/vendor_perl/GnuPG/Interface.pm line 827. +Use of uninitialized value $a in split at /usr/share/perl5/vendor_perl/GnuPG/Interface.pm line 841. +Use of uninitialized value $a in split at /usr/share/perl5/vendor_perl/GnuPG/Interface.pm line 841. +GnuPG Version 1.4 or 2.2+ required at (eval 270) line 55. +``` +--- + lib/GnuPG/Interface.pm | 18 ++---------------- + t/version_updates.t | 30 ------------------------------ + 2 files changed, 2 insertions(+), 46 deletions(-) + delete mode 100644 t/version_updates.t + +diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm +index 905ae30..7fd2321 100644 +--- a/lib/GnuPG/Interface.pm ++++ b/lib/GnuPG/Interface.pm +@@ -818,22 +818,8 @@ sub search_keys( $% ) { + } + + sub _version { +- my ( $self ) = @_; +- +- my $out = IO::Handle->new; +- my $handles = GnuPG::Handles->new( stdout => $out ); +- my $pid = $self->wrap_call( commands => [ '--no-options', '--version' ], handles => $handles ); +- my $line = $out->getline; +- $line =~ /(\d+\.\d+\.\d+)/; +- +- my $version = $1; +- unless ($self->cmp_version($version, '2.2') >= 0 or +- ($self->cmp_version($version, '1.4') >= 0 and $self->cmp_version($version, '1.5') < 0 )) { +- croak "GnuPG Version 1.4 or 2.2+ required"; +- } +- waitpid $pid, 0; +- +- return $version; ++ # version detection is broken, hardcoding that we're on 2.2+ ++ return '2.3.7'; + } + + sub cmp_version($$) { +diff --git a/t/version_updates.t b/t/version_updates.t +deleted file mode 100644 +index 758ee7b..0000000 +--- a/t/version_updates.t ++++ /dev/null +@@ -1,30 +0,0 @@ +-#!/usr/bin/perl -w +- +-use strict; +- +-use lib './t'; +-use MyTest; +-use MyTestSpecific; +- +-TEST +-{ +- my $gpg = GnuPG::Interface->new(call => './test/fake-gpg-v1'); +- return ($gpg->version() eq '1.4.23'); +-}; +- +- +-TEST +-{ +- my $gpg = GnuPG::Interface->new(call => './test/fake-gpg-v2'); +- return ($gpg->version() eq '2.2.12'); +-}; +- +-TEST +-{ +- my $gpg = GnuPG::Interface->new(call => './test/fake-gpg-v1'); +- my $v1 = $gpg->version(); +- $gpg->call('./test/fake-gpg-v2'); +- my $v2 = $gpg->version(); +- +- return ($v1 eq '1.4.23' && $v2 eq '2.2.12'); +-} +-- +2.36.1 + diff --git a/srcpkgs/perl-GnuPG-Interface/patches/0002-Hardcode-path-to-usr-bin-gpg.patch b/srcpkgs/perl-GnuPG-Interface/patches/0002-Hardcode-path-to-usr-bin-gpg.patch new file mode 100644 index 000000000000..6052103f5468 --- /dev/null +++ b/srcpkgs/perl-GnuPG-Interface/patches/0002-Hardcode-path-to-usr-bin-gpg.patch @@ -0,0 +1,38 @@ +From 4185798921211925d38e9ea2cd0f28f3eb32ddca Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= + +Date: Wed, 15 Jun 2022 13:10:01 +0200 +Subject: [PATCH 2/2] Hardcode path to /usr/bin/gpg + +--- + lib/GnuPG/Interface.pm | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm +index 7fd2321..ed2f49e 100644 +--- a/lib/GnuPG/Interface.pm ++++ b/lib/GnuPG/Interface.pm +@@ -76,7 +76,7 @@ sub gnupg_call { shift->call(@_); } + + sub BUILD { + my ( $self, $args ) = @_; +- $self->hash_init( call => 'gpg', %$args ); ++ $self->hash_init( call => '/usr/bin/gpg', %$args ); + } + + struct( +@@ -1183,9 +1183,8 @@ keys to list in a key-listing. + + =item call + +-This defines the call made to invoke GnuPG. Defaults to 'gpg'; this +-should be changed if 'gpg' is not in your path, or there is a different +-name for the binary on your system. ++This defines the call made to invoke GnuPG. Defaults to '/usr/bin/gpg'; this ++should be changed if there is a different name for the binary on your system. + + =item passphrase + +-- +2.36.1 + diff --git a/srcpkgs/perl-GnuPG-Interface/template b/srcpkgs/perl-GnuPG-Interface/template new file mode 100644 index 000000000000..20756374d957 --- /dev/null +++ b/srcpkgs/perl-GnuPG-Interface/template @@ -0,0 +1,15 @@ +# Template file for 'perl-GnuPG-Interface' +pkgname=perl-GnuPG-Interface +version=1.02 +revision=1 +wrksrc="${pkgname/perl-/}-$version" +build_style=perl-module +hostmakedepends="perl which gnupg" +makedepends="${hostmakedepends} perl-Moo perl-MooX-HandlesVia perl-MooX-late" +depends="${makedepends}" +short_desc="Perl interface GnuPG" +maintainer="Jan Christian Grünhage " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/GnuPG-Interface" +distfiles="${CPAN_SITE}/GnuPG/${pkgname/perl-/}-${version}.tar.gz" +checksum=c27a48c3d48e1a9205e362eeea66d46b032bd84637991fdf0b13828bcafdd3e6 From 728e2bdb13170cc45321b87d2c71a2110536da6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 17 Jun 2021 11:30:02 +0200 Subject: [PATCH 64/85] New package: perl-Net-IDN-Encode-2.500 --- srcpkgs/perl-Net-IDN-Encode/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/perl-Net-IDN-Encode/template diff --git a/srcpkgs/perl-Net-IDN-Encode/template b/srcpkgs/perl-Net-IDN-Encode/template new file mode 100644 index 000000000000..a4022ba73d26 --- /dev/null +++ b/srcpkgs/perl-Net-IDN-Encode/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Net-IDN-Encode' +pkgname=perl-Net-IDN-Encode +version=2.500 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends}" +depends="${makedepends}" +checkdepends="perl-Test-NoWarnings" +short_desc="Internationalizing Domain Names in Applications (IDNA) for Perl" +maintainer="Jan Christian Grünhage " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Net-IDN-Encode" +distfiles="${CPAN_SITE}/Net/${pkgname/perl-/}-${version}.tar.gz" +checksum=55453633e3ff24ce325b34bc2c8157b9859962a31ab5cf28bf7ccc1c9b3a3eaa From cb2edf5c5a155a5184e8eab1fe1be679af98651d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 17 Jun 2021 11:30:19 +0200 Subject: [PATCH 65/85] New package: perl-Class-MethodMaker-2.24 --- srcpkgs/perl-Class-MethodMaker/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/perl-Class-MethodMaker/template diff --git a/srcpkgs/perl-Class-MethodMaker/template b/srcpkgs/perl-Class-MethodMaker/template new file mode 100644 index 000000000000..71d9e06d8ba9 --- /dev/null +++ b/srcpkgs/perl-Class-MethodMaker/template @@ -0,0 +1,15 @@ +# Template file for 'perl-Class-MethodMaker' +pkgname=perl-Class-MethodMaker +version=2.24 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends}" +depends="${makedepends}" +short_desc="Easy building of Perl Classes" +maintainer="Jan Christian Grünhage " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Class-MethodMaker" +distfiles="${CPAN_SITE}/Class/${pkgname/perl-/}-${version}.tar.gz" +checksum=5eef58ccb27ebd01bcde5b14bcc553b5347a0699e5c3e921c7780c3526890328 From 183ff0d9c9152e24d36bf003fbdc0dfb77378d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 17 Jun 2021 11:30:32 +0200 Subject: [PATCH 66/85] New package: perl-MooX-Types-MooseLike-0.29 --- srcpkgs/perl-MooX-Types-MooseLike/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/perl-MooX-Types-MooseLike/template diff --git a/srcpkgs/perl-MooX-Types-MooseLike/template b/srcpkgs/perl-MooX-Types-MooseLike/template new file mode 100644 index 000000000000..dc6441ed9142 --- /dev/null +++ b/srcpkgs/perl-MooX-Types-MooseLike/template @@ -0,0 +1,16 @@ +# Template file for 'perl-MooX-Types-MooseLike' +pkgname=perl-MooX-Types-MooseLike +version=0.29 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends} perl-Module-Runtime perl-Moo" +depends="${makedepends}" +checkdepends="perl-Test-Fatal perl-Test-Exception" +short_desc="Moosish types and a type builder" +maintainer="Jan Christian Grünhage " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/MooX-Types-MooseLike" +distfiles="${CPAN_SITE}/MooX/${pkgname/perl-/}-${version}.tar.gz" +checksum=1d3780aa9bea430afbe65aa8c76e718f1045ce788aadda4116f59d3b7a7ad2b4 From 8187a5b484594160245bfd3ec4a8bb97046575b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 17 Jun 2021 11:30:43 +0200 Subject: [PATCH 67/85] New package: qprint-1.1 --- srcpkgs/qprint/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/qprint/template diff --git a/srcpkgs/qprint/template b/srcpkgs/qprint/template new file mode 100644 index 000000000000..a09afbc36cba --- /dev/null +++ b/srcpkgs/qprint/template @@ -0,0 +1,20 @@ +# Template file for 'qprint' +pkgname=qprint +version=1.1 +revision=1 +build_style=gnu-configure +short_desc="Encode and decode Quoted-Printable files" +maintainer="Jan Christian Grünhage " +license="Public Domain" +homepage="https://www.fourmilab.ch/webtools/qprint/" +distfiles="https://www.fourmilab.ch/webtools/qprint/qprint-${version}.tar.gz" +checksum=ffa9ca1d51c871fb3b56a4bf0165418348cf080f01ff7e59cd04511b9665019c + +pre_install() { + mkdir -p "${DESTDIR}/usr/bin" + mkdir -p "${DESTDIR}/usr/share/man/man1" +} + +post_install() { + vlicense COPYING +} From 85d121fd31937a71a96f3049b515d570c7cd11ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 17 Jun 2021 11:30:47 +0200 Subject: [PATCH 68/85] New package: signing-party-2.11 --- srcpkgs/signing-party/patches/makefiles.patch | 232 ++++++++++++++++++ srcpkgs/signing-party/template | 27 ++ 2 files changed, 259 insertions(+) create mode 100644 srcpkgs/signing-party/patches/makefiles.patch create mode 100644 srcpkgs/signing-party/template diff --git a/srcpkgs/signing-party/patches/makefiles.patch b/srcpkgs/signing-party/patches/makefiles.patch new file mode 100644 index 000000000000..fa8d9d2e82d2 --- /dev/null +++ b/srcpkgs/signing-party/patches/makefiles.patch @@ -0,0 +1,232 @@ +commit 2ef002d78cbdeae8867a6aac63da451f0bb017c9 +Author: Jan Christian Grünhage +Date: Fri Jun 18 17:57:01 2021 +0200 + + make `make install` install stuff actually + + So far, installing was done outside of the Makefiles, which means that + the installing has to be duplicated per distro. This can be seen in the + files in the `debian` folder and in + https://github.com/archlinux/svntogit-community/blob/276cd50659b33f4b0ee2cc2b3d22b07665ff7a07/trunk/PKGBUILD#L48-L84. + To avoid things like these while I was packaging this for Void Linux, I + added or changed Makefiles for the individual projects. This way, I only + need this patch in Void instead of workarounds like Arch has. + +diff --git a/caff/Makefile b/caff/Makefile +index 714aa8f..e9bf872 100644 +--- a/caff/Makefile ++++ b/caff/Makefile +@@ -6,6 +6,9 @@ all: $(MAN) + pod2man $< > $@ + + install: ++ install -Dm755 {caff,pgp-clean,pgp-fixkey} -t $(DESTDIR)/usr/bin/ ++ install -Dm644 {caff,pgp-clean,pgp-fixkey}.1 -t ${DESTDIR}/usr/share/man/man1/ ++ install -Dm644 {caffrc.sample,README*} -t $(DESTDIR)/usr/share/doc/signing-party/caff/ + + clean: + rm -f $(MAN) +diff --git a/gpg-key2latex/Makefile b/gpg-key2latex/Makefile +index c2d35d8..33ac35b 100644 +--- a/gpg-key2latex/Makefile ++++ b/gpg-key2latex/Makefile +@@ -6,6 +6,8 @@ all: $(MAN) + pod2man $< > $@ + + install: ++ install -Dm755 gpg-key2latex -t $(DESTDIR)/usr/bin/ ++ install -Dm644 gpg-key2latex.1 -t ${DESTDIR}/usr/share/man/man1/ + + clean: + rm -f $(MAN) +diff --git a/gpg-key2ps/Makefile b/gpg-key2ps/Makefile +index 5f483c5..9e66cce 100644 +--- a/gpg-key2ps/Makefile ++++ b/gpg-key2ps/Makefile +@@ -4,6 +4,9 @@ gpg-key2ps.1: gpg-key2ps + pod2man $< > $@ + + install: ++ install -Dm755 gpg-key2ps -t $(DESTDIR)/usr/bin/ ++ install -Dm644 gpg-key2ps.1 -t ${DESTDIR}/usr/share/man/man1/ ++ install -Dm644 README -t $(DESTDIR)/usr/share/doc/signing-party/gpg-key2ps/ + + clean: + rm -f gpg-key2ps.1 +diff --git a/gpg-mailkeys/Makefile b/gpg-mailkeys/Makefile +new file mode 100644 +index 0000000..bf94df8 +--- /dev/null ++++ b/gpg-mailkeys/Makefile +@@ -0,0 +1,9 @@ ++ ++all: ++ ++install: ++ install -Dm755 gpg-mailkeys -t $(DESTDIR)/usr/bin/ ++ install -Dm644 gpg-mailkeys.1 -t ${DESTDIR}/usr/share/man/man1/ ++ install -Dm644 {example.gpg-mailkeysrc,README} -t $(DESTDIR)/usr/share/doc/signing-party/gpg-mailkeys/ ++ ++clean: +diff --git a/gpgdir/Makefile b/gpgdir/Makefile +new file mode 100644 +index 0000000..22f4fc0 +--- /dev/null ++++ b/gpgdir/Makefile +@@ -0,0 +1,8 @@ ++all: ++ ++install: ++ install -Dm755 gpgdir -t $(DESTDIR)/usr/bin/ ++ install -Dm644 gpgdir.1 -t ${DESTDIR}/usr/share/man/man1/ ++ install -Dm644 {README,ChangeLog} -t $(DESTDIR)/usr/share/doc/signing-party/gpgdir/ ++ ++clean: +diff --git a/gpglist/Makefile b/gpglist/Makefile +index f4f8487..72679b9 100644 +--- a/gpglist/Makefile ++++ b/gpglist/Makefile +@@ -6,6 +6,8 @@ all: $(MAN) + pod2man $< > $@ + + install: ++ install -Dm755 gpglist -t $(DESTDIR)/usr/bin/ ++ install -Dm644 gpglist.1 -t ${DESTDIR}/usr/share/man/man1/ + + clean: + rm -f $(MAN) +diff --git a/gpgparticipants/Makefile b/gpgparticipants/Makefile +new file mode 100644 +index 0000000..c308340 +--- /dev/null ++++ b/gpgparticipants/Makefile +@@ -0,0 +1,7 @@ ++all: ++ ++install: ++ install -Dm755 gpg{participants,participants-filter,participants-prefill} -t $(DESTDIR)/usr/bin/ ++ install -Dm644 gpg{participants,participants-filter,participants-prefill}.1 -t ${DESTDIR}/usr/share/man/man1/ ++ ++clean: +diff --git a/gpgsigs/Makefile b/gpgsigs/Makefile +index 339ddb8..994983b 100644 +--- a/gpgsigs/Makefile ++++ b/gpgsigs/Makefile +@@ -4,10 +4,9 @@ gpgsigs.1: gpgsigs + pod2man $< > $@ + + install: +- install -D gpgsigs $(DESTDIR)/usr/bin/gpgsigs +- install -d $(DESTDIR)/usr/share/doc/signing-party/examples/gpgsigs +- install -m644 gpgsigs-lt2k5*.txt \ +- $(DESTDIR)/usr/share/doc/signing-party/examples/gpgsigs ++ install -Dm755 gpgsigs $(DESTDIR)/usr/bin/gpgsigs ++ install -Dm644 gpgsigs.1 -t ${DESTDIR}/usr/share/man/man1/ ++ install -Dm644 gpgsigs-lt2k5*.txt -t $(DESTDIR)/usr/share/doc/signing-party/gpgsigs/examples + + clean: + rm -f gpgsigs.1 +diff --git a/gpgwrap/Makefile b/gpgwrap/Makefile +index 30064df..8355e91 100644 +--- a/gpgwrap/Makefile ++++ b/gpgwrap/Makefile +@@ -1,9 +1,14 @@ + MAKE=make + +-.PHONY: all clean ++.PHONY: all clean install + + all: + cd src && ${MAKE} all DIET="${DIET}" + ++install: ++ install -Dm755 bin/gpgwrap -t $(DESTDIR)/usr/bin/ ++ install -Dm644 doc/gpgwrap.1 -t ${DESTDIR}/usr/share/man/man1/ ++ install -Dm644 {README,NEWS} -t $(DESTDIR)/usr/share/doc/signing-party/gpgwrap ++ + clean: + cd src && ${MAKE} clean +diff --git a/keyanalyze/Makefile b/keyanalyze/Makefile +index 3517b74..a9ce7b7 100644 +--- a/keyanalyze/Makefile ++++ b/keyanalyze/Makefile +@@ -16,9 +16,8 @@ pgpring/pgpring: pgpring/config.status + $(MAKE) -C pgpring pgpring + + install: +- install pgpring/pgpring $(DESTDIR)/usr/bin +- install keyanalyze $(DESTDIR)/usr/bin +- install process_keys $(DESTDIR)/usr/bin ++ install -Dm755 {pgpring/pgpring,keyanalyze,process_keys} $(DESTDIR)/usr/bin ++ install -Dm644 {pgpring/pgpring,keyanalyze,process_keys}.1 -t ${DESTDIR}/usr/share/man/man1/ + + clean: + [ ! -f pgpring/Makefile ] || $(MAKE) -C pgpring distclean +diff --git a/keyart/Makefile b/keyart/Makefile +new file mode 100644 +index 0000000..0efc12c +--- /dev/null ++++ b/keyart/Makefile +@@ -0,0 +1,8 @@ ++all: ++ ++install: ++ install -Dm755 keyart -t $(DESTDIR)/usr/bin/ ++ install -Dm644 doc/keyart.1 -t ${DESTDIR}/usr/share/man/man1/ ++ install -Dm644 {README,doc/druken-bishop.txt,doc/party-worksheet} -t $(DESTDIR)/usr/share/doc/signing-party/gpgdir/ ++ ++clean: +diff --git a/keylookup/Makefile b/keylookup/Makefile +index dacd4db..4b91390 100644 +--- a/keylookup/Makefile ++++ b/keylookup/Makefile +@@ -1,9 +1,9 @@ + all: + + install: +- install -D keylookup $(DESTDIR)/usr/bin/keylookup +- install -D -m644 keylookup.1 $(DESTDIR)/usr/share/man/man1/keylookup.1 +- install -D -m644 NEWS \ +- $(DESTDIR)/usr/share/doc/signing-party/NEWS.keylookup ++ install -Dm755 keylookup -t $(DESTDIR)/usr/bin/ ++ install -Dm644 keylookup.1 -t $(DESTDIR)/usr/share/man/man1/ ++ install -Dm644 NEWS -t \ ++ $(DESTDIR)/usr/share/doc/signing-party/keylookup/NEWS + + clean: +diff --git a/sig2dot/Makefile b/sig2dot/Makefile +index 772207c..37d6665 100644 +--- a/sig2dot/Makefile ++++ b/sig2dot/Makefile +@@ -1,9 +1,9 @@ + all: + + install: +- install -D sig2dot $(DESTDIR)/usr/bin/sig2dot +- install -D -m644 sig2dot.1 $(DESTDIR)/usr/share/man/man1/sig2dot.1 +- install -D -m644 README.sig2dot \ +- $(DESTDIR)/usr/share/doc/signing-party/README.sig2dot ++ install -Dm755 sig2dot -t $(DESTDIR)/usr/bin/ ++ install -Dm644 sig2dot.1 -t $(DESTDIR)/usr/share/man/man1/ ++ install -Dm644 README.sig2dot \ ++ $(DESTDIR)/usr/share/doc/signing-party/sig2dot/README + + clean: +diff --git a/springgraph/Makefile b/springgraph/Makefile +index 8f174b7..d3ee8ab 100644 +--- a/springgraph/Makefile ++++ b/springgraph/Makefile +@@ -1,9 +1,9 @@ + all: + + install: +- install -D springgraph $(DESTDIR)/usr/bin/springgraph +- install -D -m644 springgraph.1 $(DESTDIR)/usr/share/man/man1/springgraph.1 +- install -D -m644 README.springgraph \ +- $(DESTDIR)/usr/share/doc/signing-party/README.springgraph ++ install -Dm755 springgraph -t $(DESTDIR)/usr/bin/ ++ install -Dm644 springgraph.1 -t $(DESTDIR)/usr/share/man/man1/ ++ install -Dm644 README.springgraph \ ++ $(DESTDIR)/usr/share/doc/signing-party/springgraph/README + + clean: diff --git a/srcpkgs/signing-party/template b/srcpkgs/signing-party/template new file mode 100644 index 000000000000..13fa5838e4a0 --- /dev/null +++ b/srcpkgs/signing-party/template @@ -0,0 +1,27 @@ +# Template file for 'signing-party' +pkgname=signing-party +version=2.11 +revision=1 +wrksrc="${pkgname}-v${version}" +build_style=gnu-makefile +hostmakedepends="perl autoconf automake" +makedepends="libmd-devel" +depends="perl-Class-MethodMaker perl-GnuPG-Interface perl-MailTools + perl-MIME-tools perl-Net-IDN-Encode perl-Term-ReadKey perl-Text-Template + qprint" # keyanalyze should be in here, but it's currently broken +short_desc="OpenPGP tools for signing keys, keyring analysis, and party preparation" +maintainer="Jan Christian Grünhage " +license="BSD-3-Clause, GPL-2.0-or-later, GPL-2.0-only, MIT, BSD-2-Clause, GPL-3.0-or-later" +homepage="https://salsa.debian.org/signing-party-team/signing-party" +distfiles="https://salsa.debian.org/${pkgname}-team/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.gz" +checksum=e339cfea9af6f12bf09de8aa6c8972c168d2eb712cb72a8a7415e3f7ecb43cf2 + +post_patch() { +# keyanalyze has built separately for crosscompiling to work. +# building keyanalyze is also broken right now, so it's not included so far + vsed -i Makefile -e 's/keyanalyze//' +} + +post_install() { + vlicense debian/copyright +} From 8d4253801ddd99c3e2447e0bd35ea8ed9994f8bf Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 12 Jul 2022 14:14:19 -0500 Subject: [PATCH 69/85] jc: update to 1.20.2. --- srcpkgs/jc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template index f47b5a00f270..a8cd52f09503 100644 --- a/srcpkgs/jc/template +++ b/srcpkgs/jc/template @@ -1,6 +1,6 @@ # Template file for 'jc' pkgname=jc -version=1.20.1 +version=1.20.2 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,4 +11,4 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/kellyjonbrazil/jc" distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=e0426fc0c9f687fdf1600f7503c14f0926234d6bdf316a84af204e3d2cb999ae +checksum=be7de5ab4b93c433ce9ff1012a79a8c9305ebe2e6b209f56d3428db296fac3c1 From bc87305f7eab8a501bd503b4d27a49da9c2dfcfd Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 12 Jul 2022 14:16:28 -0500 Subject: [PATCH 70/85] python3-rich: update to 12.5.1. --- srcpkgs/python3-rich/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template index 68730185f0bc..85c5abcc618f 100644 --- a/srcpkgs/python3-rich/template +++ b/srcpkgs/python3-rich/template @@ -1,6 +1,6 @@ # Template file for 'python3-rich' pkgname=python3-rich -version=12.4.4 +version=12.5.1 revision=1 wrksrc="rich-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/willmcgugan/rich" distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz" -checksum=4c586de507202505346f3e32d1363eb9ed6932f0c2f63184dea88983ff4971e2 +checksum=63a5c5ce3673d3d5fbbf23cd87e11ab84b6b451436f1b7f19ec54b6bc36ed7ca make_check=extended # some checks only work on windows post_install() { From bc36ef33bbfcfb0cb667f805238cb49807c0e7ea Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 12 Jul 2022 14:18:54 -0500 Subject: [PATCH 71/85] xlockmore: update to 5.70. --- srcpkgs/xlockmore/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template index c520c4d7b4c6..e9439016cf16 100644 --- a/srcpkgs/xlockmore/template +++ b/srcpkgs/xlockmore/template @@ -1,6 +1,6 @@ # Template file for 'xlockmore' pkgname=xlockmore -version=5.69 +version=5.70 revision=1 build_style=gnu-configure configure_args="--with-xinerama $(vopt_if opengl '--with-opengl --with-mesa')" @@ -13,7 +13,7 @@ license="MIT" homepage="http://sillycycle.com/xlockmore.html" changelog="http://sillycycle.com/xlock/xlockmore.README" distfiles="http://sillycycle.com/xlock/xlockmore-${version}.tar.xz" -checksum=ea92654c001226848765a251a73bcbc473ccef17b721cc18d5361f59dbd6d3b9 +checksum=0f3bcb9b802416cd87bb6e163a3843fea5d7fad90ff04838da122c292c3d0da2 CFLAGS="-D_DEFAULT_SOURCE" build_options="opengl" From 22bf95cf356bf1a09212733d775d447d011f70b0 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Wed, 6 Jul 2022 08:56:23 +0200 Subject: [PATCH 72/85] slack-desktop: update to 4.27.156 Closes: #37996 [via git-merge-pr] --- srcpkgs/slack-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template index 6b30c8158717..b78a5abb3960 100644 --- a/srcpkgs/slack-desktop/template +++ b/srcpkgs/slack-desktop/template @@ -1,6 +1,6 @@ # Template file for 'slack-desktop' pkgname=slack-desktop -version=4.27.154 +version=4.27.156 revision=1 archs="x86_64" hostmakedepends="tar xz" @@ -10,7 +10,7 @@ maintainer="Diogo Leal " license="custom:Proprietary" homepage="https://slack.com/" distfiles="https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb" -checksum=65c47c7312de88e6ecf3fcffcf494ca4c1ff2c41c472933a61b05d0713168b98 +checksum=ff1b43fbff8a1ad3ebe2f4099bc65ccefa723f17cc070d0e13b8734f31614acd restricted=yes repository="nonfree" nopie=yes From 67acab04a8fc6f4f22d528156c2fa16e03b52a3a Mon Sep 17 00:00:00 2001 From: John Date: Tue, 12 Jul 2022 23:49:43 +0200 Subject: [PATCH 73/85] Rocket.Chat-Desktop: actually use electron19 --- srcpkgs/Rocket.Chat-Desktop/files/Rocket.Chat-Desktop | 2 -- srcpkgs/Rocket.Chat-Desktop/template | 8 ++++++-- 2 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 srcpkgs/Rocket.Chat-Desktop/files/Rocket.Chat-Desktop diff --git a/srcpkgs/Rocket.Chat-Desktop/files/Rocket.Chat-Desktop b/srcpkgs/Rocket.Chat-Desktop/files/Rocket.Chat-Desktop deleted file mode 100644 index 214b977b5989..000000000000 --- a/srcpkgs/Rocket.Chat-Desktop/files/Rocket.Chat-Desktop +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec electron13 /usr/lib/Rocket.Chat-Desktop.asar "$@" diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template index 70e0bd7a7bc7..1390686f95c5 100644 --- a/srcpkgs/Rocket.Chat-Desktop/template +++ b/srcpkgs/Rocket.Chat-Desktop/template @@ -1,7 +1,7 @@ # Template file for 'Rocket.Chat-Desktop' pkgname=Rocket.Chat-Desktop version=3.8.7 -revision=1 +revision=2 _electron_ver=19 wrksrc="Rocket.Chat.Electron-${version}" hostmakedepends="yarn nodejs python3 pkg-config app-builder" @@ -39,7 +39,11 @@ do_build() { } do_install() { vinstall "${FILESDIR}/Rocket.Chat-Desktop.desktop" 644 usr/share/applications - vbin "$FILESDIR/Rocket.Chat-Desktop" + cat > Rocket.Chat-Desktop <<-EOF + #!/bin/sh + exec electron${_electron_ver} /usr/lib/Rocket.Chat-Desktop.asar "\$@" + EOF + vbin Rocket.Chat-Desktop vinstall build/icons/512x512.png 644 usr/share/icons/hicolor/512x512/apps Rocket.Chat-Desktop.png vlicense LICENSE vinstall "dist/linux-unpacked/resources/app.asar" 644 /usr/lib Rocket.Chat-Desktop.asar From 21cf64ec33e9516a7f14ce7c1b2b538342f4fbfb Mon Sep 17 00:00:00 2001 From: John Date: Tue, 12 Jul 2022 23:40:55 +0200 Subject: [PATCH 74/85] electron19: make sure to build as "official_build" Otherwise a bunch of optimization isn't enabled and a few debug things are enabled, which result in an overall more (or in this case extremely) unstable electron Thx to @q66 who pointed out that dchecks are enabled closes #38005 --- .../files/patches/chromium-sndio.patch | 877 ------------------ .../patches/electron-Build-fixes.patch.patch | 21 - srcpkgs/electron19/template | 17 +- 3 files changed, 13 insertions(+), 902 deletions(-) delete mode 100644 srcpkgs/electron19/files/patches/chromium-sndio.patch diff --git a/srcpkgs/electron19/files/patches/chromium-sndio.patch b/srcpkgs/electron19/files/patches/chromium-sndio.patch deleted file mode 100644 index bac8a63bc24f..000000000000 --- a/srcpkgs/electron19/files/patches/chromium-sndio.patch +++ /dev/null @@ -1,877 +0,0 @@ -diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn ---- a/media/BUILD.gn 2020-06-03 20:40:26.000000000 +0200 -+++ b/media/BUILD.gn 2020-06-13 17:32:28.510395975 +0200 -@@ -65,6 +65,9 @@ - defines += [ "DLOPEN_PULSEAUDIO" ] - } - } -+ if (use_sndio) { -+ defines += [ "USE_SNDIO" ] -+ } - if (use_cras) { - defines += [ "USE_CRAS" ] - } -diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn ---- a/media/audio/BUILD.gn 2020-06-03 20:39:37.000000000 +0200 -+++ b/media/audio/BUILD.gn 2020-06-13 17:32:28.511395969 +0200 -@@ -236,6 +236,17 @@ - sources += [ "linux/audio_manager_linux.cc" ] - } - -+ if (use_sndio) { -+ libs += [ "sndio" ] -+ sources += [ -+ "sndio/audio_manager_sndio.cc", -+ "sndio/sndio_input.cc", -+ "sndio/sndio_input.h", -+ "sndio/sndio_output.cc", -+ "sndio/sndio_output.h" -+ ] -+ } -+ - if (use_alsa) { - libs += [ "asound" ] - sources += [ -diff -Naur chromium-83.0.4103.97.orig/media/audio/linux/audio_manager_linux.cc chromium-83.0.4103.97/media/audio/linux/audio_manager_linux.cc ---- a/media/audio/linux/audio_manager_linux.cc 2020-06-03 20:39:37.000000000 +0200 -+++ b/media/audio/linux/audio_manager_linux.cc 2020-06-13 18:09:43.623333167 +0200 -@@ -19,6 +19,11 @@ - #include "media/audio/pulse/audio_manager_pulse.h" - #include "media/audio/pulse/pulse_util.h" - #endif -+#if defined(USE_SNDIO) -+#include "media/audio/sndio/audio_manager_sndio.h" -+#include "media/audio/sndio/sndio_input.h" -+#include "media/audio/sndio/sndio_output.h" -+#endif - - namespace media { - - std::unique_ptr CreateAudioManager( -@@ -39,6 +45,16 @@ - audio_log_factory); - } - -+#if defined(USE_SNDIO) -+ struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0); -+ if (hdl != NULL) { -+ sio_close(hdl); -+ UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1); -+ return std::make_unique(std::move(audio_thread), -+ audio_log_factory); -+ } -+#endif -+ - #if defined(USE_CRAS) - if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) { - UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1); -diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.cc chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.cc ---- a/media/audio/sndio/audio_manager_sndio.cc 1970-01-01 01:00:00.000000000 +0100 -+++ b/media/audio/sndio/audio_manager_sndio.cc 2020-06-13 17:32:28.511395969 +0200 -@@ -0,0 +1,148 @@ -+// Copyright (c) 2012 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#include "media/audio/sndio/audio_manager_sndio.h" -+ -+#include "base/metrics/histogram_macros.h" -+#include "base/memory/ptr_util.h" -+#include "media/audio/audio_device_description.h" -+#include "media/audio/audio_output_dispatcher.h" -+#include "media/audio/sndio/sndio_input.h" -+#include "media/audio/sndio/sndio_output.h" -+#include "media/base/limits.h" -+#include "media/base/media_switches.h" -+ -+namespace media { -+ -+ -+// Maximum number of output streams that can be open simultaneously. -+static const int kMaxOutputStreams = 4; -+ -+// Default sample rate for input and output streams. -+static const int kDefaultSampleRate = 48000; -+ -+void AddDefaultDevice(AudioDeviceNames* device_names) { -+ DCHECK(device_names->empty()); -+ device_names->push_front(AudioDeviceName::CreateDefault()); -+} -+ -+bool AudioManagerSndio::HasAudioOutputDevices() { -+ return true; -+} -+ -+bool AudioManagerSndio::HasAudioInputDevices() { -+ return true; -+} -+ -+void AudioManagerSndio::GetAudioInputDeviceNames( -+ AudioDeviceNames* device_names) { -+ DCHECK(device_names->empty()); -+ AddDefaultDevice(device_names); -+} -+ -+void AudioManagerSndio::GetAudioOutputDeviceNames( -+ AudioDeviceNames* device_names) { -+ AddDefaultDevice(device_names); -+} -+ -+const char* AudioManagerSndio::GetName() { -+ return "SNDIO"; -+} -+ -+AudioParameters AudioManagerSndio::GetInputStreamParameters( -+ const std::string& device_id) { -+ static const int kDefaultInputBufferSize = 1024; -+ -+ int user_buffer_size = GetUserBufferSize(); -+ int buffer_size = user_buffer_size ? -+ user_buffer_size : kDefaultInputBufferSize; -+ -+ return AudioParameters( -+ AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, -+ kDefaultSampleRate, buffer_size); -+} -+ -+AudioManagerSndio::AudioManagerSndio(std::unique_ptr audio_thread, -+ AudioLogFactory* audio_log_factory) -+ : AudioManagerBase(std::move(audio_thread), -+ audio_log_factory) { -+ DLOG(WARNING) << "AudioManagerSndio"; -+ SetMaxOutputStreamsAllowed(kMaxOutputStreams); -+} -+ -+AudioManagerSndio::~AudioManagerSndio() { -+ Shutdown(); -+} -+ -+AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream( -+ const AudioParameters& params, -+ const LogCallback& log_callback) { -+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); -+ return MakeOutputStream(params); -+} -+ -+AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream( -+ const AudioParameters& params, -+ const std::string& device_id, -+ const LogCallback& log_callback) { -+ DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!"; -+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); -+ return MakeOutputStream(params); -+} -+ -+AudioInputStream* AudioManagerSndio::MakeLinearInputStream( -+ const AudioParameters& params, -+ const std::string& device_id, -+ const LogCallback& log_callback) { -+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); -+ return MakeInputStream(params); -+} -+ -+AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream( -+ const AudioParameters& params, -+ const std::string& device_id, -+ const LogCallback& log_callback) { -+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); -+ return MakeInputStream(params); -+} -+ -+AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters( -+ const std::string& output_device_id, -+ const AudioParameters& input_params) { -+ // TODO(tommi): Support |output_device_id|. -+ DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!"; -+ static const int kDefaultOutputBufferSize = 2048; -+ -+ ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; -+ int sample_rate = kDefaultSampleRate; -+ int buffer_size = kDefaultOutputBufferSize; -+ if (input_params.IsValid()) { -+ sample_rate = input_params.sample_rate(); -+ channel_layout = input_params.channel_layout(); -+ buffer_size = std::min(buffer_size, input_params.frames_per_buffer()); -+ } -+ -+ int user_buffer_size = GetUserBufferSize(); -+ if (user_buffer_size) -+ buffer_size = user_buffer_size; -+ -+ return AudioParameters( -+ AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, -+ sample_rate, buffer_size); -+} -+ -+AudioInputStream* AudioManagerSndio::MakeInputStream( -+ const AudioParameters& params) { -+ DLOG(WARNING) << "MakeInputStream"; -+ return new SndioAudioInputStream(this, -+ AudioDeviceDescription::kDefaultDeviceId, params); -+} -+ -+AudioOutputStream* AudioManagerSndio::MakeOutputStream( -+ const AudioParameters& params) { -+ DLOG(WARNING) << "MakeOutputStream"; -+ return new SndioAudioOutputStream(params, this); -+} -+ -+} // namespace media -diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.h chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.h ---- a/media/audio/sndio/audio_manager_sndio.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/media/audio/sndio/audio_manager_sndio.h 2020-06-13 17:32:28.511395969 +0200 -@@ -0,0 +1,65 @@ -+// Copyright (c) 2012 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_ -+#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_ -+ -+#include -+ -+#include "base/compiler_specific.h" -+#include "base/macros.h" -+#include "base/memory/ref_counted.h" -+#include "base/threading/thread.h" -+#include "media/audio/audio_manager_base.h" -+ -+namespace media { -+ -+class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase { -+ public: -+ AudioManagerSndio(std::unique_ptr audio_thread, -+ AudioLogFactory* audio_log_factory); -+ ~AudioManagerSndio() override; -+ -+ // Implementation of AudioManager. -+ bool HasAudioOutputDevices() override; -+ bool HasAudioInputDevices() override; -+ void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override; -+ void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; -+ AudioParameters GetInputStreamParameters( -+ const std::string& device_id) override; -+ const char* GetName() override; -+ -+ // Implementation of AudioManagerBase. -+ AudioOutputStream* MakeLinearOutputStream( -+ const AudioParameters& params, -+ const LogCallback& log_callback) override; -+ AudioOutputStream* MakeLowLatencyOutputStream( -+ const AudioParameters& params, -+ const std::string& device_id, -+ const LogCallback& log_callback) override; -+ AudioInputStream* MakeLinearInputStream( -+ const AudioParameters& params, -+ const std::string& device_id, -+ const LogCallback& log_callback) override; -+ AudioInputStream* MakeLowLatencyInputStream( -+ const AudioParameters& params, -+ const std::string& device_id, -+ const LogCallback& log_callback) override; -+ -+ protected: -+ AudioParameters GetPreferredOutputStreamParameters( -+ const std::string& output_device_id, -+ const AudioParameters& input_params) override; -+ -+ private: -+ // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream. -+ AudioOutputStream* MakeOutputStream(const AudioParameters& params); -+ AudioInputStream* MakeInputStream(const AudioParameters& params); -+ -+ DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio); -+}; -+ -+} // namespace media -+ -+#endif // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_ -diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.cc chromium-83.0.4103.97/media/audio/sndio/sndio_input.cc ---- a/media/audio/sndio/sndio_input.cc 1970-01-01 01:00:00.000000000 +0100 -+++ b/media/audio/sndio/sndio_input.cc 2020-06-13 17:32:28.511395969 +0200 -@@ -0,0 +1,200 @@ -+// Copyright 2013 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#include "base/bind.h" -+#include "base/logging.h" -+#include "base/macros.h" -+#include "media/base/audio_timestamp_helper.h" -+#include "media/audio/sndio/audio_manager_sndio.h" -+#include "media/audio/audio_manager.h" -+#include "media/audio/sndio/sndio_input.h" -+ -+namespace media { -+ -+static const SampleFormat kSampleFormat = kSampleFormatS16; -+ -+void SndioAudioInputStream::OnMoveCallback(void *arg, int delta) -+{ -+ SndioAudioInputStream* self = static_cast(arg); -+ -+ self->hw_delay += delta; -+} -+ -+void *SndioAudioInputStream::ThreadEntry(void *arg) { -+ SndioAudioInputStream* self = static_cast(arg); -+ -+ self->ThreadLoop(); -+ return NULL; -+} -+ -+SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager, -+ const std::string& device_name, -+ const AudioParameters& params) -+ : manager(manager), -+ params(params), -+ audio_bus(AudioBus::Create(params)), -+ state(kClosed) { -+} -+ -+SndioAudioInputStream::~SndioAudioInputStream() { -+ if (state != kClosed) -+ Close(); -+} -+ -+bool SndioAudioInputStream::Open() { -+ struct sio_par par; -+ int sig; -+ -+ if (state != kClosed) -+ return false; -+ -+ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR && -+ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) { -+ LOG(WARNING) << "Unsupported audio format."; -+ return false; -+ } -+ -+ sio_initpar(&par); -+ par.rate = params.sample_rate(); -+ par.rchan = params.channels(); -+ par.bits = SampleFormatToBitsPerChannel(kSampleFormat); -+ par.bps = par.bits / 8; -+ par.sig = sig = par.bits != 8 ? 1 : 0; -+ par.le = SIO_LE_NATIVE; -+ par.appbufsz = params.frames_per_buffer(); -+ -+ hdl = sio_open(SIO_DEVANY, SIO_REC, 0); -+ -+ if (hdl == NULL) { -+ LOG(ERROR) << "Couldn't open audio device."; -+ return false; -+ } -+ -+ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) { -+ LOG(ERROR) << "Couldn't set audio parameters."; -+ goto bad_close; -+ } -+ -+ if (par.rate != (unsigned int)params.sample_rate() || -+ par.rchan != (unsigned int)params.channels() || -+ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) || -+ par.sig != (unsigned int)sig || -+ (par.bps > 1 && par.le != SIO_LE_NATIVE) || -+ (par.bits != par.bps * 8)) { -+ LOG(ERROR) << "Unsupported audio parameters."; -+ goto bad_close; -+ } -+ state = kStopped; -+ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; -+ sio_onmove(hdl, &OnMoveCallback, this); -+ return true; -+bad_close: -+ sio_close(hdl); -+ return false; -+} -+ -+void SndioAudioInputStream::Start(AudioInputCallback* cb) { -+ -+ StartAgc(); -+ -+ state = kRunning; -+ hw_delay = 0; -+ callback = cb; -+ sio_start(hdl); -+ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) { -+ LOG(ERROR) << "Failed to create real-time thread for recording."; -+ sio_stop(hdl); -+ state = kStopped; -+ } -+} -+ -+void SndioAudioInputStream::Stop() { -+ -+ if (state == kStopped) -+ return; -+ -+ state = kStopWait; -+ pthread_join(thread, NULL); -+ sio_stop(hdl); -+ state = kStopped; -+ -+ StopAgc(); -+} -+ -+void SndioAudioInputStream::Close() { -+ -+ if (state == kClosed) -+ return; -+ -+ if (state == kRunning) -+ Stop(); -+ -+ state = kClosed; -+ delete [] buffer; -+ sio_close(hdl); -+ -+ manager->ReleaseInputStream(this); -+} -+ -+double SndioAudioInputStream::GetMaxVolume() { -+ // Not supported -+ return 0.0; -+} -+ -+void SndioAudioInputStream::SetVolume(double volume) { -+ // Not supported. Do nothing. -+} -+ -+double SndioAudioInputStream::GetVolume() { -+ // Not supported. -+ return 0.0; -+} -+ -+bool SndioAudioInputStream::IsMuted() { -+ // Not supported. -+ return false; -+} -+ -+void SndioAudioInputStream::SetOutputDeviceForAec( -+ const std::string& output_device_id) { -+ // Not supported. -+} -+ -+void SndioAudioInputStream::ThreadLoop(void) { -+ size_t todo, n; -+ char *data; -+ unsigned int nframes; -+ double normalized_volume = 0.0; -+ -+ nframes = audio_bus->frames(); -+ -+ while (state == kRunning && !sio_eof(hdl)) { -+ -+ GetAgcVolume(&normalized_volume); -+ -+ // read one block -+ todo = nframes * params.GetBytesPerFrame(kSampleFormat); -+ data = buffer; -+ while (todo > 0) { -+ n = sio_read(hdl, data, todo); -+ if (n == 0) -+ return; // unrecoverable I/O error -+ todo -= n; -+ data += n; -+ } -+ hw_delay -= nframes; -+ -+ // convert frames count to TimeDelta -+ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, -+ params.sample_rate()); -+ -+ // push into bus -+ audio_bus->FromInterleaved(reinterpret_cast(buffer), nframes); -+ -+ // invoke callback -+ callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.); -+ } -+} -+ -+} // namespace media -diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.h chromium-83.0.4103.97/media/audio/sndio/sndio_input.h ---- a/media/audio/sndio/sndio_input.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/media/audio/sndio/sndio_input.h 2020-06-13 17:32:28.511395969 +0200 -@@ -0,0 +1,91 @@ -+// Copyright 2013 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_ -+#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_ -+ -+#include -+#include -+#include -+ -+#include "base/compiler_specific.h" -+#include "base/macros.h" -+#include "base/memory/weak_ptr.h" -+#include "base/time/time.h" -+#include "media/audio/agc_audio_stream.h" -+#include "media/audio/audio_io.h" -+#include "media/audio/audio_device_description.h" -+#include "media/base/audio_parameters.h" -+ -+namespace media { -+ -+class AudioManagerBase; -+ -+// Implementation of AudioOutputStream using sndio(7) -+class SndioAudioInputStream : public AgcAudioStream { -+ public: -+ // Pass this to the constructor if you want to attempt auto-selection -+ // of the audio recording device. -+ static const char kAutoSelectDevice[]; -+ -+ // Create a PCM Output stream for the SNDIO device identified by -+ // |device_name|. If unsure of what to use for |device_name|, use -+ // |kAutoSelectDevice|. -+ SndioAudioInputStream(AudioManagerBase* audio_manager, -+ const std::string& device_name, -+ const AudioParameters& params); -+ -+ ~SndioAudioInputStream() override; -+ -+ // Implementation of AudioInputStream. -+ bool Open() override; -+ void Start(AudioInputCallback* callback) override; -+ void Stop() override; -+ void Close() override; -+ double GetMaxVolume() override; -+ void SetVolume(double volume) override; -+ double GetVolume() override; -+ bool IsMuted() override; -+ void SetOutputDeviceForAec(const std::string& output_device_id) override; -+ -+ private: -+ -+ enum StreamState { -+ kClosed, // Not opened yet -+ kStopped, // Device opened, but not started yet -+ kRunning, // Started, device playing -+ kStopWait // Stopping, waiting for the real-time thread to exit -+ }; -+ -+ // C-style call-backs -+ static void OnMoveCallback(void *arg, int delta); -+ static void* ThreadEntry(void *arg); -+ -+ // Continuously moves data from the device to the consumer -+ void ThreadLoop(); -+ // Our creator, the audio manager needs to be notified when we close. -+ AudioManagerBase* manager; -+ // Parameters of the source -+ AudioParameters params; -+ // We store data here for consumer -+ std::unique_ptr audio_bus; -+ // Call-back that consumes recorded data -+ AudioInputCallback* callback; // Valid during a recording session. -+ // Handle of the audio device -+ struct sio_hdl* hdl; -+ // Current state of the stream -+ enum StreamState state; -+ // High priority thread running ThreadLoop() -+ pthread_t thread; -+ // Number of frames buffered in the hardware -+ int hw_delay; -+ // Temporary buffer where data is stored sndio-compatible format -+ char* buffer; -+ -+ DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream); -+}; -+ -+} // namespace media -+ -+#endif // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_ -diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.cc chromium-83.0.4103.97/media/audio/sndio/sndio_output.cc ---- a/media/audio/sndio/sndio_output.cc 1970-01-01 01:00:00.000000000 +0100 -+++ b/media/audio/sndio/sndio_output.cc 2020-06-13 17:32:28.511395969 +0200 -@@ -0,0 +1,183 @@ -+// Copyright (c) 2012 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#include "base/logging.h" -+#include "base/time/time.h" -+#include "base/time/default_tick_clock.h" -+#include "media/audio/audio_manager_base.h" -+#include "media/base/audio_timestamp_helper.h" -+#include "media/audio/sndio/sndio_output.h" -+ -+namespace media { -+ -+static const SampleFormat kSampleFormat = kSampleFormatS16; -+ -+void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) { -+ SndioAudioOutputStream* self = static_cast(arg); -+ -+ self->hw_delay -= delta; -+} -+ -+void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) { -+ SndioAudioOutputStream* self = static_cast(arg); -+ -+ self->vol = vol; -+} -+ -+void *SndioAudioOutputStream::ThreadEntry(void *arg) { -+ SndioAudioOutputStream* self = static_cast(arg); -+ -+ self->ThreadLoop(); -+ return NULL; -+} -+ -+SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params, -+ AudioManagerBase* manager) -+ : manager(manager), -+ params(params), -+ audio_bus(AudioBus::Create(params)), -+ state(kClosed), -+ mutex(PTHREAD_MUTEX_INITIALIZER) { -+} -+ -+SndioAudioOutputStream::~SndioAudioOutputStream() { -+ if (state != kClosed) -+ Close(); -+} -+ -+bool SndioAudioOutputStream::Open() { -+ struct sio_par par; -+ int sig; -+ -+ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR && -+ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) { -+ LOG(WARNING) << "Unsupported audio format."; -+ return false; -+ } -+ sio_initpar(&par); -+ par.rate = params.sample_rate(); -+ par.pchan = params.channels(); -+ par.bits = SampleFormatToBitsPerChannel(kSampleFormat); -+ par.bps = par.bits / 8; -+ par.sig = sig = par.bits != 8 ? 1 : 0; -+ par.le = SIO_LE_NATIVE; -+ par.appbufsz = params.frames_per_buffer(); -+ -+ hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0); -+ if (hdl == NULL) { -+ LOG(ERROR) << "Couldn't open audio device."; -+ return false; -+ } -+ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) { -+ LOG(ERROR) << "Couldn't set audio parameters."; -+ goto bad_close; -+ } -+ if (par.rate != (unsigned int)params.sample_rate() || -+ par.pchan != (unsigned int)params.channels() || -+ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) || -+ par.sig != (unsigned int)sig || -+ (par.bps > 1 && par.le != SIO_LE_NATIVE) || -+ (par.bits != par.bps * 8)) { -+ LOG(ERROR) << "Unsupported audio parameters."; -+ goto bad_close; -+ } -+ state = kStopped; -+ volpending = 0; -+ vol = 0; -+ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; -+ sio_onmove(hdl, &OnMoveCallback, this); -+ sio_onvol(hdl, &OnVolCallback, this); -+ return true; -+ bad_close: -+ sio_close(hdl); -+ return false; -+} -+ -+void SndioAudioOutputStream::Close() { -+ if (state == kClosed) -+ return; -+ if (state == kRunning) -+ Stop(); -+ state = kClosed; -+ delete [] buffer; -+ sio_close(hdl); -+ manager->ReleaseOutputStream(this); // Calls the destructor -+} -+ -+void SndioAudioOutputStream::Start(AudioSourceCallback* callback) { -+ state = kRunning; -+ hw_delay = 0; -+ source = callback; -+ sio_start(hdl); -+ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) { -+ LOG(ERROR) << "Failed to create real-time thread."; -+ sio_stop(hdl); -+ state = kStopped; -+ } -+} -+ -+void SndioAudioOutputStream::Stop() { -+ if (state == kStopped) -+ return; -+ state = kStopWait; -+ pthread_join(thread, NULL); -+ sio_stop(hdl); -+ state = kStopped; -+} -+ -+void SndioAudioOutputStream::SetVolume(double v) { -+ pthread_mutex_lock(&mutex); -+ vol = v * SIO_MAXVOL; -+ volpending = 1; -+ pthread_mutex_unlock(&mutex); -+} -+ -+void SndioAudioOutputStream::GetVolume(double* v) { -+ pthread_mutex_lock(&mutex); -+ *v = vol * (1. / SIO_MAXVOL); -+ pthread_mutex_unlock(&mutex); -+} -+ -+// This stream is always used with sub second buffer sizes, where it's -+// sufficient to simply always flush upon Start(). -+void SndioAudioOutputStream::Flush() {} -+ -+void SndioAudioOutputStream::ThreadLoop(void) { -+ int avail, count, result; -+ -+ while (state == kRunning) { -+ // Update volume if needed -+ pthread_mutex_lock(&mutex); -+ if (volpending) { -+ volpending = 0; -+ sio_setvol(hdl, vol); -+ } -+ pthread_mutex_unlock(&mutex); -+ -+ // Get data to play -+ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, -+ params.sample_rate()); -+ count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get()); -+ audio_bus->ToInterleaved(count, reinterpret_cast(buffer)); -+ if (count == 0) { -+ // We have to submit something to the device -+ count = audio_bus->frames(); -+ memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat)); -+ LOG(WARNING) << "No data to play, running empty cycle."; -+ } -+ -+ // Submit data to the device -+ avail = count * params.GetBytesPerFrame(kSampleFormat); -+ result = sio_write(hdl, buffer, avail); -+ if (result == 0) { -+ LOG(WARNING) << "Audio device disconnected."; -+ break; -+ } -+ -+ // Update hardware pointer -+ hw_delay += count; -+ } -+} -+ -+} // namespace media -diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-83.0.4103.97/media/audio/sndio/sndio_output.h ---- a/media/audio/sndio/sndio_output.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/media/audio/sndio/sndio_output.h 2020-06-13 17:32:28.511395969 +0200 -@@ -0,0 +1,86 @@ -+// Copyright (c) 2012 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ -+#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ -+ -+#include -+#include -+ -+#include "base/time/tick_clock.h" -+#include "base/time/time.h" -+#include "media/audio/audio_io.h" -+ -+namespace media { -+ -+class AudioManagerBase; -+ -+// Implementation of AudioOutputStream using sndio(7) -+class SndioAudioOutputStream : public AudioOutputStream { -+ public: -+ // The manager is creating this object -+ SndioAudioOutputStream(const AudioParameters& params, -+ AudioManagerBase* manager); -+ virtual ~SndioAudioOutputStream(); -+ -+ // Implementation of AudioOutputStream. -+ bool Open() override; -+ void Close() override; -+ void Start(AudioSourceCallback* callback) override; -+ void Stop() override; -+ void SetVolume(double volume) override; -+ void GetVolume(double* volume) override; -+ void Flush() override; -+ -+ friend void sndio_onmove(void *arg, int delta); -+ friend void sndio_onvol(void *arg, unsigned int vol); -+ friend void *sndio_threadstart(void *arg); -+ -+ private: -+ enum StreamState { -+ kClosed, // Not opened yet -+ kStopped, // Device opened, but not started yet -+ kRunning, // Started, device playing -+ kStopWait // Stopping, waiting for the real-time thread to exit -+ }; -+ -+ // C-style call-backs -+ static void OnMoveCallback(void *arg, int delta); -+ static void OnVolCallback(void *arg, unsigned int vol); -+ static void* ThreadEntry(void *arg); -+ -+ // Continuously moves data from the producer to the device -+ void ThreadLoop(void); -+ -+ // Our creator, the audio manager needs to be notified when we close. -+ AudioManagerBase* manager; -+ // Parameters of the source -+ AudioParameters params; -+ // Source stores data here -+ std::unique_ptr audio_bus; -+ // Call-back that produces data to play -+ AudioSourceCallback* source; -+ // Handle of the audio device -+ struct sio_hdl* hdl; -+ // Current state of the stream -+ enum StreamState state; -+ // High priority thread running ThreadLoop() -+ pthread_t thread; -+ // Protects vol, volpending and hw_delay -+ pthread_mutex_t mutex; -+ // Current volume in the 0..SIO_MAXVOL range -+ int vol; -+ // Set to 1 if volumes must be refreshed in the realtime thread -+ int volpending; -+ // Number of frames buffered in the hardware -+ int hw_delay; -+ // Temporary buffer where data is stored sndio-compatible format -+ char* buffer; -+ -+ DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream); -+}; -+ -+} // namespace media -+ -+#endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ -diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni ---- a/media/media_options.gni 2020-06-03 20:40:26.000000000 +0200 -+++ b/media/media_options.gni 2020-06-13 17:32:28.512395963 +0200 -@@ -119,6 +119,9 @@ - # Enables runtime selection of ALSA library for audio. - use_alsa = false - -+ # Enable runtime selection of sndio(7) -+ use_sndio = false -+ - # Alsa should be used on non-Android, non-Mac POSIX systems. - # Alsa should be used on desktop Chromecast and audio-only Chromecast builds. - if (is_posix && !is_android && !is_mac && diff --git a/srcpkgs/electron19/files/patches/electron-Build-fixes.patch.patch b/srcpkgs/electron19/files/patches/electron-Build-fixes.patch.patch index f0036676458f..a98ee020d34a 100644 --- a/srcpkgs/electron19/files/patches/electron-Build-fixes.patch.patch +++ b/srcpkgs/electron19/files/patches/electron-Build-fixes.patch.patch @@ -1,24 +1,3 @@ -diff --git a/build/args/release.gn b/build/args/release.gn -index e5017f6e1..59207b389 100644 ---- a/build/args/release.gn -+++ b/build/args/release.gn -@@ -1,6 +1,4 @@ - import("all.gn") --is_component_build = false --is_official_build = true - - # This may be guarded behind is_chrome_branded alongside - # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321, -@@ -8,9 +6,3 @@ is_official_build = true - # The initialization of the decoder depends on whether ffmpeg has - # been built with H.264 support. - rtc_use_h264 = proprietary_codecs -- --# By default, Electron builds ffmpeg with proprietary codecs enabled. In order --# to facilitate users who don't want to ship proprietary codecs in ffmpeg, or --# who have an LGPL requirement to ship ffmpeg as a dynamically linked library, --# we build ffmpeg as a shared library. --is_component_ffmpeg = true diff --git a/build/npm.gni b/build/npm.gni index a1987d095..fb33a14c3 100644 --- a/build/npm.gni diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template index 1a8fbb2820ad..c7cb81120d41 100644 --- a/srcpkgs/electron19/template +++ b/srcpkgs/electron19/template @@ -1,13 +1,13 @@ # Template file for 'electron19' pkgname=electron19 version=19.0.8 -revision=1 +revision=2 _nodever=16.14.2 _chromiumver=102.0.5005.125 archs="x86_64* aarch64* ppc64le*" create_wrksrc=yes build_wrksrc="src" -hostmakedepends="$(vopt_if clang clang) python pkgconf perl gperf bison ninja nodejs hwids +hostmakedepends="$(vopt_if clang "clang lld") python pkgconf perl gperf bison ninja nodejs hwids libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel pciutils-devel libatomic-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel @@ -185,6 +185,8 @@ post_patch() { cd "$wrksrc" done fi + vsed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ + src/tools/generate_shim_headers/generate_shim_headers.py } pre_configure() { @@ -300,6 +302,7 @@ do_configure() { fi conf+=( + 'import("//electron/build/args/release.gn")' 'blink_symbol_level=0' 'clang_use_chrome_plugins=false' 'custom_toolchain="//build/toolchain/linux/unbundle:default"' @@ -353,15 +356,21 @@ do_configure() { 'use_custom_libcxx=false' 'use_gnome_keyring=false' 'use_gold=false' - 'use_lld=false' + "use_lld=$(vopt_if clang true false)" + + 'is_cfi=false' + 'use_thin_lto=false' + 'use_cfi_icall=false' + 'chrome_pgo_phase=0' + 'use_system_libwayland=true' "use_pulseaudio=$(vopt_if pulseaudio 'true' 'false')" "rtc_use_pipewire=$(vopt_if pipewire true false)" 'use_sysroot=false' 'use_system_harfbuzz=true' + 'is_component_ffmpeg=false' "target_cpu=\"$target_arch\"" "host_cpu=\"$host_arch\"" - 'import("//electron/build/args/release.gn")' ) msg_normal "Configuring build\n" From d48124074b5078584d704a586ead88128c9def0a Mon Sep 17 00:00:00 2001 From: Laurence de Bruxelles Date: Sun, 10 Jul 2022 16:55:44 +0100 Subject: [PATCH 75/85] perl-Mail-Message: update to 3.012. --- srcpkgs/perl-Mail-Message/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/perl-Mail-Message/template b/srcpkgs/perl-Mail-Message/template index b71b27eb347f..50e1c87a8e0e 100644 --- a/srcpkgs/perl-Mail-Message/template +++ b/srcpkgs/perl-Mail-Message/template @@ -1,7 +1,7 @@ # Template file for 'perl-Mail-Message' pkgname=perl-Mail-Message -version=3.009 -revision=2 +version=3.012 +revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" @@ -12,4 +12,4 @@ maintainer="Zach Dykstra " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Mail-Message" distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz" -checksum=39d2cf98a24f786c119ff04df9b44662970bc2110d1bc6ad33ba64c06d97cf1a +checksum=e92b0020e0cb11cca92f93df9dd32441d78b84a3c4b72094c0a70310253cac9e From 6ddf7bc9ef89cb69f48fd7291cb1625679ff902f Mon Sep 17 00:00:00 2001 From: Laurence de Bruxelles Date: Sun, 10 Jul 2022 16:56:36 +0100 Subject: [PATCH 76/85] perl-Mail-Transport: update to 3.005. --- srcpkgs/perl-Mail-Transport/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/perl-Mail-Transport/template b/srcpkgs/perl-Mail-Transport/template index 18a9eb449c86..d4b17af63d8f 100644 --- a/srcpkgs/perl-Mail-Transport/template +++ b/srcpkgs/perl-Mail-Transport/template @@ -1,7 +1,7 @@ # Template file for 'perl-Mail-Transport' pkgname=perl-Mail-Transport -version=3.004 -revision=2 +version=3.005 +revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" @@ -12,4 +12,4 @@ maintainer="Orphaned " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Mail-Transport" distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz" -checksum=cf315a09f617e881c01318069054ef9f17ef947ffbbc5ced2f1b00ebbad43d11 +checksum=d0dcb93f705c1285d808e34de7d86dbe28d1ed66aa2a7de830f6651fc35196a3 From 160815e8c6dd34532b9f33ef64b9ff00bef33628 Mon Sep 17 00:00:00 2001 From: Laurence de Bruxelles Date: Sun, 10 Jul 2022 16:56:53 +0100 Subject: [PATCH 77/85] perl-Mail-Box: update to 3.009. --- srcpkgs/perl-Mail-Box/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/perl-Mail-Box/template b/srcpkgs/perl-Mail-Box/template index e7ba48ded419..fbdb119597b5 100644 --- a/srcpkgs/perl-Mail-Box/template +++ b/srcpkgs/perl-Mail-Box/template @@ -1,7 +1,7 @@ # Template file for 'perl-Mail-Box' pkgname=perl-Mail-Box -version=3.008 -revision=2 +version=3.009 +revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" @@ -16,4 +16,4 @@ maintainer="Alessio Sergi " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Mail-Box" distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz" -checksum=b51a50945db1335503e1414d76dcc74e669c4179ea07852f9800b270d5c0d297 +checksum=9185216b0e14c919ec2384769525559491ed7d56d27adb1bc985a1fbeb799165 From cee1e958340bfb1a373b104641628b0cdbb4fb3f Mon Sep 17 00:00:00 2001 From: Johannes Date: Tue, 12 Jul 2022 23:22:56 +0200 Subject: [PATCH 78/85] perl-Crypt-OpenSSL-RSA: update to 0.33. --- srcpkgs/perl-Crypt-OpenSSL-RSA/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template index ea269e56a06e..3a239a93a6c9 100644 --- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template +++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template @@ -1,16 +1,16 @@ # Template file for 'perl-Crypt-OpenSSL-RSA' pkgname=perl-Crypt-OpenSSL-RSA -version=0.32 +version=0.33 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl perl-Crypt-OpenSSL-Guess" makedepends="perl openssl-devel" depends="perl" -checkdepends="perl-Crypt-OpenSSL-Random" +checkdepends="perl-Crypt-OpenSSL-Random perl-Crypt-OpenSSL-Bignum" short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding" maintainer="johannes " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Crypt-OpenSSL-RSA" distfiles="${CPAN_SITE}/Crypt/Crypt-OpenSSL-RSA-${version}.tar.gz" -checksum=adc74f0ae125c77f65d5dd32abb9c3429300a79543bf263494f333f9c0b62a61 +checksum=bdbe630f6d6f540325746ad99977272ac8664ff81bd19f0adaba6d6f45efd864 From 92f1246964761bb9b7765b582a05f5ed68398a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 13 Jul 2022 08:01:42 +0700 Subject: [PATCH 79/85] git: update to 2.37.1. --- srcpkgs/git/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 2f22f5ae5bf7..5b91f7571d8b 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,6 +1,6 @@ # Template file for 'git' pkgname=git -version=2.37.0 +version=2.37.1 revision=1 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto" makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel" @@ -14,7 +14,7 @@ license="GPL-2.0-only" homepage="https://git-scm.com/" changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=9f7fa1711bd00c4ec3dde2fe44407dc13f12e4772b5e3c72a58db4c07495411f +checksum=c8162c6b8b8f1c5db706ab01b4ee29e31061182135dc27c4860224aaec1b3500 replaces="git-perl>=0" register_shell=/usr/bin/git-shell python_version=3 From 717d9b5d13b72fdec583cc5a0514b1bbd7bc5324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 13 Jul 2022 08:02:23 +0700 Subject: [PATCH 80/85] chroot-git: update to 2.37.1. --- srcpkgs/chroot-git/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index 18efb65c4f67..82387bce60ae 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -1,6 +1,6 @@ # Template file for 'chroot-git' pkgname=chroot-git -version=2.35.3 +version=2.37.1 revision=1 bootstrap=yes wrksrc="git-${version}" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://git-scm.com/" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2 +checksum=c8162c6b8b8f1c5db706ab01b4ee29e31061182135dc27c4860224aaec1b3500 if [ "$CHROOT_READY" ]; then checkdepends="perl gnupg" From 90a79e7f1f0e112c6af9ced404e6ba825432d9db Mon Sep 17 00:00:00 2001 From: Toby Merz Date: Wed, 13 Jul 2022 08:45:20 +0200 Subject: [PATCH 81/85] vscode: update to 1.69.1. --- srcpkgs/vscode/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 9f11f7989152..9fc54b70d9e9 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.69.0 +version=1.69.1 revision=1 _electronver=19.0.8 _npmver=8.6.0 @@ -12,7 +12,7 @@ maintainer="shizonic , Alex Lohr " license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/microsoft/vscode/archive/refs/tags/${version}.tar.gz" -checksum=982af5d93198b5437c3c211276c7b5fd7e3ecf19359c9605df2d6feddee93151 +checksum=497187731a0cd6ea8641cd762aaf4c77873d926a855c9b71a72e30a51e7cd521 nocross=yes # x64 build does not cut it, it contains native code if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then From 5a4971a26e5e99d9056e5e9723034db6c5e3ca8b Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 13 Jul 2022 14:43:51 +0200 Subject: [PATCH 82/85] font-util: update to 1.3.3. --- srcpkgs/font-util/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/font-util/template b/srcpkgs/font-util/template index 5b9946003b58..465510dcd53c 100644 --- a/srcpkgs/font-util/template +++ b/srcpkgs/font-util/template @@ -1,6 +1,6 @@ # Template file for 'font-util' pkgname=font-util -version=1.3.2 +version=1.3.3 revision=1 build_style=gnu-configure hostmakedepends="pkg-config bdftopcf" @@ -13,8 +13,8 @@ short_desc="Tools for truncating and subseting of ISO10646-1 BDF fonts" maintainer="Duncaen " license="MIT" homepage="http://xorg.freedesktop.org" -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" -checksum=3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282 +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.xz" +checksum=e791c890779c40056ab63aaed5e031bb6e2890a98418ca09c534e6261a2eebd2 lib32disabled=yes post_install() { From 6c5a8fd09927c24dd56db16058678e580f54a0da Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 13 Jul 2022 14:54:16 +0200 Subject: [PATCH 83/85] u-boot-tools: update to 2022.07. --- srcpkgs/u-boot-tools/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template index e3908d65dfc1..0ca8e34429cb 100644 --- a/srcpkgs/u-boot-tools/template +++ b/srcpkgs/u-boot-tools/template @@ -1,19 +1,19 @@ # Template file for 'u-boot-tools' pkgname=u-boot-tools -version=2022.04 +version=2022.07 revision=1 wrksrc="u-boot-${version}" build_style=gnu-makefile make_build_args="HOSTSTRIP=: STRIP=: NO_SDL=1" make_build_target="tools-all tools-only envtools" -hostmakedepends="bison flex which" +hostmakedepends="bison flex which python3 swig python3-devel" makedepends="openssl-devel libuuid-devel gnutls-devel ncurses-libtinfo-devel" short_desc="Das U-Boot tools" maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://www.denx.de/wiki/U-Boot/" distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2" -checksum=68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0 +checksum=92b08eb49c24da14c1adbf70a71ae8f37cc53eeb4230e859ad8b6733d13dcf5e if [ "$CROSS_BUILD" ]; then make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-" From a23f8532adba29249db3f1021f02a98c4818ac55 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 13 Jul 2022 15:07:44 +0200 Subject: [PATCH 84/85] cppcheck: update to 2.8.2. --- srcpkgs/cppcheck/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template index 5c7b27394bd0..50427f55b33d 100644 --- a/srcpkgs/cppcheck/template +++ b/srcpkgs/cppcheck/template @@ -1,6 +1,6 @@ # Template file for 'cppcheck' pkgname=cppcheck -version=2.8 +version=2.8.2 revision=1 build_style=gnu-makefile make_build_args=" @@ -18,7 +18,7 @@ license="GPL-3.0-or-later" homepage="http://cppcheck.sourceforge.net" changelog="https://sourceforge.net/p/cppcheck/news/" distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz" -checksum=57298f3b805f0eb816a04115fbc70e701f75083cfb0305a44246e365cf27606a +checksum=30ba99ab54089c44b83f02e2453da046a7edff5237950d4a0eb1eba4afcb4f45 post_install() { vman cppcheck.1 From ea0b4e88f8580f5889e68cc9db32aec8fccf8f05 Mon Sep 17 00:00:00 2001 From: akhil Date: Sun, 10 Jul 2022 14:10:00 +0530 Subject: [PATCH 85/85] New package: cloud-utils-0.33 --- srcpkgs/cloud-utils/template | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 srcpkgs/cloud-utils/template diff --git a/srcpkgs/cloud-utils/template b/srcpkgs/cloud-utils/template new file mode 100644 index 000000000000..1875a60ab80f --- /dev/null +++ b/srcpkgs/cloud-utils/template @@ -0,0 +1,12 @@ +# Template file for 'cloud-utils' +pkgname=cloud-utils +version=0.33 +revision=1 +archs="x86_64" +build_style=gnu-makefile +short_desc="Set of utilities for interacting with a cloud" +maintainer="akhil " +license="GPL-3.0-or-later" +homepage="https://github.com/canonical/cloud-utils/" +distfiles="https://github.com/canonical/cloud-utils/archive/refs/tags/${version}.tar.gz" +checksum=338770d637788466aacfcbcec17a8d0046f92a13cc3b25fce8fceadb02a7339f