Date: Tue, 15 Jun 2021 18:49:17 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: 2f2df429b67f - main - www/redmine4*: Fix build after recent rubygem-csv update. Message-ID: <202106151849.15FInHYp071641@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=2f2df429b67f381c1cf9354216013f7c068c27c7 commit 2f2df429b67f381c1cf9354216013f7c068c27c7 Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2021-06-15 18:48:11 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2021-06-15 18:49:14 +0000 www/redmine4*: Fix build after recent rubygem-csv update. --- www/redmine4/files/patch-Gemfile | 3 ++- www/redmine42/files/patch-Gemfile | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/www/redmine4/files/patch-Gemfile b/www/redmine4/files/patch-Gemfile index 3c64542c1eaa..f1dd267183a4 100644 --- a/www/redmine4/files/patch-Gemfile +++ b/www/redmine4/files/patch-Gemfile @@ -19,7 +19,8 @@ +gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.2.0") gem "mimemagic" gem "mail", "~> 2.7.1" - gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') +-gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') ++gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.2.0') gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1') -gem "i18n", "~> 1.6.0" +gem "i18n", ">= 1.6.0" diff --git a/www/redmine42/files/patch-Gemfile b/www/redmine42/files/patch-Gemfile index 7060dce9bc39..97b5975736ef 100644 --- a/www/redmine42/files/patch-Gemfile +++ b/www/redmine42/files/patch-Gemfile @@ -1,6 +1,6 @@ --- Gemfile.orig 2021-04-30 11:34:49 UTC +++ Gemfile -@@ -3,11 +3,11 @@ source 'https://rubygems.org' +@@ -3,16 +3,16 @@ source 'https://rubygems.org' ruby '>= 2.4.0', '< 2.8.0' gem 'bundler', '>= 1.12.0' @@ -14,6 +14,12 @@ gem "actionpack-xml_parser" gem 'roadie-rails', (RUBY_VERSION < '2.5' ? '~> 1.3.0' : '~> 2.2.0') gem 'marcel' + gem "mail", "~> 2.7.1" +-gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') ++gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.2.0') + gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1') + gem 'i18n', '~> 1.8.2' + gem "rbpdf", "~> 1.20.0" @@ -37,67 +37,6 @@ group :openid do gem "rack-openid" end
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106151849.15FInHYp071641>