From 2496f2979418370ed09ec18dbe9a3bafc0045d0e Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Wed, 9 Feb 2022 23:10:49 +0100 Subject: [PATCH] Update to activesupport 7.0.2.3. --- ...esupport-7.0.2-Defer-loading-XmlMini.patch | 35 +++++++++++++++++++ rubygem-activesupport.spec | 14 ++++++-- sources | 6 ++-- 3 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch diff --git a/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch b/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch new file mode 100644 index 0000000..6c6d529 --- /dev/null +++ b/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch @@ -0,0 +1,35 @@ +From 5b21d3029e2b2f985adab467a11c00b5e54f2ab5 Mon Sep 17 00:00:00 2001 +From: Matthew Draper +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" + diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 3d07fe3..2e12b80 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.1 +Version: 7.0.2.3 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,13 +13,16 @@ 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.1-tests.txz v7.0.1 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.2.3-tests.txz v7.0.2.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.1-tools.txz v7.0.1 tools/ +# cd rails && git archive -v -o rails-7.0.2.3-tools.txz v7.0.2.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 # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -62,6 +65,8 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2 +%patch0 -p2 + %build gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec %gem_install @@ -119,6 +124,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Mon Mar 14 2022 Pavel Valena - 1:7.0.2.3-1 +- Update to activesupport 7.0.2.3. + * Thu Feb 03 2022 Pavel Valena - 1:7.0.1-1 - Update to activesupport 7.0.1. diff --git a/sources b/sources index 9f6e045..438d992 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-7.0.1.gem) = 38747dabe8364d07899525e8b2feeedad0e7aa1efc591f3747a0a0eca91b73049bdf1a4397f3d4ac554e92bfa17898c509bc8a66de5a1ef30490ec14947ee0e7 -SHA512 (activesupport-7.0.1-tests.txz) = 2186f868b921c0535dc1faf45523383aa3a5e040531f16ed5e55846aafd80b3db4c78447c025304f90ea2ed7c3d0f10ce67f924e393790bec241c7ec5ca8bbb4 -SHA512 (rails-7.0.1-tools.txz) = 3959bbb7bb5dcfa75d65d586bbdf694b80088af51597940ab06683719b37a00d52a81f61cd8c43dd1c7bf057cfea9b1b89acb74ee45c01fc3da8adec505bb4fd +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