diff --git a/jruby-snakeyaml-1.20.patch b/jruby-snakeyaml-1.20.patch new file mode 100644 index 0000000..53354b9 --- /dev/null +++ b/jruby-snakeyaml-1.20.patch @@ -0,0 +1,30 @@ +diff --git a/core/src/main/java/org/jruby/ext/psych/PsychEmitter.java b/core/src/main/java/org/jruby/ext/psych/PsychEmitter.java +index d9f3231..4a0ba0d 100644 +--- a/core/src/main/java/org/jruby/ext/psych/PsychEmitter.java ++++ b/core/src/main/java/org/jruby/ext/psych/PsychEmitter.java +@@ -330,7 +330,7 @@ public class PsychEmitter extends RubyObject { + DumperOptions options = new DumperOptions(); + IRubyObject io; + +- private static final Mark NULL_MARK = new Mark(null, 0, 0, 0, null, 0); ++ private static final Mark NULL_MARK = new Mark((String) null, 0, 0, 0, (String) null, 0); + + // Map style constants from Psych values (ANY = 0 ... FOLDED = 5) + // to SnakeYaml values; see psych/nodes/scalar.rb. +diff --git a/core/src/main/java/org/jruby/ext/psych/PsychParser.java b/core/src/main/java/org/jruby/ext/psych/PsychParser.java +index 33a98b5..7cff388 100644 +--- a/core/src/main/java/org/jruby/ext/psych/PsychParser.java ++++ b/core/src/main/java/org/jruby/ext/psych/PsychParser.java +@@ -345,10 +345,10 @@ public class PsychParser extends RubyObject { + } + } + +- private static int translateFlowStyle(Boolean flowStyle) { ++ private static int translateFlowStyle(DumperOptions.FlowStyle flowStyle) { + if (flowStyle == null) return 0; // any + +- if (flowStyle) return 2; ++ if (flowStyle.getStyleBoolean()) return 2; + return 1; + } + diff --git a/jruby.spec b/jruby.spec index 84c482c..32e6d0f 100644 --- a/jruby.spec +++ b/jruby.spec @@ -3,7 +3,7 @@ %global rubygems_dir %{_datadir}/rubygems Name: jruby Version: 1.7.22 -Release: 1 +Release: 2 Summary: Pure Java implementation of the Ruby interpreter License: (CPL or GPLv2+ or LGPLv2+) and BSD and (GPLv2 or Ruby) and (BSD or Ruby) URL: http://jruby.org @@ -12,6 +12,7 @@ Patch0: jruby-add-classpath-to-start-script.patch Patch1: jruby-include-unbundled-jansi.patch Patch2: jruby-remove-rubygems-dirs-definition.patch Patch3: jruby-snakeyaml-1.16.patch +Patch4: jruby-snakeyaml-1.20.patch BuildRequires: maven-local mvn(bsf:bsf) mvn(com.github.jnr:jffi) BuildRequires: mvn(com.github.jnr:jffi::native:) mvn(com.github.jnr:jnr-constants) BuildRequires: mvn(com.github.jnr:jnr-enxio) mvn(com.github.jnr:jnr-ffi) @@ -57,11 +58,7 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 find -name "*.exe" -delete find -name "*.dll" -delete find -name ".gitignore" -delete @@ -138,5 +135,8 @@ EOF %doc COPYING LICENSE.RUBY LEGAL %changelog +* Thu Mar 09 2023 yaoxin - 1.7.22-2 +- Fix build failure due to snakeyaml update to 1.32 + * Mon Aug 24 2020 wangchong - 1.7.22-1 - package init