[sikuli] 10/53: New patch jruby-compat-1.9.patch

Gilles Filippini pini at moszumanska.debian.org
Sun Jun 29 20:38:44 UTC 2014


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

pini pushed a commit to branch master
in repository sikuli.

commit 6aceca50c45016c9f6aa2a0ec119ee00346c7397
Author: Gilles Filippini <pini at debian.org>
Date:   Sat May 10 13:46:14 2014 +0200

    New patch jruby-compat-1.9.patch
    
    to force Ruby 1.9 compatibility for JRuby.
    The JRuby version (1.5.6) in Debian is too old for Ruby 2.0 compatibility.
---
 debian/patches/jruby-compat-1.9.patch | 13 +++++++++++++
 debian/patches/series                 |  1 +
 2 files changed, 14 insertions(+)

diff --git a/debian/patches/jruby-compat-1.9.patch b/debian/patches/jruby-compat-1.9.patch
new file mode 100644
index 0000000..afc92c1
--- /dev/null
+++ b/debian/patches/jruby-compat-1.9.patch
@@ -0,0 +1,13 @@
+Index: sikuli/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
+===================================================================
+--- sikuli.orig/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java	2014-05-05 19:49:15.456850468 +0200
++++ sikuli/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java	2014-05-10 13:27:05.416243313 +0200
+@@ -440,7 +440,7 @@
+ 
+ 			interpreter = new ScriptingContainer(
+ 							LocalContextScope.THREADSAFE);
+-			interpreter.setCompatVersion(CompatVersion.RUBY2_0);
++			interpreter.setCompatVersion(CompatVersion.RUBY1_9);
+ 			interpreter.setCompileMode(CompileMode.JIT);
+ 		}
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
index abdf50f..e413620 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ basics-exclude-windows-mac.patch
 no-maven-repo-dependencies.patch
 #resources-out-of-jar.patch
 pom-removed-modules.patch
+jruby-compat-1.9.patch

-- 
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