Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

Conversation

@omikhaltsova
Copy link
Contributor

@omikhaltsova omikhaltsova commented Dec 17, 2021

I'd like to backport JDK-8261169 to jdk13u in order to upgrade HarfBuzz up to v 2.8.0.

The original patch applies almost cleanly except the only file that is in another directory:
make/lib/Awt2dLibraries.gmk instead of make/modules/java.desktop/lib/Awt2dLibraries.gmk.

JDK-8266545: 8261169 broke Harfbuzz build with gcc 7 and 8
will be backported right after it.

All regular tests passed (tested on Windows x86/x86_64 (VS 2017), Linux x86/x86_64 (gcc 8.3.0), Mac OS X x86_64 (XCode/Clang 11.0), Linux aarch64 (gcc 9.3.0)).


Progress

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

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk13u-dev pull/306/head:pull/306
$ git checkout pull/306

Update a local copy of the PR:
$ git checkout pull/306
$ git pull https://git.openjdk.java.net/jdk13u-dev pull/306/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 306

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk13u-dev/pull/306.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 17, 2021

👋 Welcome back omikhaltcova! 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.

@openjdk openjdk bot changed the title Backport 80323b7f66541e24177d02cc668a2eb9267962b9 8261169: Upgrade HarfBuzz to the latest 2.8.0 Dec 17, 2021
@openjdk
Copy link

openjdk bot commented Dec 17, 2021

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

@openjdk openjdk bot added the backport label Dec 17, 2021
@omikhaltsova omikhaltsova marked this pull request as ready for review December 18, 2021 14:57
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 18, 2021
@mlbridge
Copy link

mlbridge bot commented Dec 18, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 18, 2021

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

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

8261169: Upgrade HarfBuzz to the latest 2.8.0

Reviewed-by: dcherepanov

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@dimitryc) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 18, 2021
@omikhaltsova
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 18, 2021
@openjdk
Copy link

openjdk bot commented Dec 18, 2021

@omikhaltsova
Your change (at version 00e52ee) is now ready to be sponsored by a Committer.

@dimitryc
Copy link
Collaborator

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 18, 2021

Going to push as commit 64627b5.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 18, 2021
@openjdk openjdk bot closed this Dec 18, 2021
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 18, 2021
@openjdk
Copy link

openjdk bot commented Dec 18, 2021

@dimitryc @omikhaltsova Pushed as commit 64627b5.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants