[netbeans] 07/08: Update and rebase jna-4.4.0-compatibility.patch.

[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 d5737e782f410e848846dce979bc00b7e1886fc2
Author: Markus Koschany <apo at debian.org>
Date:   Sun Jul 23 19:05:47 2017 +0200

    Update and rebase jna-4.4.0-compatibility.patch.
---
 debian/patches/jna-4.4.0-compatibility.patch | 26 ++++++++++++++++++++++++--
 debian/patches/netbeans-ide-launcher.patch   |  2 +-
 debian/patches/netbeans-slf4j.dummy.patch    |  2 +-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/debian/patches/jna-4.4.0-compatibility.patch b/debian/patches/jna-4.4.0-compatibility.patch
index 7142598..fff558f 100644
--- a/debian/patches/jna-4.4.0-compatibility.patch
+++ b/debian/patches/jna-4.4.0-compatibility.patch
@@ -7,9 +7,31 @@ 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(-)
+ .../org/netbeans/modules/nativeexecution/support/Win32APISupport.java | 4 ++--
+ .../src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java   | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
 
+diff --git a/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/Win32APISupport.java b/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/Win32APISupport.java
+index 5654ce6..3f3846f 100644
+--- a/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/Win32APISupport.java
++++ b/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/Win32APISupport.java
+@@ -56,14 +56,14 @@ import java.util.Map;
+ 
+ public interface Win32APISupport extends StdCallLibrary {
+ 
+-    final Map<Object, Object> DEFAULT_OPTIONS = Collections.unmodifiableMap(new HashMap<Object, Object>() {
++    final Map<String, ?> DEFAULT_OPTIONS = Collections.unmodifiableMap(new HashMap<String, String>() {
+ 
+         {
+             put(OPTION_TYPE_MAPPER, W32APITypeMapper.UNICODE);
+             put(OPTION_FUNCTION_MAPPER, W32APIFunctionMapper.UNICODE);
+         }
+     });
+-    final Win32APISupport instance = (Win32APISupport) Native.loadLibrary("kernel32", Win32APISupport.class, DEFAULT_OPTIONS); // NOI18N
++    final Win32APISupport instance = Native.loadLibrary("kernel32", Win32APISupport.class, DEFAULT_OPTIONS); // NOI18N
+ 
+     /* http://msdn.microsoft.com/en-us/library/ms683179(VS.85).aspx */
+     HANDLE GetCurrentProcess();
 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
diff --git a/debian/patches/netbeans-ide-launcher.patch b/debian/patches/netbeans-ide-launcher.patch
index f5df01f..a7811ef 100644
--- a/debian/patches/netbeans-ide-launcher.patch
+++ b/debian/patches/netbeans-ide-launcher.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
  2 files changed, 5 insertions(+), 8 deletions(-)
 
 diff --git a/ide/launcher/netbeans.conf b/ide/launcher/netbeans.conf
-index 3cdd3dc..96a12fc 100644
+index 3cdd3dc..537832a 100644
 --- a/ide/launcher/netbeans.conf
 +++ b/ide/launcher/netbeans.conf
 @@ -43,8 +43,7 @@ netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/8.1"
diff --git a/debian/patches/netbeans-slf4j.dummy.patch b/debian/patches/netbeans-slf4j.dummy.patch
index 4e173f7..c3fb69d 100644
--- a/debian/patches/netbeans-slf4j.dummy.patch
+++ b/debian/patches/netbeans-slf4j.dummy.patch
@@ -39,7 +39,7 @@ index f31a978..0925156 100644
              <class-path-extension>
 diff --git a/slf4j.dummy/build.xml b/slf4j.dummy/build.xml
 new file mode 100644
-index 0000000..34be746
+index 0000000..b7663bc
 --- /dev/null
 +++ b/slf4j.dummy/build.xml
 @@ -0,0 +1,12 @@

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