From d5bb6a63c17823993f67abb5c93610e1cb96eb2d Mon Sep 17 00:00:00 2001 From: Amit Karsale Date: Wed, 28 Aug 2024 11:42:43 +0530 Subject: [PATCH] (PA-6900) Update ruby-augeas to 0.6.0 --- configs/components/_base-ruby-augeas.rb | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/configs/components/_base-ruby-augeas.rb b/configs/components/_base-ruby-augeas.rb index 47ffc5c3c..e22ec78ab 100644 --- a/configs/components/_base-ruby-augeas.rb +++ b/configs/components/_base-ruby-augeas.rb @@ -3,10 +3,6 @@ # load it with instance_eval. See ruby-x.y-augeas.rb configs. # -pkg.add_source("file://resources/patches/augeas/ruby-augeas-0.5.0-patch_c_extension.patch") - -# We can remove the below patch after https://github.com/hercules-team/ruby-augeas/pull/17 is merged. -pkg.add_source("file://resources/patches/augeas/ruby-augeas-0.5.0-patch_remove_unused_parameter.patch") # These can be overridden by the including component. ruby_version ||= settings[:ruby_version] @@ -14,9 +10,9 @@ ruby_dir ||= settings[:ruby_dir] ruby_bindir ||= settings[:ruby_bindir] -pkg.version "0.5.0" -pkg.md5sum "a132eace43ce13ccd059e22c0b1188ac" -pkg.url "http://download.augeas.net/ruby/ruby-augeas-#{pkg.get_version}.tgz" +pkg.version "0.6.0" +pkg.md5sum "3c2a13b748300b5a984bab9a30e74d0f" +pkg.url "https://github.com/hercules-team/ruby-augeas/releases/download/release-#{pkg.get_version}/ruby-augeas-#{pkg.get_version}.tgz" pkg.mirror "#{settings[:buildsources_url]}/ruby-augeas-#{pkg.get_version}.tgz" pkg.build_requires "ruby-#{ruby_version}" @@ -75,10 +71,6 @@ pkg.build do build_commands = [] - if ruby_version =~ /^3/ - build_commands << "#{platform.patch} --strip=2 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../ruby-augeas-0.5.0-patch_c_extension.patch" - end - build_commands << "#{platform.patch} --strip=2 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../ruby-augeas-0.5.0-patch_remove_unused_parameter.patch" build_commands << "#{ruby} ext/augeas/extconf.rb" build_commands << "#{platform[:make]} -e -j$(shell expr $(shell #{platform[:num_cores]}) + 1)"