Skip to content

Conversation

@TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Sep 9, 2021

Backport of JDK-8256372. Doesn't apply cleanly. Resolution:

  • Removal of hb_coretext files and adaptation of Awt2dLibraries.gmk had to be done manually.
  • Logging code in CFont.java needed a replacement for logInfo which is not available in 11u.

Progress

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

Issue

  • JDK-8256372: [macos] Unexpected symbol was displayed on JTextField with Monospaced font

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 317

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 9, 2021

👋 Welcome back mdoerr! 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 005d8a7fca8b4d9519d2bde0a7cdbbece1cd3981 8256372: [macos] Unexpected symbol was displayed on JTextField with Monospaced font Sep 9, 2021
@openjdk
Copy link

openjdk bot commented Sep 9, 2021

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Sep 9, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 9, 2021

Webrevs

Copy link
Contributor

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks correct.

@openjdk
Copy link

openjdk bot commented Sep 9, 2021

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

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

8256372: [macos] Unexpected symbol was displayed on JTextField with Monospaced font

Reviewed-by: clanger

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 7 new commits pushed to the master branch:

  • 8da3a00: 8251930: AArch64: Native types mismatch in hotspot
  • cf95c4c: 8206085: Refactor langtools/tools/javac/versions/Versions.java
  • ae0d088: 8270317: Large Allocation in CipherSuite
  • c88867c: 8248899: security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java fails, Certificate has been revoked
  • 1d1e4ce: 8251570: JDK-8215624 causes assert(worker_id < _n_workers) failed: Invalid worker_id
  • 085dbe3: 8215624: Add parallel heap iteration for jmap –histo
  • 2de01c1: 8269993: [Test]: java/net/httpclient/DigestEchoClientSSL.java contains redundant @run tags

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 the ready Pull request is ready to be integrated label Sep 9, 2021
@TheRealMDoerr
Copy link
Contributor Author

Thanks for the review and the approval!
/integrate

@openjdk
Copy link

openjdk bot commented Sep 10, 2021

Going to push as commit a39375e.
Since your change was applied there have been 8 commits pushed to the master branch:

  • a013fe2: 8210395: Add doc to SecurityTools.java
  • 8da3a00: 8251930: AArch64: Native types mismatch in hotspot
  • cf95c4c: 8206085: Refactor langtools/tools/javac/versions/Versions.java
  • ae0d088: 8270317: Large Allocation in CipherSuite
  • c88867c: 8248899: security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java fails, Certificate has been revoked
  • 1d1e4ce: 8251570: JDK-8215624 causes assert(worker_id < _n_workers) failed: Invalid worker_id
  • 085dbe3: 8215624: Add parallel heap iteration for jmap –histo
  • 2de01c1: 8269993: [Test]: java/net/httpclient/DigestEchoClientSSL.java contains redundant @run tags

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 10, 2021

@TheRealMDoerr Pushed as commit a39375e.

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

@TheRealMDoerr TheRealMDoerr deleted the 8256372_macOS_font branch September 10, 2021 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants