git: 47c9b274c09c - main - lang/ruby32: Update to 3.2.6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 02 Nov 2024 23:28:26 UTC
The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=47c9b274c09c660b03a6b9690f6ce4a5968f56e7 commit 47c9b274c09c660b03a6b9690f6ce4a5968f56e7 Author: Yasuhiro Kimura <yasu@FreeBSD.org> AuthorDate: 2024-10-30 15:12:04 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> CommitDate: 2024-11-02 23:26:21 +0000 lang/ruby32: Update to 3.2.6 ReleaseNotes: https://www.ruby-lang.org/en/news/2024/10/30/ruby-3-2-6-released/ PR: 282421 Exp-run by: antoine --- Mk/Uses/ruby.mk | 2 +- lang/ruby32/distinfo | 6 ++--- lang/ruby32/files/patch-tool_rbinstall.rb | 42 +++++++++++++++++++++++-------- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk index 58fbeba403c4..1e58e0f153dd 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -155,7 +155,7 @@ RUBY_PORTREVISION= 0 # # Ruby 3.2 # -RUBY_DISTVERSION= 3.2.5 +RUBY_DISTVERSION= 3.2.6 RUBY_PORTREVISION= 0 . elif ${RUBY_VER} == 3.3 diff --git a/lang/ruby32/distinfo b/lang/ruby32/distinfo index 1981a560aaf7..4798229c81e3 100644 --- a/lang/ruby32/distinfo +++ b/lang/ruby32/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723780635 -SHA256 (ruby/ruby-3.2.5.tar.xz) = 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c -SIZE (ruby/ruby-3.2.5.tar.xz) = 15189072 +TIMESTAMP = 1730295152 +SHA256 (ruby/ruby-3.2.6.tar.xz) = 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb +SIZE (ruby/ruby-3.2.6.tar.xz) = 15126888 diff --git a/lang/ruby32/files/patch-tool_rbinstall.rb b/lang/ruby32/files/patch-tool_rbinstall.rb index 039e80baaed0..81d17b5f59cf 100644 --- a/lang/ruby32/files/patch-tool_rbinstall.rb +++ b/lang/ruby32/files/patch-tool_rbinstall.rb @@ -1,6 +1,6 @@ ---- tool/rbinstall.rb.orig 2023-03-30 11:06:29 UTC +--- tool/rbinstall.rb.orig 2024-10-30 09:47:11 UTC +++ tool/rbinstall.rb -@@ -909,155 +909,6 @@ end +@@ -909,175 +909,6 @@ end # :startdoc: @@ -94,6 +94,7 @@ - end - - installed_gems = {} +- skipped = {} - options = { - :install_dir => install_dir, - :bin_dir => with_destdir(bindir), @@ -120,18 +121,33 @@ - File.foreach("#{srcdir}/gems/bundled_gems") do |name| - next if /^\s*(?:#|$)/ =~ name - next unless /^(\S+)\s+(\S+).*/ =~ name +- gem = $1 - gem_name = "#$1-#$2" -- # Try to find the gemspec file for C ext gems -- # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec -- # This gemspec keep the original dependencies -- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec" +- # Try to find the original gemspec file +- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem}.gemspec" - unless File.exist?(path) -- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec" -- next unless File.exist?(path) +- # Try to find the gemspec file for C ext gems +- # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec +- # This gemspec keep the original dependencies +- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec" +- unless File.exist?(path) +- # Try to find the gemspec file for gems that hasn't own gemspec +- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec" +- unless File.exist?(path) +- skipped[gem_name] = "gemspec not found" +- next +- end +- end - end - spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}") -- next unless spec.platform == Gem::Platform::RUBY -- next unless spec.full_name == gem_name +- unless spec.platform == Gem::Platform::RUBY +- skipped[gem_name] = "not ruby platform (#{spec.platform})" +- next +- end +- unless spec.full_name == gem_name +- skipped[gem_name] = "full name unmatch #{spec.full_name}" +- next +- end - spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" - package = RbInstall::DirPackage.new spec - ins = RbInstall::UnpackedInstaller.new(package, options) @@ -149,7 +165,11 @@ - install installed_gems, gem_dir+"/cache" - end - unless gems.empty? -- puts "skipped bundled gems: #{gems.join(' ')}" +- skipped.default = "not found in bundled_gems" +- puts "skipped bundled gems:" +- gems.each do |gem| +- printf " %-32s%s\n", File.basename(gem), skipped[gem] +- end - end -end -