[sikuli] 13/21: Fix patch native.patch

Gilles Filippini pini at debian.org
Sat Nov 7 12:11:54 UTC 2015


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

pini pushed a commit to branch master
in repository sikuli.

commit 1feef376f5538dbbe88986dc26e369c492120897
Author: Gilles Filippini <pini at debian.org>
Date:   Wed Nov 4 15:36:43 2015 +0100

    Fix patch native.patch
---
 debian/patches/native.patch | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/debian/patches/native.patch b/debian/patches/native.patch
index 4d5f5c1..0543a6f 100644
--- a/debian/patches/native.patch
+++ b/debian/patches/native.patch
@@ -82,3 +82,30 @@ Index: sikuli/API/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java
     }
  
     class HotkeyData {
+Index: sikuli/API/src/main/java/org/sikuli/script/RunTime.java
+===================================================================
+--- sikuli.orig/API/src/main/java/org/sikuli/script/RunTime.java
++++ sikuli/API/src/main/java/org/sikuli/script/RunTime.java
+@@ -882,7 +882,6 @@ Point pNull = new Point(0, 0);
+   private void libsExport(Type typ) {
+     shouldExport = false;
+     makeFolders();
+-    URL uLibsFrom = null;
+     if (!libsCheck(fLibsFolder)) {
+       FileManager.deleteFileOrFolder(fLibsFolder);
+       fLibsFolder.mkdirs();
+@@ -927,14 +926,6 @@ Point pNull = new Point(0, 0);
+       if (!fpLibsFrom.isEmpty()) {
+         addToClasspath(fpLibsFrom);
+       }
+-      uLibsFrom = clsRef.getResource(fpJarLibs);
+-      if (testing || uLibsFrom == null) {
+-        dumpClassPath();
+-      }
+-      if (uLibsFrom == null) {
+-        terminate(1, "libs to export not found on above classpath: " + fpJarLibs);
+-      }
+-      log(lvl, "libs to export are at:\n%s", uLibsFrom);
+       if (runningWinApp || testingWinApp) {
+         String libsAccepted = "libs" + javaArch;
+         extractResourcesToFolder(fpJarLibs, fLibsFolder, new LibsFilter(libsAccepted));

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



More information about the pkg-java-commits mailing list