[netbeans] 03/08: Add jna-4.4.0-compatibility.patch and fix FTBFS with JNA 4.4.0.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository netbeans.

commit ca4ec907a76abc37a79df2b10bf6585b26c1c5bf
Author: Markus Koschany <apo at debian.org>
Date:   Sun Jul 23 17:49:05 2017 +0200

    Add jna-4.4.0-compatibility.patch and fix FTBFS with JNA 4.4.0.
    
    Thanks: Lucas Nussbaum for the report.
    Closes: #868931
---
 debian/patches/jna-4.4.0-compatibility.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/jna-4.4.0-compatibility.patch b/debian/patches/jna-4.4.0-compatibility.patch
new file mode 100644
index 0000000..7142598
--- /dev/null
+++ b/debian/patches/jna-4.4.0-compatibility.patch
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 23 Jul 2017 14:44:17 +0200
+Subject: jna 4.4.0 compatibility
+
+Fix FTBFS with libjna-java 4.4.0.
+
+Bug-Debian: https://bugs.debian.org/868931
+Forwarded: no
+---
+ .../src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java     | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java b/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java
+index fb762af..77c6a81 100644
+--- a/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java
++++ b/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java
+@@ -69,7 +69,7 @@ public interface GnomeKeyringLibrary extends Library {
+         // http://packages.ubuntu.com/search?suite=precise&arch=any&mode=exactfilename&searchon=contents&keywords=libgnome-keyring.so.0
+         private static final String EXPLICIT_ONEIRIC = "/usr/lib/libgnome-keyring.so.0";
+         @SuppressWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
+-        private static Object load(Map<?,?> options) {
++        private static Object load(Map<String,?> options) {
+             try {
+                 return Native.loadLibrary(GENERIC, GnomeKeyringLibrary.class, options);
+             } catch (UnsatisfiedLinkError x) {
diff --git a/debian/patches/series b/debian/patches/series
index ead1990..9f51d24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,3 +33,4 @@ netbeans-ide-launcher.patch
 netbeans-xsl-httpserver.patch
 netbeans-svnclientadapter.patch
 netbeans-slf4j.dummy.patch
+jna-4.4.0-compatibility.patch

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