Date: Fri, 22 Mar 2024 07:35:25 GMT From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c0b038e0bb36 - main - www/redmine50: Fix build rubygem-roadie-rails-rails61 3.1.0 Message-ID: <202403220735.42M7ZPCu092745@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0b038e0bb3669e1414267dd1cc052aa96bd7d05 commit c0b038e0bb3669e1414267dd1cc052aa96bd7d05 Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2024-03-22 07:30:43 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2024-03-22 07:35:03 +0000 www/redmine50: Fix build rubygem-roadie-rails-rails61 3.1.0 PR: 277866 --- www/redmine50/files/patch-Gemfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/www/redmine50/files/patch-Gemfile b/www/redmine50/files/patch-Gemfile index 0b6739f59ce8..8e84ab9212df 100644 --- a/www/redmine50/files/patch-Gemfile +++ b/www/redmine50/files/patch-Gemfile @@ -1,6 +1,6 @@ --- Gemfile.orig 2023-11-27 20:30:01 UTC +++ Gemfile -@@ -3,30 +3,30 @@ source 'https://rubygems.org' +@@ -3,30 +3,30 @@ gem 'bundler', '>= 1.12.0' ruby '>= 2.5.0', '< 3.2.0' gem 'bundler', '>= 1.12.0' @@ -12,7 +12,8 @@ gem 'request_store', '~> 1.5.0' gem 'mini_mime', '~> 1.1.0' gem "actionpack-xml_parser" - gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '~> 3.0.0') +-gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '~> 3.0.0') ++gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '>= 3.0.0') gem 'marcel' -gem "mail", "~> 2.7.1" +gem "mail", ">= 2.7.1" @@ -40,7 +41,7 @@ gem 'net-pop', '~> 0.1.1' # Rails 6.1.6.1 does not work with Pysch 3.0.2, which is installed by default with Ruby 2.5. See https://github.com/rails/rails/issues/45590 gem 'psych', '>= 3.1.0' if Gem.ruby_version < Gem::Version.new('2.6.0') -@@ -40,85 +40,10 @@ gem 'rqrcode' +@@ -40,85 +40,10 @@ group :ldap do # Optional gem for LDAP authentication group :ldap do @@ -127,7 +128,7 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exist?(local_gemfile) eval_gemfile local_gemfile -@@ -127,4 +52,8 @@ end +@@ -127,4 +52,8 @@ Dir.glob File.expand_path("../plugins/*/{Gemfile,Plugi # Load plugins' Gemfiles Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| eval_gemfile file
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403220735.42M7ZPCu092745>