From 77dee1c21cc3a45e3e454a84334072459e9e09c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:44:57 +0000 Subject: [PATCH 1/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-rmagick.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 987ede0..1dfd12d 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -9,7 +9,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ Name: rubygem-%{gem_name} Version: 6.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -144,6 +144,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 6.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jul 20 2025 Mamoru TASAKA - 6.1.2-1 - 6.1.2 From a204247da42929837dc10b08e396087f62f39a34 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 17 Aug 2025 10:44:21 +0900 Subject: [PATCH 2/7] 6.1.3 --- rubygem-rmagick.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 1dfd12d..51d55ac 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,8 +8,8 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 6.1.2 -Release: 2%{?dist} +Version: 6.1.3 +Release: 1%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -34,6 +34,7 @@ BuildRequires: rubygem(pry) # With rmagick <= 5.5.0, ImageMagick X.Y.Z should all match, # with rmagick >= 6.0.0, ImageMagick X.Y should match. %if 0%{?fedora} +%setIMver 45 1:7.1 1:7.2 %setIMver 44 1:7.1 1:7.2 %setIMver 43 1:7.1 1:7.2 %setIMver 42 1:7.1 1:7.2 @@ -144,6 +145,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Sun Aug 17 2025 Mamoru TASAKA - 6.1.3-1 +- 6.1.3 + * Fri Jul 25 2025 Fedora Release Engineering - 6.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a5e1e0ff2ef15c8c9e64e59180b118b57c0ca41b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 17 Aug 2025 12:13:00 +0900 Subject: [PATCH 3/7] upload source --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index f8d9c03..ba2a0fd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-6.1.2.gem) = afae91302878630f2ed3c4abb0ae77658a646a054e7ac579795ee6094d0e30b98951731ee976ffc25bfddacbfb4c3b485a88cc3718e8962e1edaed75ceff0e4a -SHA512 (rubygem-rmagick-6.1.2-full.tar.gz) = 7f4de3e12a227b7716b42695b1dfe8e6c690359af1280d9deb3476d82639b6c5b1181998f878bd4f90375440fb219b15ef3517cd1f7de13bddbdc8d641835a0c +SHA512 (rmagick-6.1.3.gem) = 39e2341092428dcae7eab7243bb7f2584d3f5f1e7ad944ed809bd32bbc2954e0eb04eff11a6ee1c7607017821833bc9803ab815caba333e2934a6cab4be30126 +SHA512 (rubygem-rmagick-6.1.3-full.tar.gz) = 95a2a6c308bd964df2cf27970f7184a9556803fa4eb8c6e1a41930ac678be2726c39fe97d7ec33d62abe520de6ae16b49a29caaa2f141ab8836ead44e5205285 From 9415692ce841dcc2cf3d720ce8133844321dd867 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Aug 2025 22:31:06 +0900 Subject: [PATCH 4/7] 6.1.4 --- rubygem-rmagick.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 51d55ac..66a73d6 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,7 +8,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 6.1.3 +Version: 6.1.4 Release: 1%{?dist} Summary: Ruby binding to ImageMagick @@ -145,6 +145,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Sun Aug 24 2025 Mamoru TASAKA - 6.1.4-1 +- 6.1.4 + * Sun Aug 17 2025 Mamoru TASAKA - 6.1.3-1 - 6.1.3 diff --git a/sources b/sources index ba2a0fd..72f4739 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-6.1.3.gem) = 39e2341092428dcae7eab7243bb7f2584d3f5f1e7ad944ed809bd32bbc2954e0eb04eff11a6ee1c7607017821833bc9803ab815caba333e2934a6cab4be30126 -SHA512 (rubygem-rmagick-6.1.3-full.tar.gz) = 95a2a6c308bd964df2cf27970f7184a9556803fa4eb8c6e1a41930ac678be2726c39fe97d7ec33d62abe520de6ae16b49a29caaa2f141ab8836ead44e5205285 +SHA512 (rmagick-6.1.4.gem) = 85fbe577a82f16e46394551ea0a94aa49afea53f955ce0c8889cf4527e658ab7e5fd646b1994d63c983a75281c4b2de8c12f89c5573f76732ac947fd6894b842 +SHA512 (rubygem-rmagick-6.1.4-full.tar.gz) = dc831d7459af0888eefba8fb172be0f910a7ce8f41709153923036f190de2d63d96368cc13a14f571c9b17383852d48929d21ff0a7c84689bf867ac7c22a6dbc From d2310562f5556c2e25f0df3bb8e082cb8e25d6b2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 29 Oct 2025 23:32:40 +0900 Subject: [PATCH 5/7] Apply upstream patch for ruby3_5 Ractor change for testsuite --- rmagick-pr1712-Ractor_take_removal.patch | 61 ++++++++++++++++++++++++ rubygem-rmagick.spec | 9 +++- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 rmagick-pr1712-Ractor_take_removal.patch diff --git a/rmagick-pr1712-Ractor_take_removal.patch b/rmagick-pr1712-Ractor_take_removal.patch new file mode 100644 index 0000000..54fea94 --- /dev/null +++ b/rmagick-pr1712-Ractor_take_removal.patch @@ -0,0 +1,61 @@ +From 4f072008e8fe3cb97d6d537dd7d0a44b9a1b5be1 Mon Sep 17 00:00:00 2001 +From: Shizuo Fujita +Date: Wed, 15 Oct 2025 10:58:26 +0900 +Subject: [PATCH] CI: Support Ruby 3.5 + +--- + spec/magick_spec.rb | 27 ++++++++++++++++++++++++--- + 1 file changed, 24 insertions(+), 3 deletions(-) + +diff --git a/spec/magick_spec.rb b/spec/magick_spec.rb +index 1d5425032..13d78ba6e 100644 +--- a/spec/magick_spec.rb ++++ b/spec/magick_spec.rb +@@ -76,7 +76,14 @@ + img.new_image(200, 200, Magick::GradientFill.new(100, 50, 100, 50, 'khaki1', 'turquoise')) + img.resize(20, 20) + end +- r.take ++ ++ if r.respond_to?(:take) ++ r.take ++ else ++ # Ractor#take was replaced at Ruby 3.5. ++ # https://bugs.ruby-lang.org/issues/21262 ++ r.join ++ end + end.not_to raise_error + + expect do +@@ -90,7 +97,14 @@ + gc.text(5, 20, "'20,20'") + gc.draw(img) + end +- r.take ++ ++ if r.respond_to?(:take) ++ r.take ++ else ++ # Ractor#take was replaced at Ruby 3.5. ++ # https://bugs.ruby-lang.org/issues/21262 ++ r.join ++ end + end.not_to raise_error + + unless RUBY_PLATFORM.include?('mingw') +@@ -99,7 +113,14 @@ + r = Ractor.new do + Magick.formats # rubocop:disable RSpec/DescribedClass + end +- r.take ++ ++ if r.respond_to?(:take) ++ r.take ++ else ++ # Ractor#take was replaced at Ruby 3.5. ++ # https://bugs.ruby-lang.org/issues/21262 ++ r.join ++ end + end.not_to raise_error + end + end diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 66a73d6..fc91392 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -9,7 +9,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ Name: rubygem-%{gem_name} Version: 6.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -19,6 +19,9 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # %%{SOURCE2} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rmagick-create-full-tarball.sh +# https://github.com/rmagick/rmagick/pull/1712 +# Ractor#take is removed on ruby3_5 +Patch0: rmagick-pr1712-Ractor_take_removal.patch BuildRequires: gcc-c++ BuildRequires: rubygems-devel @@ -62,6 +65,7 @@ Documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 +%patch -P0 -p1 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec # permission @@ -145,6 +149,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Wed Oct 29 2025 Mamoru TASAKA - 6.1.4-2 +- Apply upstream patch for ruby3_5 Ractor change for testsuite + * Sun Aug 24 2025 Mamoru TASAKA - 6.1.4-1 - 6.1.4 From 55877aed4830c9b9d2c31ec0110033e796fd9df9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 28 Dec 2025 21:38:23 +0900 Subject: [PATCH 6/7] 6.1.5 --- rmagick-pr1712-Ractor_take_removal.patch | 61 ------------------------ rubygem-rmagick.spec | 11 ++--- sources | 4 +- 3 files changed, 7 insertions(+), 69 deletions(-) delete mode 100644 rmagick-pr1712-Ractor_take_removal.patch diff --git a/rmagick-pr1712-Ractor_take_removal.patch b/rmagick-pr1712-Ractor_take_removal.patch deleted file mode 100644 index 54fea94..0000000 --- a/rmagick-pr1712-Ractor_take_removal.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 4f072008e8fe3cb97d6d537dd7d0a44b9a1b5be1 Mon Sep 17 00:00:00 2001 -From: Shizuo Fujita -Date: Wed, 15 Oct 2025 10:58:26 +0900 -Subject: [PATCH] CI: Support Ruby 3.5 - ---- - spec/magick_spec.rb | 27 ++++++++++++++++++++++++--- - 1 file changed, 24 insertions(+), 3 deletions(-) - -diff --git a/spec/magick_spec.rb b/spec/magick_spec.rb -index 1d5425032..13d78ba6e 100644 ---- a/spec/magick_spec.rb -+++ b/spec/magick_spec.rb -@@ -76,7 +76,14 @@ - img.new_image(200, 200, Magick::GradientFill.new(100, 50, 100, 50, 'khaki1', 'turquoise')) - img.resize(20, 20) - end -- r.take -+ -+ if r.respond_to?(:take) -+ r.take -+ else -+ # Ractor#take was replaced at Ruby 3.5. -+ # https://bugs.ruby-lang.org/issues/21262 -+ r.join -+ end - end.not_to raise_error - - expect do -@@ -90,7 +97,14 @@ - gc.text(5, 20, "'20,20'") - gc.draw(img) - end -- r.take -+ -+ if r.respond_to?(:take) -+ r.take -+ else -+ # Ractor#take was replaced at Ruby 3.5. -+ # https://bugs.ruby-lang.org/issues/21262 -+ r.join -+ end - end.not_to raise_error - - unless RUBY_PLATFORM.include?('mingw') -@@ -99,7 +113,14 @@ - r = Ractor.new do - Magick.formats # rubocop:disable RSpec/DescribedClass - end -- r.take -+ -+ if r.respond_to?(:take) -+ r.take -+ else -+ # Ractor#take was replaced at Ruby 3.5. -+ # https://bugs.ruby-lang.org/issues/21262 -+ r.join -+ end - end.not_to raise_error - end - end diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index fc91392..c640e41 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,8 +8,8 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 6.1.4 -Release: 2%{?dist} +Version: 6.1.5 +Release: 1%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -19,9 +19,6 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # %%{SOURCE2} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rmagick-create-full-tarball.sh -# https://github.com/rmagick/rmagick/pull/1712 -# Ractor#take is removed on ruby3_5 -Patch0: rmagick-pr1712-Ractor_take_removal.patch BuildRequires: gcc-c++ BuildRequires: rubygems-devel @@ -65,7 +62,6 @@ Documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 -%patch -P0 -p1 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec # permission @@ -149,6 +145,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Sun Dec 28 2025 Mamoru TASAKA - 6.1.5-1 +- 6.1.5 + * Wed Oct 29 2025 Mamoru TASAKA - 6.1.4-2 - Apply upstream patch for ruby3_5 Ractor change for testsuite diff --git a/sources b/sources index 72f4739..6a164e1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-6.1.4.gem) = 85fbe577a82f16e46394551ea0a94aa49afea53f955ce0c8889cf4527e658ab7e5fd646b1994d63c983a75281c4b2de8c12f89c5573f76732ac947fd6894b842 -SHA512 (rubygem-rmagick-6.1.4-full.tar.gz) = dc831d7459af0888eefba8fb172be0f910a7ce8f41709153923036f190de2d63d96368cc13a14f571c9b17383852d48929d21ff0a7c84689bf867ac7c22a6dbc +SHA512 (rmagick-6.1.5.gem) = 15157dda3185e8677c08d9b33564d1c85e3c3573ad9f6ab2358c32ec8a790eb2aa765cde095f98eb500cd818e3b71535dd289524eb35c9c5e721be3af4b1ba18 +SHA512 (rubygem-rmagick-6.1.5-full.tar.gz) = ce65bacd8e775fc4751784d427ab52a5b936ca5a465751d63380d42e0928911389f3388474c936eeb59d93d242c9923240168911705c1243b8e5d195d258fd8a From 624242d85b962138b0622763bdaf40cc5fa82c4d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 15:00:09 +0900 Subject: [PATCH 7/7] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 --- rubygem-rmagick.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index c640e41..5d0da22 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -9,7 +9,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ Name: rubygem-%{gem_name} Version: 6.1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -145,6 +145,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Thu Jan 08 2026 Mamoru TASAKA - 6.1.5-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 + * Sun Dec 28 2025 Mamoru TASAKA - 6.1.5-1 - 6.1.5