[sikuli] 16/21: New patches fix-interactive-jruby.patch and fix-log-parameters-order.patch

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository sikuli.

commit ada07fb76cb667b94a5fc1126fe1344f78a1ca9f
Author: Gilles Filippini <pini at debian.org>
Date:   Fri Nov 6 15:33:01 2015 +0100

    New patches fix-interactive-jruby.patch and fix-log-parameters-order.patch
    
    fix-interactive-jruby.patch was supposed to fix 'sikulix -i jruby' but
    this just leads to another error. It is dosabled for now.
---
 debian/patches/fix-interactive-jruby.patch    | 29 +++++++++++++++++++++++++++
 debian/patches/fix-log-parameters-order.patch | 21 +++++++++++++++++++
 debian/patches/series                         |  4 ++++
 3 files changed, 54 insertions(+)

diff --git a/debian/patches/fix-interactive-jruby.patch b/debian/patches/fix-interactive-jruby.patch
new file mode 100644
index 0000000..277c8d1
--- /dev/null
+++ b/debian/patches/fix-interactive-jruby.patch
@@ -0,0 +1,29 @@
+Description: tentative fix for 'sikulix -i jruby'
+ unsuccessful so far.
+Author: Gilles Filippini <pini at debian.org>
+Index: sikuli/IDE/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
+===================================================================
+--- sikuli.orig/IDE/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
++++ sikuli/IDE/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
+@@ -149,7 +149,7 @@ public class JRubyScriptRunner implement
+             String[] args = null;
+             String[] iargs = {/*"-i", "-c",*/
+                 "require 'irb'\n"
+-                + "ScriptRunner.runningInteractive();\n"
++                + "ScriptingSupport.runningInteractive();\n"
+                 + "print \"Hello, this is your interactive Sikuli (rules for interactive Ruby apply)\\n"
+                 + "use the UP/DOWN arrow keys to walk through the input history\\n"
+                 + "help()<enter> will output some basic Ruby information\\n"
+Index: sikuli/JRubyGem/lib/sikulix/sikulix.rb
+===================================================================
+--- sikuli.orig/JRubyGem/lib/sikulix/sikulix.rb
++++ sikuli/JRubyGem/lib/sikulix/sikulix.rb
+@@ -51,7 +51,7 @@ module Sikulix
+ 
+ 	$SCRIPT_SUPPORT = true
+   begin
+-    java_import org.sikuli.scriptrunner.ScriptRunner
++    java_import org.sikuli.scriptrunner.ScriptingSupport
+   rescue
+ 		$SCRIPT_SUPPORT = false
+   end
diff --git a/debian/patches/fix-log-parameters-order.patch b/debian/patches/fix-log-parameters-order.patch
new file mode 100644
index 0000000..36d59a4
--- /dev/null
+++ b/debian/patches/fix-log-parameters-order.patch
@@ -0,0 +1,21 @@
+Description: wrong order of int / string parameters in log call.
+ SikuliVersion{Major,Minor,Sub} = int
+ svf, svt, ssxbbeta = string
+ For the patch I guessed the correct order from the format string.
+Author: Gilles Filippini <pini at debian.org>
+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
+@@ -1566,9 +1566,9 @@ Point pNull = new Point(0, 0);
+         ssxbeta = String.format("-Beta%d", SikuliVersionBetaN);
+       }
+       SikuliVersionBuild = prop.getProperty("sikulixbuild");
+-      log(lvl + 1, "%s version from %s: %d.%d.%d%s build: %s", svf,
++      log(lvl + 1, "%s version from %s: %d.%d.%d%s build: %s", svt, svf,
+               SikuliVersionMajor, SikuliVersionMinor, SikuliVersionSub, ssxbeta,
+-              SikuliVersionBuild, svt);
++              SikuliVersionBuild);
+       sversion = String.format("%d.%d.%d",
+               SikuliVersionMajor, SikuliVersionMinor, SikuliVersionSub);
+       bversion = String.format("%d.%d.%d-Beta%d",
diff --git a/debian/patches/series b/debian/patches/series
index 3158019..0e70665 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
+# Deactivated because not successful yet
+#fix-interactive-jruby.patch
+
 native.patch
 install-extension.patch
 #tess3.patch
@@ -13,3 +16,4 @@ python-shebang.patch
 #no-gem-maven-plugin.patch
 dependency-opencv.patch
 no-vnc-package.patch
+fix-log-parameters-order.patch

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