Chromium Browser

Merge ~b-stolk/chromium-browser/+git/snap-from-source:guide-rebased-110 into ~chromium-team/chromium-browser/+git/snap-from-source:hwacc-beta

  1. Git
  2. lp:~b-stolk/chromium-browser/+git/snap-from-source
  3. guide-rebased-110
  4. Merge into hwacc-beta
Proposed by Bram Stolk
Status: Merged
Merged at revision: 51dff39d18c321f758f21ff93e2745b9f9536f8f
Proposed branch: ~b-stolk/chromium-browser/+git/snap-from-source:guide-rebased-110
Merge into: ~chromium-team/chromium-browser/+git/snap-from-source:hwacc-beta
Diff against target: 942 lines (+161/-187)
7 files modified
build/chromium-patches/extra:fe38fdb:dynamic-check-nv12.diff (+10/-10)
build/chromium-patches/guide-0.9.1:a45401f:vaapi-flag-ozone-wayland.diff (+7/-7)
build/chromium-patches/guide-0.9.1:a49acb3:one-copy.diff (+67/-49)
build/chromium-patches/guide-0.9.1:bb6aa463:linux-unstable-deb.diff (+4/-4)
build/chromium-patches/guide-0.9.1:bf59df32.diff:zero-copy.diff (+68/-66)
build/chromium-patches/series (+5/-7)
dev/null (+0/-44)
Reviewer Review Type Date Requested Status
Hector CAO (community) Approve
Nathan Teodosio Approve
Review via email: mp+437104@code.staging.launchpad.net

This proposal supersedes a proposal from 2023-02-09.

Commit message

Add new versions of patches to fix the build.

Fixes: LP#2006641.

Description of the change

Add new versions of the patches.

I squashed the 3 commits as suggested.
I adopted the commit message format.
(I replicated that message in the launchpad form 'commit message'. Not sure if that is necessary?)
NOTE: I had to force my push onto my branch, I guess that is normal?

To post a comment you must log in.
Revision history for this message
Hector CAO (hectorcao) wrote : Posted in a previous version of this proposal

nice !
I would now squash all the 3 commits in 1 with:

git rebase -i 98df8e2a643a1b0f460e0ceb4d0a4c76a2f2b0be

agree ?

review: Needs Information
Revision history for this message
Hector CAO (hectorcao) wrote (last edit ): Posted in a previous version of this proposal

And for the commit message that is currently is:

Fixes LP:2006641

This fixes the build by replacing old patches with re-based ones for chromium 110.

I would suggest to use this format from now:

<1 line to describe the change>
<blank line>
[<Text block to describe in details the changes>
<blank line>]
[Fixes: LP#xxxxxxxxx]

This format applies to all the commits, this allows to have a nice git log output.
(*) field inside [] is optional

For this MR, i would be:

Fix patches that break the build

This fixes the build by replacing old patches with re-based ones for chromium 110.

Fixes LP:2006641

review: Needs Information
Revision history for this message
Nathan Teodosio (nteodosio) wrote : Posted in a previous version of this proposal

I agree with Hector's suggestions.

Revision history for this message
Nathan Teodosio (nteodosio) wrote :

Thank you, Bram.

Yes, a force push was expected.

review: Approve
Revision history for this message
Hector CAO (hectorcao) wrote :

+1

review: Approve
Revision history for this message
Hector CAO (hectorcao) wrote :

Just a minor comment, i would remove some details on the "Description of the change", these details, you can put them in the comment section

For me "Description of the change" should be details to help other to understand the MR

Revision history for this message
Hector CAO (hectorcao) wrote :

The LP bug id is wrong

review: Needs Fixing
Revision history for this message
Nathan Teodosio (nteodosio) wrote :

Just fixed it, thanks Hector.

Revision history for this message
Hector CAO (hectorcao) wrote :

+1

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: