[libskinlf-java] 05/06: Fixed the build failure with Java 9 (Closes: #874653)

[Emmanuel Bourg]

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

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

commit 58c9077088ee40efcc84836504f4beba841bf7dd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Dec 1 09:17:55 2017 +0100

    Fixed the build failure with Java 9 (Closes: #874653)
---
 debian/changelog                         |  1 +
 debian/patches/java9-compatibility.patch | 56 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 58 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4142175..85f5035 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libskinlf-java (6.7-10) UNRELEASED; urgency=medium
 
+  * Fixed the build failure with Java 9 (Closes: #874653)
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.1.2
   * Switch to debhelper level 10
diff --git a/debian/patches/java9-compatibility.patch b/debian/patches/java9-compatibility.patch
new file mode 100644
index 0000000..4e09547
--- /dev/null
+++ b/debian/patches/java9-compatibility.patch
@@ -0,0 +1,56 @@
+Description: Fixes the compilation errors with Java 9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/com/l2fprod/gui/nativeskin/win32/Win32NativeSkin.java
++++ b/src/com/l2fprod/gui/nativeskin/win32/Win32NativeSkin.java
+@@ -200,48 +200,11 @@
+    * @return        The HWND value
+    */
+   private static int getHWND(Window window) {
+-    if (window.getPeer() == null) {
++    if (!window.isDisplayable()) {
+       window.addNotify();
+     }
+ 
+-    if (OS.isOneDotFourOrMore()) {
+-      return getHWND0(window);
+-    } else {
+-      try {
+-      Object drawingSurfaceInfo;
+-      int hwnd = 0;
+-            
+-      // Get the drawing surface
+-      // drawingSurfaceInfo =
+-      //   ((sun.awt.DrawingSurface) (window.getPeer())).getDrawingSurfaceInfo();
+-      drawingSurfaceInfo =
+-        Class.forName("sun.awt.DrawingSurface").
+-        getMethod("getDrawingSurfaceInfo", null).
+-        invoke(window.getPeer(), null);
+-
+-      if (null != drawingSurfaceInfo) {
+-        // drawingSurfaceInfo.lock();
+-        AccessUtils.invoke(drawingSurfaceInfo, "lock", null, null);
+-
+-        // Get the Win32 specific information
+-        // win32DrawingSurface =
+-        //   (sun.awt.Win32DrawingSurface) drawingSurfaceInfo.getSurface();
+-        Object win32DrawingSurface =
+-          AccessUtils.invoke(drawingSurfaceInfo, "getSurface", null, null);
+-
+-        // hwnd = win32DrawingSurface.getHWnd();
+-        hwnd = AccessUtils.getAsInt(win32DrawingSurface, "getHWnd");
+-
+-        // drawingSurfaceInfo.unlock();
+-        AccessUtils.invoke(drawingSurfaceInfo, "unlock", null, null);
+-      }
+-      return hwnd;
+-        
+-      } catch (Throwable throwable) {
+-        throwable.printStackTrace();
+-        throw new Error(throwable);
+-      }
+-    }
++    return getHWND0(window);
+   }
+ 
+   /**
diff --git a/debian/patches/series b/debian/patches/series
index 70dc08e..9af8b14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 GtkParser.jj.patch
 image-utils-without-jimi.patch
 insubstantial-compatibility.patch
+java9-compatibility.patch

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