commit: 7fe869d7a6285fc54bd574a832bce889490b7b3b Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Apr 22 18:30:53 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Apr 26 20:38:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fe869d7
dev-ruby/activesupport: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Part-of: https://github.com/gentoo/gentoo/pull/41702 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../activesupport-6.1.7.3-ruby-thread-noise.patch | 41 ---------------------- .../files/activesupport-6.1.7.4-bytesplice.patch | 29 --------------- .../files/activesupport-6.1.7.4-class_serial.patch | 23 ------------ 3 files changed, 93 deletions(-) diff --git a/dev-ruby/activesupport/files/activesupport-6.1.7.3-ruby-thread-noise.patch b/dev-ruby/activesupport/files/activesupport-6.1.7.3-ruby-thread-noise.patch deleted file mode 100644 index dabe1331a307..000000000000 --- a/dev-ruby/activesupport/files/activesupport-6.1.7.3-ruby-thread-noise.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://github.com/rails/rails/commit/60fc40ea58de8b6faf98081d659e7f5b232aa25e - -From 60fc40ea58de8b6faf98081d659e7f5b232aa25e Mon Sep 17 00:00:00 2001 -From: Jonathan Hefner <[email protected]> -Date: Thu, 22 Jul 2021 13:45:57 -0500 -Subject: [PATCH] Isolate descendants garbage collection test - -This prevents the test from being affected by Ruby-internal thread -locals set by other tests. - -Example failure: https://buildkite.com/rails/rails/builds/79505#cb261462-8e40-4adc-99fc-81708a473cc6/1076-1085 - -Co-authored-by: Jean Boussier <[email protected]> ---- a/test/descendants_tracker_test_cases.rb -+++ b/test/descendants_tracker_test_cases.rb -@@ -28,11 +28,23 @@ def test_descendants - end - - def test_descendants_with_garbage_collected_classes -- 1.times do -+ # The Ruby GC (and most other GCs for that matter) are not fully precise. -+ # When GC is run, the whole stack is scanned to mark any object reference -+ # in registers. But some of these references might simply be leftovers from -+ # previous method calls waiting to be overridden, and there's no definite -+ # way to clear them. By executing this code in a distinct thread, we ensure -+ # that such references are on a stack that will be entirely garbage -+ # collected, effectively working around the problem. -+ Thread.new do - child_klass = Class.new(Parent) - assert_equal_sets [Child1, Grandchild1, Grandchild2, Child2, child_klass], Parent.descendants -+ end.join -+ -+ # Calling `GC.start` 4 times should trigger a full GC run -+ 4.times do -+ GC.start - end -- GC.start -+ - assert_equal_sets [Child1, Grandchild1, Grandchild2, Child2], Parent.descendants - end - diff --git a/dev-ruby/activesupport/files/activesupport-6.1.7.4-bytesplice.patch b/dev-ruby/activesupport/files/activesupport-6.1.7.4-bytesplice.patch deleted file mode 100644 index fc4096622bb4..000000000000 --- a/dev-ruby/activesupport/files/activesupport-6.1.7.4-bytesplice.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9e1169b96164eb5ba6bf8ca7744aa3a512cf9439 Mon Sep 17 00:00:00 2001 -From: Hartley McGuire <[email protected]> -Date: Mon, 13 Mar 2023 19:05:18 -0400 -Subject: [PATCH] Fix NoMethodError in SafeBuffer#bytesplice - -`html_escape_interpolated_argument` was [renamed][1] to -`implicit_html_escape_interpolated_argument` during Rails 7.0 -development, so the security fix [backport][2] ended up with the wrong -method name. - -[1]: 147f207a57a03fc7a52040aa1f6878cf70ee0db7 -[2]: 3cf23c3f891e2e81c977ea4ab83b62bc2a444b70 ---- - .../lib/active_support/core_ext/string/output_safety.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb -index a627540a353db..c5c5d4858ffec 100644 ---- a/lib/active_support/core_ext/string/output_safety.rb -+++ b/lib/active_support/core_ext/string/output_safety.rb -@@ -217,7 +217,7 @@ def concat(value) - alias << concat - - def bytesplice(*args, value) -- super(*args, implicit_html_escape_interpolated_argument(value)) -+ super(*args, html_escape_interpolated_argument(value)) - end - - def insert(index, value) diff --git a/dev-ruby/activesupport/files/activesupport-6.1.7.4-class_serial.patch b/dev-ruby/activesupport/files/activesupport-6.1.7.4-class_serial.patch deleted file mode 100644 index 18a05331ead1..000000000000 --- a/dev-ruby/activesupport/files/activesupport-6.1.7.4-class_serial.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 45e9d5ea0dc61eb8d5977ef4f0d416d0ffcb8575 Mon Sep 17 00:00:00 2001 -From: Jean Boussier <[email protected]> -Date: Thu, 15 Dec 2022 10:06:04 +0100 -Subject: [PATCH] Merge pull request #46735 from amatsuda/ruby32_class_serial - -A quick fix for a Ruby 3.2 + Active Support test failure ---- - activesupport/test/executor_test.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/activesupport/test/executor_test.rb b/activesupport/test/executor_test.rb -index ac87780b23ccb..b3021c4e70ef8 100644 ---- a/test/executor_test.rb -+++ b/test/executor_test.rb -@@ -194,7 +194,7 @@ def test_hook_insertion_order - end - - def test_class_serial_is_unaffected -- skip if !defined?(RubyVM) -+ skip if !defined?(RubyVM) || !RubyVM.stat.has_key?(:class_serial) - - hook = Class.new do - define_method(:run) do
