search

ungoogled-software / ungoogled-chromium-portablelinux

Portable Linux packaging for ungoogled-chromium
96 stars 30 forks source link

Update musl branch to 88.0.4324.150 #84

Closed git-bruh closed 3 years ago

git-bruh commented 3 years ago

I'm not sure how to go about this, since I've only tested the build with disabling dbus/cups/other stuff and also without clang, is it OK to add all those flags in flags.portable.gn + gcc patches ? Haven't tested it with a "normal" build config

Eloston commented 3 years ago

I will come back to this after I merge https://github.com/Eloston/ungoogled-chromium/pull/1342

Eloston commented 3 years ago

@git-bruh If you could update this for .150, that'd be awesome

git-bruh commented 3 years ago

@Eloston The existing patches apply fine, just waiting for the build to finish, gonna take a few more hours.

Built fine, binary uploaded aswell.

git-bruh commented 3 years ago

Re-generated musl patches (simple shell loop), had to regenerate a few others aswell.

The validation seems to be working fine for me locally, but CI still keeps failing for some reason:

testuser@KISS ungoogled-chromium-portablelinux 3$ ./ungoogled-chromium/devutils/validate_patches.py -l /tmp/chromium-88.0.4324.150/ -p patches -s patches/series -v
INFO: Passed validation (33 patches total)
Eloston commented 3 years ago

That's because the CI merges ungoogled-chromium's patches with that of ungoogled-chromim-portablelinux first: ./ungoogled-chromium/utils/patches.py merge -p patches ungoogled-chromium/patches

You can also accomplish the same effect by applying ungoogled-chromium's patches first, then checking to see if your patches apply.

git-bruh commented 3 years ago

Hmm I can't figure this out... In my build script i first apply the musl/gcc patchset and then the ungoogled-chromium one and it all works fine. The patchgcc/chromium-88-compiler.patch keeps failing because an ungoogled patch is applied before it, if i change series to apply this before the ungoogled patch , then the ungoogled patch fails (applies fine with offset). I guess i can drop the gcc patchset from here but the binary will still be built with that patchset.

Eloston commented 3 years ago

The rule is ungoogled-chromium patches get applied first. This is because platform repos should never change anything from ungoogled-chromium (otherwise it will be confusing and complicated to maintain). In order for these changes to be merged, we have to follow this standard.

git-bruh commented 3 years ago

closing since i won't be able to actually test whether it builds with the flags on this repo or not, my build files/patches can always be found here though if anyone is interested in maintaining the musl branch.