diff options
Diffstat (limited to 'dev-ruby')
10 files changed, 4 insertions, 294 deletions
diff --git a/dev-ruby/actionmailbox/files/actionmailbox-6.1.7.4-mail28.patch b/dev-ruby/actionmailbox/files/actionmailbox-6.1.7.4-mail28.patch deleted file mode 100644 index ba4e8a822552..000000000000 --- a/dev-ruby/actionmailbox/files/actionmailbox-6.1.7.4-mail28.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f5463f314886016fb40199d1265cacddf64ea357 Mon Sep 17 00:00:00 2001 -From: Jean Boussier <jean.boussier@gmail.com> -Date: Mon, 5 Dec 2022 11:59:45 +0100 -Subject: [PATCH] Merge pull request #46643 from ghiculescu/mail-28 - -Fix CI for Mail 2.8+ ---- - .../lib/action_mailbox/mail_ext/addresses.rb | 19 +++++++++++++++---- - 1 file changed, 15 insertions(+), 4 deletions(-) - -diff --git a/actionmailbox/lib/action_mailbox/mail_ext/addresses.rb b/actionmailbox/lib/action_mailbox/mail_ext/addresses.rb -index 5eab1feb3d563..7da7ee2586a62 100644 ---- a/lib/action_mailbox/mail_ext/addresses.rb -+++ b/lib/action_mailbox/mail_ext/addresses.rb -@@ -3,7 +3,7 @@ - module Mail - class Message - def from_address -- header[:from]&.address_list&.addresses&.first -+ address_list(header[:from])&.addresses&.first - end - - def recipients_addresses -@@ -11,19 +11,30 @@ def recipients_addresses - end - - def to_addresses -- Array(header[:to]&.address_list&.addresses) -+ Array(address_list(header[:to])&.addresses) - end - - def cc_addresses -- Array(header[:cc]&.address_list&.addresses) -+ Array(address_list(header[:cc])&.addresses) - end - - def bcc_addresses -- Array(header[:bcc]&.address_list&.addresses) -+ Array(address_list(header[:bcc])&.addresses) - end - - def x_original_to_addresses - Array(header[:x_original_to]).collect { |header| Mail::Address.new header.to_s } - end -+ -+ private -+ def address_list(obj) -+ if obj&.respond_to?(:element) -+ # Mail 2.8+ -+ obj.element -+ else -+ # Mail <= 2.7.x -+ obj&.address_list -+ end -+ end - end - end diff --git a/dev-ruby/actionmailer/files/actionmailer-6.1.7.4-ruby32-keywords.patch b/dev-ruby/actionmailer/files/actionmailer-6.1.7.4-ruby32-keywords.patch deleted file mode 100644 index 7f33602f13dd..000000000000 --- a/dev-ruby/actionmailer/files/actionmailer-6.1.7.4-ruby32-keywords.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 67bdba4e63cad218c02dbb3171ddd53353cc0b48 Mon Sep 17 00:00:00 2001 -From: Javier Jimenez <javiyu7@gmail.com> -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/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb -index ae04c0419fc99..4f2620e525157 100644 ---- a/lib/action_mailer/base.rb -+++ b/lib/action_mailer/base.rb -@@ -616,6 +616,7 @@ def process(method_name, *args) #:nodoc: - @_message = NullMail.new unless @_mail_was_called - end - end -+ ruby2_keywords(:process) if respond_to?(:ruby2_keywords, true) - - class NullMail #:nodoc: - def body; "" end -diff --git a/actionmailer/lib/action_mailer/rescuable.rb b/actionmailer/lib/action_mailer/rescuable.rb -index ffcaa1f79526d..d949e4681e30c 100644 ---- a/lib/action_mailer/rescuable.rb -+++ b/lib/action_mailer/rescuable.rb -@@ -20,10 +20,14 @@ def handle_exceptions #:nodoc: - end - - private -- def process(*) -- handle_exceptions do -- super -- end -+ all_args = RUBY_VERSION < "2.7" ? "*" : "..." -+ -+ class_eval <<-RUBY -+ def process(#{all_args}) -+ handle_exceptions do -+ super - end -+ end -+ RUBY - end - end 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 <javiyu7@gmail.com> -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 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 <jonathan@hefner.pro> -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 <jean.boussier@gmail.com> ---- 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 <skipkayhil@gmail.com> -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 <jean.boussier@gmail.com> -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 diff --git a/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-2.3.0.ebuild b/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-2.3.0.ebuild index c2f64cf7ec87..582a796e16d9 100644 --- a/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-2.3.0.ebuild +++ b/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-2.3.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby31 ruby32 ruby33" +USE_RUBY="ruby31 ruby32 ruby33 ruby34" RUBY_FAKEGEM_BINWRAP="" RUBY_FAKEGEM_RECIPE_TEST="rspec3" @@ -20,7 +20,7 @@ SRC_URI="https://github.com/lostisland/faraday-net_http_persistent/archive/v${PV LICENSE="MIT" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="test" ruby_add_rdepend " diff --git a/dev-ruby/faraday-retry/faraday-retry-2.3.0.ebuild b/dev-ruby/faraday-retry/faraday-retry-2.3.0.ebuild index 245094dd84c0..b7643200502c 100644 --- a/dev-ruby/faraday-retry/faraday-retry-2.3.0.ebuild +++ b/dev-ruby/faraday-retry/faraday-retry-2.3.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -USE_RUBY="ruby31 ruby32 ruby33" +USE_RUBY="ruby31 ruby32 ruby33 ruby34" RUBY_FAKEGEM_BINWRAP="" RUBY_FAKEGEM_RECIPE_TEST="rspec3" diff --git a/dev-ruby/multi_xml/files/multi_xml-0.6.0-ox24.patch b/dev-ruby/multi_xml/files/multi_xml-0.6.0-ox24.patch deleted file mode 100644 index a0568a8fb52e..000000000000 --- a/dev-ruby/multi_xml/files/multi_xml-0.6.0-ox24.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f9d18d87c3340aa53f524524bf189b99459ab1e6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz> -Date: Thu, 18 May 2017 23:10:48 +0200 -Subject: [PATCH] Update for ox > 2.4.11 - -There is more pedantic parsing of white-space characters in ox > 2.4.11. Better to set explicitly the expected skip mode. ---- - lib/multi_xml/parsers/ox.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/multi_xml/parsers/ox.rb b/lib/multi_xml/parsers/ox.rb -index e52a560..dc1413e 100644 ---- a/lib/multi_xml/parsers/ox.rb -+++ b/lib/multi_xml/parsers/ox.rb -@@ -29,7 +29,7 @@ def parse_error - - def parse(io) - handler = Handler.new -- ::Ox.sax_parse(handler, io, :convert_special => true) -+ ::Ox.sax_parse(handler, io, convert_special: true, skip: :skip_return) - handler.doc - end - diff --git a/dev-ruby/thor/files/thor-1.2.2-no-coverage.patch b/dev-ruby/thor/files/thor-1.2.2-no-coverage.patch deleted file mode 100644 index f57cbfeb63f5..000000000000 --- a/dev-ruby/thor/files/thor-1.2.2-no-coverage.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/spec/helper.rb -+++ b/spec/helper.rb -@@ -1,17 +1,5 @@ - $TESTING = true - --if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0") -- require "simplecov" -- require "coveralls" -- -- SimpleCov.formatters = [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter] -- -- SimpleCov.start do -- add_filter "/spec" -- minimum_coverage(90) -- end --end -- - $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib")) - require "thor" - require "thor/group" -@@ -22,8 +10,6 @@ require "rspec" - require "diff/lcs" # You need diff/lcs installed to run specs (but not to run Thor). - require "webmock/rspec" - --WebMock.disable_net_connect!(:allow => "coveralls.io") -- - # Set shell to basic - ENV["THOR_COLUMNS"] = "10000" - $0 = "thor" |