Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Chromium 102.0.5005.61 #1964

Merged
merged 1 commit into from May 25, 2022

Conversation

Ahrotahn
Copy link
Contributor

@Ahrotahn Ahrotahn commented May 20, 2022

This PR updates to chromium 102.0.5005.61.

Notes:

  • The removal in download_bubble_prefs.cc in the safebrowsing patch is no longer needed [3579726]

  • There were changes needed to the safebrowsing patch in safe_browsing_private_event_router.cc. Instead of updating that I've removed the previous changes and added changes that removes the file from being built along with the few places that call into it. This should also resolve fix-building-without-safebrowsing.patch incomplete? #1935

  • ENABLE_PRINT_CONTENT_ANALYSIS was added in [3337977] which hooks into safebrowsing in other areas. I've added changes to disable that in the safebrowsing patch.

  • There was a lot of activity in configuration_policy_handler_list_factory.cc in remove-unused-preferences-fields.patch, mostly due to the reorganization in [3573473] and [3576875]. The same keys are being removed as before.

  • primary_account_policy_manager.cc has been moved from components in [3563021] which has changes in remove-unused-preferences-fields.patch and makes 0017-disable-new-avatar-menu.patch no longer needed

  • AppsShortcutDefaultOff has been removed from 0006-modify-default-prefs.patch due to [3569271]

  • Some removals and an addition to the trk patch: [3572211], [3537450]

  • SwiftShader has been removed: (1060139)

  • If you aren't yet using clang 15 you'll need to remove -no-opaque-pointers in build/config/compiler/BUILD.gn. This is already removed in stha09's compiler patch.

  • The feature flag to hide the sidepanel button has been removed. I'll submit a PR later on to add flags to hide the sidepanel and the share hub buttons.


Change log
Blog post

@Ahrotahn Ahrotahn linked an issue May 20, 2022 that may be closed by this pull request
@PF4Public
Copy link
Contributor

It seems that they are deprecating 32-bit support or what?

ERROR at //BUILD.gn:1521:1: Assertion failed.
assert(
^-----
'target_cpu=x86' is not supported for 'target_os=linux'. Consider omitting 'target_cpu' (default) or using 'target_cpu=
x64' instead.
See //BUILD.gn:1522:5:
is_valid_x86_target || target_cpu != "x86",
^-----------------------------------------
This is where it was set.

Very funny:

Reland "Reland "Prevent accidentally targeting x86""

This is a reland of commit 78e35bd82555c24dcdde644a6c9fbb4a2d353599
After https://chromium-review.googlesource.com/c/chromium/src/+/3582603,
linux-gcc-rel should be fine with the reland.

Original change's description:

Reland "Prevent accidentally targeting x86"

This is a reland of commit 90af87c0d85c6c1060bd78465eea1a08690ed8cc
Now allows use_libfuzzer || !build_with_chromium on linux,
and the 32-bit linux main waterfall bot is gone now (see bug).

Original change's description:

Prevent accidentally targeting x86

I spent a good hour or so today trying to figure out why my build was
broken, turns out I just mistyped my target_cpu (should have just gone
with the default). A bit of searching shows I'm not the first person to
make this mistake, so now hopefully I'll be the last.

@Ahrotahn
Copy link
Contributor Author

I hadn't seen any announcements on this yet. According to (1305287) it seems there was an issue with some wayland change causing 32bit builds using libfuzzer to fail which explains why it's checked for explicitly in [3583780]. It seems like a pretty janky way of dealing with that though. Hopefully they can implement a proper fix before Tuesday.

@PF4Public
Copy link
Contributor

PF4Public commented May 21, 2022

They've rolled ffmpeg, so expect issues if building against ffmpeg-4. PF4Public/gentoo-overlay/issues/153

Apart from that, builds and runs fine on 64-bit. 👍🏻 Minimal referrer is still functioning ;)

PS: W.r.t. 32 bit it could very well be that 32 bit on linux is unsupported for a long time already:
https://support.google.com/chrome/a/answer/7100626?hl=en

Linux
To use Chrome browser on Linux, you'll need:

64-bit Ubuntu 18.04+, Debian 10+, openSUSE 15.2+, or Fedora Linux 32+
An Intel Pentium 4 processor or later that's SSE3 capable

@a61kt
Copy link

a61kt commented May 24, 2022

@PF4Public @Ahrotahn and could it work with CHROME ffmpe

with arch ffmpeg it fails too
_log.txt

edit... im building it with its native ffmpeg

@networkException
Copy link
Member

Stop constantly mentioning the maintainers

@Ahrotahn Ahrotahn marked this pull request as ready for review May 24, 2022 20:00
@PF4Public
Copy link
Contributor

Arch seems to be merely rolling ffmpeg back: https://github.com/archlinux/svntogit-packages/blob/140fa66be0604daaf16be4246053c1a359d4e3bb/trunk/PKGBUILD#L109-L111

I'll try the same :)

Copy link
Member

@networkException networkException left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builds and runs fine

@PF4Public
Copy link
Contributor

@teeminus Have you had a chance to test this PR?

Copy link
Contributor

@PF4Public PF4Public left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builds and runs. Not sure if we are clear to merge yet. Maybe waiting a little bit more?

@teeminus
Copy link
Contributor

@teeminus Have you had a chance to test this PR?

