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

8272329: Cherry pick GTK WebKit 2.32.3 changes #36

Conversation

kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Aug 17, 2021

Clean backport of the fix to cherry pick GTK WebKit 2.32.3 changes, as a follow-on to the WebKit 612.1 update. Once PR #34 is integrated, I will rebase this branch on top of master (to pick up that fix), and take this out of Draft state.

As an FYI, I tested this patch in my test-kcr-11.0.13 branch, which has the aggregate set of patches for the following bugs: JDK-8211308, JDK-8268915, JDK-8269147, JDK-8269131, JDK-8268849, JDK-8270479, JDK-8272329.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx11u pull/36/head:pull/36
$ git checkout pull/36

Update a local copy of the PR:
$ git checkout pull/36
$ git pull https://git.openjdk.java.net/jfx11u pull/36/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 36

View PR using the GUI difftool:
$ git pr show -t 36

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx11u/pull/36.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 17, 2021

👋 Welcome back kcr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@kevinrushforth kevinrushforth force-pushed the 8272329-cherry-pick-2.32.3 branch from 3098e0c to beedd16 Compare Aug 18, 2021
@kevinrushforth kevinrushforth marked this pull request as ready for review Aug 18, 2021
@kevinrushforth kevinrushforth changed the title DRAFT: Backport ee442e516a20e979dc228ab63c6b795b74d49e41 Backport ee442e516a20e979dc228ab63c6b795b74d49e41 Aug 18, 2021
@openjdk openjdk bot changed the title Backport ee442e516a20e979dc228ab63c6b795b74d49e41 8272329: Cherry pick GTK WebKit 2.32.3 changes Aug 18, 2021
@openjdk
Copy link

openjdk bot commented Aug 18, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Aug 18, 2021

@kevinrushforth This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8272329: Cherry pick GTK WebKit 2.32.3 changes

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the master branch:

  • 7bc9584: 8270479: WebKit 612.1 build fails with Visual Studio 2017

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added ready Ready to be integrated rfr Ready for review labels Aug 18, 2021
@kevinrushforth
Copy link
Member Author

kevinrushforth commented Aug 18, 2021

/integrate

@mlbridge
Copy link

mlbridge bot commented Aug 18, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 18, 2021

Going to push as commit 906b61c.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 7bc9584: 8270479: WebKit 612.1 build fails with Visual Studio 2017

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Aug 18, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Ready to be integrated rfr Ready for review labels Aug 18, 2021
@openjdk
Copy link

openjdk bot commented Aug 18, 2021

@kevinrushforth Pushed as commit 906b61c.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@kevinrushforth kevinrushforth deleted the 8272329-cherry-pick-2.32.3 branch Aug 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
2 participants