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

8195675: Call to insertText with single character from custom Input Method ignored #2954

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

srl295
Copy link
Member

@srl295 srl295 commented Oct 16, 2024

@srl295 Could not automatically backport b8f2ec90 to openjdk/jdk11u-dev due to conflicts in the following files:

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

Fetch the up-to-date version of the target branch

$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master

Check out the target branch and create your own branch to backport

$ git checkout master
$ git checkout -b backport-srl295-b8f2ec90-master

Fetch the commit you want to backport

$ git fetch --no-tags https://git.openjdk.org/jdk.git b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd

Backport the commit

$ git cherry-pick --no-commit b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd

Resolve conflicts now

Commit the files you have modified

$ git add files/with/resolved/conflicts
$ git commit -m 'Backport b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd'
Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit b8f2ec90 from the openjdk/jdk repository.

The commit being backported was authored by Steven Loomis on 28 May 2024 and was reviewed by Phil Race.

PR: openjdk/jdk#17921

Thanks!


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8195675 needs maintainer approval

Issue

  • JDK-8195675: Call to insertText with single character from custom Input Method ignored (Bug - P4 - Requested)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/2954/head:pull/2954
$ git checkout pull/2954

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2954

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2954.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 16, 2024

👋 Welcome back srl! 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
Copy link

openjdk bot commented Oct 16, 2024

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot changed the title Backport b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd 8195675: Call to insertText with single character from custom Input Method ignored Oct 16, 2024
@openjdk
Copy link

openjdk bot commented Oct 16, 2024

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

@openjdk
Copy link

openjdk bot commented Oct 16, 2024

⚠️ @srl295 This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added rfr Pull request is ready for review approval labels Oct 16, 2024
@srl295
Copy link
Member Author

srl295 commented Oct 16, 2024

/approval

@openjdk
Copy link

openjdk bot commented Oct 16, 2024

@srl295 usage: /approval [<id>] (request|cancel) [<text>]

@mlbridge
Copy link

mlbridge bot commented Oct 16, 2024

Webrevs

@srl295
Copy link
Member Author

srl295 commented Oct 16, 2024

/approval request java.awt components did not work properly on macOS with custom input methods, the net effect is that minority language keyboards did not work properly with Java. Low risk, the fix handles this situation similarly to how Apple's own 'kotoeri' input method was handled on a long term basis, so it is a well-worn path. Patch should apply cleanly and was code reviewed

@openjdk
Copy link

openjdk bot commented Oct 16, 2024

@srl295
8195675: The approval request has been created successfully.

@srl295
Copy link
Member Author

srl295 commented Oct 25, 2024

image

Built and verified this PR.

@srl295
Copy link
Member Author

srl295 commented Nov 4, 2024

The macOS-12 environment is deprecated, consider switching to macOS-13, macOS-14 (macos-latest) or macOS-15. For more details, see actions/runner-images#10721

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 2, 2024

@srl295 This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@srl295
Copy link
Member Author

srl295 commented Dec 2, 2024

Any update on triage?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval backport clean rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

1 participant