From 256558a07e990e1ab80a467689b9fb7bbc3298bf Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Thu, 27 Nov 2025 10:11:53 +0800
Subject: [PATCH] Fix build error for concurrent-ruby 1.3.5

---
 ...he-logger-gem-is-loaded-in-Rails-7-0.patch | 22 +++++++++++++++++++
 rubygem-activesupport.spec                    | 20 ++++++++++++-----
 2 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch

diff --git a/rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch b/rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch
new file mode 100644
index 0000000..1430571
--- /dev/null
+++ b/rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch
@@ -0,0 +1,22 @@
+From 6a7c72c078715380bf24f029624e6b1fb3035c97 Mon Sep 17 00:00:00 2001
+From: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
+Date: Thu, 16 Jan 2025 11:17:29 +0200
+Subject: [PATCH] Ensure the logger gem is loaded in Rails 7.0
+
+Fix #54260, #54263
+---
+ activesupport/lib/active_support/logger_thread_safe_level.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/activesupport/lib/active_support/logger_thread_safe_level.rb b/activesupport/lib/active_support/logger_thread_safe_level.rb
+index 042f484f8210d..aa84a7c5de5c6 100644
+--- a/activesupport/lib/active_support/logger_thread_safe_level.rb
++++ b/activesupport/lib/active_support/logger_thread_safe_level.rb
+@@ -4,6 +4,7 @@
+ require "active_support/core_ext/module/attribute_accessors"
+ require "concurrent"
+ require "fiber"
++require "logger"
+ 
+ module ActiveSupport
+   module LoggerThreadSafeLevel # :nodoc:
diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec
index a69cc0d..6b789c3 100644
--- a/rubygem-activesupport.spec
+++ b/rubygem-activesupport.spec
@@ -2,7 +2,7 @@
 Name:                rubygem-%{gem_name}
 Epoch:               1
 Version:             7.0.7
-Release:             2
+Release:             3
 Summary:             A support libraries and Ruby core extensions extracted from the Rails framework
 License:             MIT
 URL:                 http://rubyonrails.org
@@ -25,6 +25,10 @@ Patch2: rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_calle
 Patch3: rubygem-activesupport-7.0.2.3-Fix-tests-for-minitest-5.16.patch
 Patch4: CVE-2023-38037.patch
 Patch5: CVE-2023-38037-test.patch
+# concurrent-ruby 1.3.5+ drops Logger dependency. Make sure to load Logger
+# explicitly.
+# https://github.com/rails/rails/pull/54264
+Patch6: rubygem-activesupport-7.0.8-Ensure-the-logger-gem-is-loaded-in-Rails-7-0.patch
 
 Requires:            rubygem(bigdecimal) rubygem(json)
 BuildRequires:       ruby(release) rubygems-devel ruby >= 2.2.2 rubygem(bigdecimal) rubygem(builder)
@@ -46,13 +50,14 @@ Documentation for %{name}.
 
 %prep
 %setup -q -n %{gem_name}-%{version} -b1 -b2
-%patch1 -p2
-%patch3 -p2
-%patch4 -p2
+%patch -P1 -p2
+%patch -P3 -p2
+%patch -P4 -p2
+%patch -P6 -p2
 
 pushd %{_builddir}
-%patch2 -p2
-%patch5 -p2
+%patch -P2 -p2
+%patch -P5 -p2
 popd
 
 %build
@@ -99,6 +104,9 @@ popd
 %doc %{gem_instdir}/README.rdoc
 
 %changelog
+* Thu Nov 27 2025 wangkai <13474090681@163.com> - 1:7.0.7-3
+- Fix build error for concurrent-ruby 1.3.5
+
 * Mon Sep 11 2023 wangkai <13474090681@163.com> - 1:7.0.7-2
 - Fix CVE-2023-38037
 
-- 
Gitee