I waited for this PR to be merged. I started working on updating the windows build a few hours ago.

Unfortunatelly, the chromium 102 update is not as straight forward as the updates before. Currently compiling failes with the following error:

[10/51647] CC obj/base/third_party/dynamic_annotations/dynamic_annotations/dynamic_annotations.obj
FAILED: obj/base/third_party/dynamic_annotations/dynamic_annotations/dynamic_annotations.obj
..\..\third_party\llvm-build\Release+Asserts\bin\clang-cl.exe /c ../../base/third_party/dynamic_annotations/dynamic_annotations.c /nologo /showIncludes "-imsvc../../../../../Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/ATLMFC/include" "-imsvc../../../../../Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/include" "-imsvc../../../../../Program Files (x86)/Windows Kits/NETFXSDK/4.8/include/um" "-imsvc../../../../../Program Files (x86)/Windows Kits/10/include/10.0.20348.0/ucrt" "-imsvc../../../../../Program Files (x86)/Windows Kits/10/include/10.0.20348.0/shared" "-imsvc../../../../../Program Files (x86)/Windows Kits/10/include/10.0.20348.0/um" "-imsvc../../../../../Program Files (x86)/Windows Kits/10/include/10.0.20348.0/winrt" "-imsvc../../../../../Program Files (x86)/Windows Kits/10/include/10.0.20348.0/cppwinrt" -DUSE_AURA=1 -DOFFICIAL_BUILD "-DCR_CLANG_REVISION=\"llvmorg-15-init-7570-gba4537b2-1\"" -D_LIBCPP_ABI_UNSTABLE -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_ENABLE_NODISCARD -D_LIBCPP_NO_AUTO_LINK -D__STD_C -D_CRT_RAND_S -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_ATL_NO_OPENGL -D_WINDOWS -DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS -DPSAPI_VERSION=2 -DWIN32 -D_SECURE_ATL -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -DWIN32_LEAN_AND_MEAN -DNOMINMAX -D_UNICODE -DUNICODE -DNTDDI_VERSION=NTDDI_WIN10_FE -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -I../.. -Igen -I../../buildtools/third_party/libc++ -fno-delete-null-pointer-checks -fno-ident -fcolor-diagnostics -fmerge-all-constants -fcrash-diagnostics-dir=../../tools/clang/crashreports -mllvm -instcombine-lower-dbg-declare=0 /clang:-ffp-contract=off -flto=thin -fsplit-lto-unit -fwhole-program-vtables -fcomplete-member-pointers /Gy /FS /bigobj /utf-8 /Zc:twoPhase -Wno-unknown-warning-option /Zc:sizedDealloc- /D__WRL_ENABLE_FUNCTION_STATICS__ -fmsc-version=1916 -m64 -msse3 -ffile-compilation-dir=. -no-canonical-prefixes -ftrivial-auto-var-init=pattern /O1 /Ob2 /Oy- /Zc:inline /Gw /Oi /guard:cf /MT -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare /W3 /wd4800 /wd4267 -Wno-unused-variable -Wno-c++11-narrowing -Wno-unused-but-set-variable -Wno-misleading-indentation -Wno-missing-field-initializers -Wno-unused-parameter -Wloop-analysis -Wno-unneeded-internal-declaration -Wno-nonportable-include-path -Wno-null-pointer-subtraction -Wenum-compare-conditional -Wno-psabi -Wno-ignored-pragma-optimize -Wno-unqualified-std-cast-call -Wno-deprecated-non-prototype -Xclang /std:c11 /TC /Foobj/base/third_party/dynamic_annotations/dynamic_annotations/dynamic_annotations.obj /Fd"obj/base/third_party/dynamic_annotations/dynamic_annotations_c.pdb"
error: error reading '/std:c11'
1 error generated.

And I have no idea how to fix that...

@PF4Public
Copy link
Contributor

So… maybe ship it while teeminus is "fighting" Windows?

@networkException
Copy link
Member

Sure 👍

@networkException networkException merged commit 970f6b1 into ungoogled-software:master May 25, 2022
@Nifury
Copy link
Member

Nifury commented May 26, 2022

@teeminus No idea why that error popped up...it compiles and runs fine on my end.

@teeminus
Copy link
Contributor

@teeminus No idea why that error popped up...it compiles and runs fine on my end.

Yeah, my bad... I had to add a new patch to remove a clang-15 parameter (windows only has clang-14) and that patch was incomplete. Currently it's compiling and if that succeeds I will update the windows PR.

@PF4Public
Copy link
Contributor

I wonder, why Nifury didn't get this error? Do you use different building scripts?

@teeminus
Copy link
Contributor

Compiling and linking finished over night. I need to update the patches before pushing my changes and updating the PR.

@PF4Public
Copy link
Contributor

Fun fact: Fingerprinting deception is a double-edged sword. Whatsapp web recently started checking browser fingerprint and nullifying the session if browser fingerprint changed. This results in session breaking upon browser restart :)

@jstkdng
Copy link
Member

jstkdng commented Jun 2, 2022

>using whatsapp
you might as well use google chrome

@PF4Public
Copy link
Contributor

you might as well use google chrome

Just for that? Nah, too much trouble.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Updating to Chromium 102.0.5005.61 fix-building-without-safebrowsing.patch incomplete?
7 participants