Skip to content

Commit

Permalink
8322251: [Linux] JavaFX is not displaying CJK on Ubuntu 23.10 and later
Browse files Browse the repository at this point in the history
Reviewed-by: aghaisas, angorya
  • Loading branch information
prrace committed Apr 19, 2024
1 parent d03b002 commit 5182ea1
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions modules/javafx.graphics/src/main/native-font/fontpath_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -410,9 +410,13 @@ Java_com_sun_javafx_font_FontConfigManager_getFontConfig

fontformat = NULL;
(*FcPatternGetString)(fontPattern, FC_FONTFORMAT, 0, &fontformat);
/* We only want TrueType fonts for Java FX */
if (fontformat != NULL
&& (strcmp((char*)fontformat, "TrueType") != 0)) {
/* We only want OpenType fonts for Java FX :
* ie TrueType and CFF format fonts.
*/
if ((fontformat != NULL) &&
((strcmp((char*)fontformat, "TrueType") != 0) &&
(strcmp((char*)fontformat, "CFF") != 0)))
{
continue;
}
result = (*FcPatternGetCharSet)(fontPattern,
Expand Down

3 comments on commit 5182ea1

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@prrace
Copy link
Collaborator Author

@prrace prrace commented on 5182ea1 Apr 25, 2024

Choose a reason for hiding this comment

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

/backport jfx22u

@openjdk
Copy link

@openjdk openjdk bot commented on 5182ea1 Apr 25, 2024

Choose a reason for hiding this comment

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

@prrace the backport was successfully created on the branch backport-prrace-5182ea16 in my personal fork of openjdk/jfx22u. To create a pull request with this backport targeting openjdk/jfx22u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 5182ea16 from the openjdk/jfx repository.

The commit being backported was authored by Phil Race on 19 Apr 2024 and was reviewed by Ajit Ghaisas and Andy Goryachev.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jfx22u:

$ git fetch https://github.com/openjdk-bots/jfx22u.git backport-prrace-5182ea16:backport-prrace-5182ea16
$ git checkout backport-prrace-5182ea16
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jfx22u.git backport-prrace-5182ea16

⚠️ @prrace You are not yet a collaborator in my fork openjdk-bots/jfx22u. An invite will be sent out and you need to accept it before you can proceed.

Please sign in to comment.