[jruby] 01/01: Add compatibility patch with recent versions of snakeyaml

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository jruby.

commit 4f4ee430751ddcc0faedd551691443453a95e701
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Apr 16 15:02:48 2016 +0100

    Add compatibility patch with recent versions of snakeyaml
---
 .../patches/0011-Snakeyaml-1.17-compatibility.patch   | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/0011-Snakeyaml-1.17-compatibility.patch b/debian/patches/0011-Snakeyaml-1.17-compatibility.patch
new file mode 100644
index 0000000..3dcfe2c
--- /dev/null
+++ b/debian/patches/0011-Snakeyaml-1.17-compatibility.patch
@@ -0,0 +1,19 @@
+Description: Add compatibility with recent versions of snakeyaml
+Author: Miguel Landaeta <nomadium at debian.org>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/821181
+Forwarded: no
+Last-Update: 2016-04-16
+
+--- jruby-1.7.25.orig/core/src/main/java/org/jruby/ext/psych/PsychParser.java
++++ jruby-1.7.25/core/src/main/java/org/jruby/ext/psych/PsychParser.java
+@@ -242,7 +242,8 @@ public class PsychParser extends RubyObj
+     private void handleDocumentStart(ThreadContext context, DocumentStartEvent dse, boolean tainted, IRubyObject handler) {
+         Ruby runtime = context.runtime;
+         DumperOptions.Version _version = dse.getVersion();
+-        Integer[] versionInts = _version == null ? null : _version.getArray();
++        // upstream keep using older versions of snakeyaml
++        Integer[] versionInts = _version == null ? null : new Integer[]{_version.major(), _version.minor()};
+         IRubyObject version = versionInts == null ?
+             RubyArray.newArray(runtime) :
+             RubyArray.newArray(runtime, runtime.newFixnum(versionInts[0]), runtime.newFixnum(versionInts[1]));
diff --git a/debian/patches/series b/debian/patches/series
index ff1ca8d..73fd92f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0008-Disable-some-failing-user-tests-in-pbuilder.patch
 0009-Disable-bigdecimal-divmod-spec-failing-test.patch
 0010-Disable-maven-invoker-plugin.patch
+0011-Snakeyaml-1.17-compatibility.patch

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