Package: swt4-gtk / 4.10.0-3

search-usr-lib-jni.diff 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
From 67941dbb88d763bfbd62825d893c4ed676800ec3 Mon Sep 17 00:00:00 2001
From: Jakub Adam <jakub.adam@ktknet.cz>
Date: Sun, 29 Apr 2012 16:46:01 +0200
Subject: [PATCH] Search for JNI libraries in Debian location /usr/lib/jni

This allows Sun/Oracle JRE to find the libraries.
---
 org/eclipse/swt/internal/Library.java |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java
index b982f3f..248bda6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java	
@@ -291,6 +291,10 @@
 	if (load (libName1, message)) return;
 	if (mapName && load (libName2, message)) return;
 
+	/* Try the Debian location /usr/lib/jni/ */
+	if (load ("/usr/lib/jni" + SEPARATOR + mappedName1, message)) return;
+	if (mapName && load ("/usr/lib/jni" + SEPARATOR + mappedName2, message)) return;
+
 	/* Try loading library from the tmp directory if swt library path is not specified.
 	 * Create the tmp folder if it doesn't exist. Tmp folder looks like this:
 	 * ~/.swt/lib/<platform>/<arch>/