From f1b594fd044535fbff42cf99be7699185b6f94cb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 10 Nov 2023 16:01:53 +0900 Subject: [PATCH] Testsuite: remove invalid yield usage from spec (for ruby3.3) --- rubygem-yard.spec | 9 ++++++++- yield-issue1514-remove-invalid-yield-usage.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 yield-issue1514-remove-invalid-yield-usage.patch diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 05af331..a4c6548 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.34 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -22,6 +22,9 @@ Source1: %{gem_name}-%{version}-test-missing-files.tar.gz Source2: yard-create-missing-test-files.sh # https://github.com/lsegal/yard/pull/1510 Patch0: yard-pr1510-fixup-BOM-encoding.patch +# https://github.com/lsegal/yard/issues/1514 +# Testsuite: remove invalid yield usage from spec (for ruby3.3) +Patch1: yield-issue1514-remove-invalid-yield-usage.patch # The 'irb/notifier' might be required for parsing of some old Ruby code. # https://github.com/lsegal/yard/blob/v0.9.24/lib/yard/parser/ruby/legacy/irb/slex.rb#L13 @@ -62,6 +65,7 @@ Documentation for %{name}. mv ../%{gem_name}-%{version}.gemspec . %patch -P0 -p1 +%patch -P1 -p1 %build gem build ./%{gem_name}-%{version}.gemspec @@ -115,6 +119,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Fri Nov 10 2023 Mamoru TASAKA - 0.9.34-4 +- Testsuite: remove invalid yield usage from spec (for ruby3.3) + * Mon Sep 25 2023 Mamoru TASAKA - 0.9.34-3 - Backport upstream patch for BOM detection change in ruby33 diff --git a/yield-issue1514-remove-invalid-yield-usage.patch b/yield-issue1514-remove-invalid-yield-usage.patch new file mode 100644 index 0000000..ff6ee79 --- /dev/null +++ b/yield-issue1514-remove-invalid-yield-usage.patch @@ -0,0 +1,12 @@ +diff --git a/spec/handlers/examples/yield_handler_001.rb.txt b/spec/handlers/examples/yield_handler_001.rb.txt +index 668f8183..ecc43276 100644 +--- a/spec/handlers/examples/yield_handler_001.rb.txt ++++ b/spec/handlers/examples/yield_handler_001.rb.txt +@@ -1,7 +1,4 @@ + class Testing +- # Ignore yields outside methods +- yield x, y, z +- + # Should document this + def mymethod + yield