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

8273358: macOS Monterey does not have the font Times needed by Serif #5420

Closed
wants to merge 1 commit into from
Closed

Conversation

prrace
Copy link
Contributor

@prrace prrace commented Sep 8, 2021

Times has been the hard coded name for Serif in the JDK sources for macOS since the port was contributed by Apple.
But it seems that macOS Monterey doesn't have this font.
And the hard-coded fallback is also Times ! So we end up returning Dialog which is very bad.

The safest fix here is to make Times New Roman the fall back, so that on older macOS versions there
is absolutely no change. Only on Monterey and presumably later, will it use Times New Roman which,
I suspect, is what Times actually ends up being anyway.

Also to prevent unconditional warnings being printed I needed to change those to be conditional on logging being set.


Progress

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

Issue

  • JDK-8273358: macOS Monterey does not have the font Times needed by Serif

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5420

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 8, 2021

👋 Welcome back prr! 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 added the rfr Pull request is ready for review label Sep 8, 2021
@openjdk
Copy link

openjdk bot commented Sep 8, 2021

@prrace The following label will be automatically applied to this pull request:

  • 2d

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the 2d client-libs-dev@openjdk.org label Sep 8, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 8, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Sep 8, 2021

@prrace 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:

8273358: macOS Monterey does not have the font Times needed by Serif

Reviewed-by: kizune, aivanov

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

  • c1e39fa: 8273482: Remove "foreground work" concept from WorkGang
  • 2eaf374: 8272698: LoadNode::pin is unused
  • 792281d: 8264517: C2: make MachCallNode::return_value_is_used() only available for x86
  • 70c9e02: 8272148: JDesktopPane:getComponentCount() returns one extra than expected with GTKLookAndFeel
  • 08f0be8: 8272608: java_lang_System::allow_security_manager() doesn't set its initialization flag
  • 2e321dc: 8273528: Avoid ByteArrayOutputStream.toByteArray when converting stream to String
  • 54dee13: 8273188: java/lang/instrument/BootClassPath/BootClassPathTest.sh fails with "FATAL ERROR in native method: processing of -javaagent failed, processJavaStart failed"
  • 4020a60: 8273550: Replace os::cgc_thread/pgc_thread with os::gc_thread
  • 185eaca: 8273545: Remove Thread::is_GC_task_thread()
  • dd1209e: 8268885: duplicate checkcast when destination type is not first type of intersection type
  • ... and 44 more: https://git.openjdk.java.net/jdk/compare/df05b4d1a13e55755107695ad9ea7a8a1084901a...master

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 8, 2021
@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Sep 10, 2021
@prrace
Copy link
Contributor Author

prrace commented Sep 10, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Sep 10, 2021

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

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

@prrace Pushed as commit efe3ed1.

💡 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
2d client-libs-dev@openjdk.org client client-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants