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

8249821: Separate libharfbuzz from libfontmanager #301

Closed
wants to merge 1 commit into from

Conversation

omikhaltsova
Copy link
Contributor

@omikhaltsova omikhaltsova commented Dec 9, 2021

I'd like to backport JDK-8249821 to jdk13u for parity with jdk11u.
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. The patch for this file applied manually.
I observe the appearence of the cast errors on the Linux 32 bits platform at the compile time and I'm going to backport JDK-8250605 as a follow-up to it.
All regular tests passed.


Progress

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

Issue

  • JDK-8249821: Separate libharfbuzz from libfontmanager

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 301

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 9, 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 b1ff2bd00a6a289be29158e0acd134151b468d41 8249821: Separate libharfbuzz from libfontmanager Dec 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 9, 2021

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

@openjdk openjdk bot added backport rfr labels Dec 9, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 9, 2021

Webrevs

yan-too
yan-too approved these changes Dec 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 9, 2021

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

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

8249821: Separate libharfbuzz from libfontmanager

Reviewed-by: yan

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:

  • f4c051e: 8241087: Build failure with VS 2019 (16.5.0) due to C2039 and C2873

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.

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 (@yan-too) 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 label Dec 9, 2021
@omikhaltsova
Copy link
Contributor Author

@omikhaltsova omikhaltsova commented Dec 9, 2021

/integrate

@openjdk openjdk bot added the sponsor label Dec 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 9, 2021

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

@yan-too
Copy link
Collaborator

@yan-too yan-too commented Dec 9, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Dec 9, 2021

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

  • f4c051e: 8241087: Build failure with VS 2019 (16.5.0) due to C2039 and C2873

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Dec 9, 2021
@openjdk openjdk bot added integrated and removed ready rfr sponsor labels Dec 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 9, 2021

@yan-too @omikhaltsova Pushed as commit ee32625.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated
2 participants