Package: libnb-platform18-java / 8.1+dfsg1-5

netbeans-platform-nojnabinaries.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
From: Markus Koschany <apo@debian.org>
Date: Mon, 1 Jun 2015 14:21:49 +0200
Subject: netbeans platform nojnabinaries

We don't need to install any JNA binaries, since they're already installed.
Forwarded: not-needed
---
 libs.jna.platform/nbproject/project.properties    |  2 +-
 libs.jna/nbproject/project.properties             | 24 +++++++++++------------
 libs.jna/src/org/netbeans/libs/jna/Installer.java |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libs.jna.platform/nbproject/project.properties b/libs.jna.platform/nbproject/project.properties
index b8afdb4..608ea2b 100644
--- a/libs.jna.platform/nbproject/project.properties
+++ b/libs.jna.platform/nbproject/project.properties
@@ -42,5 +42,5 @@
 
 is.autoload=true
 javac.source=1.6
-release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
+#release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
 sigtest.gen.fail.on.error=false
diff --git a/libs.jna/nbproject/project.properties b/libs.jna/nbproject/project.properties
index c6de368..0a8e520 100644
--- a/libs.jna/nbproject/project.properties
+++ b/libs.jna/nbproject/project.properties
@@ -41,17 +41,17 @@
 # made subject to such option by the copyright holder.
 
 javac.source=1.6
-release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
+#release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
 # Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well.
-release.external/jna-4.1.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-410.jnilib
-release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-410.so
-release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-410.so
-release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-410.dll
-release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-410.dll
-jnlp.verify.excludes=\
-    modules/lib/amd64/jnidispatch-410.dll,\
-    modules/lib/amd64/linux/libjnidispatch-410.so,\
-    modules/lib/i386/linux/libjnidispatch-410.so,\
-    modules/lib/x86/jnidispatch-410.dll,\
-    modules/lib/libjnidispatch-410.jnilib
+#release.external/jna-4.1.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-410.jnilib
+#release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-410.so
+#release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-410.so
+#release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-410.dll
+#release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-410.dll
+#jnlp.verify.excludes=\
+#    modules/lib/amd64/jnidispatch-410.dll,\
+#    modules/lib/amd64/linux/libjnidispatch-410.so,\
+#    modules/lib/i386/linux/libjnidispatch-410.so,\
+#    modules/lib/x86/jnidispatch-410.dll,\
+#    modules/lib/libjnidispatch-410.jnilib
 sigtest.gen.fail.on.error=false
diff --git a/libs.jna/src/org/netbeans/libs/jna/Installer.java b/libs.jna/src/org/netbeans/libs/jna/Installer.java
index cf306a7..fa3201f 100644
--- a/libs.jna/src/org/netbeans/libs/jna/Installer.java
+++ b/libs.jna/src/org/netbeans/libs/jna/Installer.java
@@ -50,6 +50,6 @@ public class Installer extends ModuleInstall {
     public void validate() {
         super.validate();
         //#211655
-        System.setProperty( "jna.boot.library.name", "jnidispatch-410" ); //NOI18N
+        System.setProperty( "jna.boot.library.name", "jnidispatch.system" ); //NOI18N
     }
 }