Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Pavel Valena
1fff8bd681 Update to activesupport 7.0.4.3. 2023-03-27 04:55:14 +02:00
Pavel Valena
1782c73af2 Update to activesupport 7.0.4.2. 2023-03-09 14:33:55 +01:00
4 changed files with 41 additions and 46 deletions

View file

@ -1,35 +0,0 @@
From 5b21d3029e2b2f985adab467a11c00b5e54f2ab5 Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sat, 5 Feb 2022 17:09:29 +1030
Subject: [PATCH 1/2] Defer loading XmlMini until it's needed
It's used for {Array,Hash}#to_xml, but that doesn't seem worth loading
by default.
---
activesupport/lib/active_support/core_ext/array/conversions.rb | 1 -
activesupport/lib/active_support/core_ext/hash/conversions.rb | 1 -
2 files changed, 2 deletions(-)
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index 82cc221a3c981..2195731442153 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -1,6 +1,5 @@
# frozen_string_literal: true
-require "active_support/xml_mini"
require "active_support/core_ext/hash/keys"
require "active_support/core_ext/string/inflections"
require "active_support/core_ext/object/to_param"
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 2b5e484d215ee..9a1db92d6d255 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -1,6 +1,5 @@
# frozen_string_literal: true
-require "active_support/xml_mini"
require "active_support/core_ext/object/blank"
require "active_support/core_ext/object/to_param"
require "active_support/core_ext/object/to_query"

View file

@ -0,0 +1,23 @@
From 60ffaac2e9644076e53afa1a2b1a716e289b7085 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Thu, 15 Dec 2022 15:45:27 +0900
Subject: [PATCH] RubyVM class serial is no longer available in Ruby 3.2
since ruby/ruby@13bd617ea6fdf72467c593639cf33312a06c330c
---
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 d366ae55b6e0..27872458d95b 100644
--- a/activesupport/test/executor_test.rb
+++ b/activesupport/test/executor_test.rb
@@ -226,7 +226,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

View file

@ -4,8 +4,8 @@
Name: rubygem-%{gem_name}
Epoch: 1
Version: 7.0.2.3
Release: 3%{?dist}
Version: 7.0.4.3
Release: 1%{?dist}
Summary: A support libraries and Ruby core extensions extracted from the Rails framework
License: MIT
URL: http://rubyonrails.org
@ -13,22 +13,22 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem
# The activesupport gem doesn't ship with the test suite.
# You may check it out like so
# git clone http://github.com/rails/rails.git
# cd rails/activesupport && git archive -v -o activesupport-7.0.2.3-tests.txz v7.0.2.3 test/
# cd rails/activesupport && git archive -v -o activesupport-7.0.4.3-tests.txz v7.0.4.3 test/
Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz
# The tools are needed for the test suite, are however unpackaged in gem file.
# You may get them like so
# git clone http://github.com/rails/rails.git --no-checkout
# cd rails && git archive -v -o rails-7.0.2.3-tools.txz v7.0.2.3 tools/
# cd rails && git archive -v -o rails-7.0.4.3-tools.txz v7.0.4.3 tools/
Source2: rails-%{version}%{?prerelease}-tools.txz
# Defer loading XmlMini until it's needed
# https://github.com/rails/rails/pull/44340
Patch0: rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch
# Fixes for Minitest 5.16+
# https://github.com/rails/rails/pull/45380
Patch1: rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch
Patch2: rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with-test.patch
# https://github.com/rails/rails/pull/45370
Patch3: rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch
# https://github.com/rails/rails/pull/46735
# Fix for test failure with ruby3.2 wrt class_serial removal
Patch4: rubygem-activesupport-7.0.4-ruby32-rubyvm-class_serial-removal.patch
# ruby package has just soft dependency on rubygem({bigdecimal,json}), while
# ActiveSupport always requires them.
@ -71,12 +71,12 @@ Documentation for %{name}.
%prep
%setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2
%patch0 -p2
%patch1 -p2
%patch3 -p2
pushd %{_builddir}
%patch2 -p2
%patch4 -p2
popd
%build
@ -136,6 +136,13 @@ popd
%doc %{gem_instdir}/README.rdoc
%changelog
* Tue Mar 14 2023 Pavel Valena <pvalena@redhat.com> - 1:7.0.4.3-1
- Update to activesupport 7.0.4.3.
* Wed Mar 01 2023 Pavel Valena <pvalena@redhat.com> - 1:7.0.4.2-1
- Update to activesupport 7.0.4.2.
- Backport upstream fix for test failure with ruby3.2 wrt class_serial removal
* Tue Aug 02 2022 Vít Ondruch <vondruch@redhat.com> - 1:7.0.2.3-3
- Fix Minitest 5.16+ compatibility.

View file

@ -1,3 +1,3 @@
SHA512 (activesupport-7.0.2.3.gem) = 60adee8a89d3c4dea7d8f4dba8447d34b6dcadafe61524a2dee175f71d0671e0b003100367b025fb699cdfa31bb0a902415b84ed922b71fcb92f00f8688b097b
SHA512 (activesupport-7.0.2.3-tests.txz) = ecb0d3e3d6c8c2fea86233346c756ffd38df6009b8e7b7b92c84765c965637bc0153e6efb0634b3ebfe9716c261096249c2e0f74453f56421993d60c0d53b5f4
SHA512 (rails-7.0.2.3-tools.txz) = 09a73c12d4cce5dcf8e13f641a6799fc4f943872dfd312530f4239ab18ab2ff05e9a1971a8a84b4dc650f4bf12572fdaec91f8da18424a7a6e587cba0089ae00
SHA512 (activesupport-7.0.4.3.gem) = 3592b76089b1d0a8cecf04af8270a17f53c9551e945076afa9a8419be689b3ebbf60864c2d6392493802b63e1afcae84ce00c2b6acdc2b9973e5b160e64c3eff
SHA512 (activesupport-7.0.4.3-tests.txz) = 95f6629e259ae833d4bfbbf92c2f103256f2d24b01a37638bea6ffcf58b8068a270491321b44e3056b48a14ae6319ff538157e129787f5205446e512cb649c6a
SHA512 (rails-7.0.4.3-tools.txz) = 927315a00681680f3fd2aa9bcf95f6867b6ecafbfe0caf16d4f434e6a4abe77393dab1b909ad2b309eebd821da107f7b4ce7f2739c07b439cb3f16853b2f0dcf