[openjfx] 07/11: Backported a fix for accented characters in textfields (Closes: #872619)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjfx.

commit 20dd8233413eb349637f4cb35338e58a4720dd6e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 3 17:52:19 2017 +0200

    Backported a fix for accented characters in textfields (Closes: #872619)
---
 debian/changelog                                   |  1 +
 ...2-JDK-8185792-accented-characters-support.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 733babe..7b47717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openjfx (8u141-b14-1) UNRELEASED; urgency=medium
     - Fixes CVE-2017-10086 and CVE-2017-10114 (Closes: #870860)
   * Fixed the build failure with GCC 7 (Closes: #853593)
   * Fixed a build failure on powerpc caused by a different ucontext_t definition
+  * Backported a fix for accented characters in textfields (Closes: #872619)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 20 Apr 2017 10:12:13 +0200
 
diff --git a/debian/patches/22-JDK-8185792-accented-characters-support.patch b/debian/patches/22-JDK-8185792-accented-characters-support.patch
new file mode 100644
index 0000000..7f1aeda
--- /dev/null
+++ b/debian/patches/22-JDK-8185792-accented-characters-support.patch
@@ -0,0 +1,23 @@
+Description: JDK-8185792: Entering accents in a textfield on a JFXPanel produces NPE
+Origin: backport, http://hg.openjdk.java.net/openjfx/10-dev/rt/rev/ef0ec553083f
+Bug: https://bugs.openjdk.java.net/browse/JDK-8185792
+Bug-Debian: https://bugs.debian.org/872619
+--- a/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java
++++ b/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java
+@@ -640,11 +640,15 @@
+     private void sendInputMethodEventToFX(InputMethodEvent e) {
+         String t = InputMethodSupport.getTextForEvent(e);
+ 
++        int insertionIndex = 0;
++        if (e.getCaret() != null) {
++            insertionIndex = e.getCaret().getInsertionIndex();
++        }
+         scenePeer.inputMethodEvent(
+                 javafx.scene.input.InputMethodEvent.INPUT_METHOD_TEXT_CHANGED,
+                 InputMethodSupport.inputMethodEventComposed(t, e.getCommittedCharacterCount()),
+                 t.substring(0, e.getCommittedCharacterCount()),
+-                e.getCaret().getInsertionIndex());
++                insertionIndex);
+     }
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8eeb82a..43b6664 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ fix-arm32-build.patch
 19-disable-webkit-sampling-profiler.patch
 20-fix-ppc-build.patch
 21-gcc7-compatibility.patch
+22-JDK-8185792-accented-characters-support.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git