commit: c25f0dd3afc498c7fe8e6ec814b18d09173beaf8 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Apr 22 18:30:15 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Apr 26 20:38:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c25f0dd3
dev-ruby/activerecord: remove unused patch(es) 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> .../activerecord-6.1.7.4-ruby32-keywords.patch | 38 ---------------------- 1 file changed, 38 deletions(-) diff --git a/dev-ruby/activerecord/files/activerecord-6.1.7.4-ruby32-keywords.patch b/dev-ruby/activerecord/files/activerecord-6.1.7.4-ruby32-keywords.patch deleted file mode 100644 index 4a82e18aaba1..000000000000 --- a/dev-ruby/activerecord/files/activerecord-6.1.7.4-ruby32-keywords.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 67bdba4e63cad218c02dbb3171ddd53353cc0b48 Mon Sep 17 00:00:00 2001 -From: Javier Jimenez <[email protected]> -Date: Thu, 5 Jan 2023 21:34:37 +0100 -Subject: [PATCH] Backports ruby 3.2 compatibility fixes for rails 6.1 - ---- - actionmailer/lib/action_mailer/base.rb | 2 +- - actionmailer/lib/action_mailer/rescuable.rb | 12 ++++++++---- - actionpack/lib/abstract_controller/base.rb | 10 +++++++--- - actionpack/lib/abstract_controller/callbacks.rb | 6 +++++- - actionview/lib/action_view/rendering.rb | 6 +++++- - activemodel/lib/active_model/attribute_methods.rb | 2 +- - activerecord/lib/active_record/relation.rb | 8 ++++++-- - 7 files changed, 33 insertions(+), 13 deletions(-) - -diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb -index 6ea5876eda1b8..9c0efb800efd0 100644 ---- a/lib/active_record/relation.rb -+++ b/lib/active_record/relation.rb -@@ -406,12 +406,16 @@ def scoping - already_in_scope? ? yield : _scoping(self) { yield } - end - -- def _exec_scope(*args, &block) # :nodoc: -+ all_args = RUBY_VERSION < "2.7" ? "*args, &block" : "..." -+ -+ class_eval <<-RUBY -+ def _exec_scope(#{all_args}) # :nodoc: - @delegate_to_klass = true -- _scoping(nil) { instance_exec(*args, &block) || self } -+ _scoping(nil) { instance_exec(#{all_args}) || self } - ensure - @delegate_to_klass = false - end -+ RUBY - - # Updates all records in the current relation with details given. This method constructs a single SQL UPDATE - # statement and sends it straight to the database. It does not instantiate the involved models and it does not
