From owner-dev-commits-ports-all@freebsd.org Tue Jun 15 18:49:18 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 228A6650A0B; Tue, 15 Jun 2021 18:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G4HRL0HR4z4rTg; Tue, 15 Jun 2021 18:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E610D57EA; Tue, 15 Jun 2021 18:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15FInHoB071642; Tue, 15 Jun 2021 18:49:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15FInHYp071641; Tue, 15 Jun 2021 18:49:17 GMT (envelope-from git) Date: Tue, 15 Jun 2021 18:49:17 GMT Message-Id: <202106151849.15FInHYp071641@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 2f2df429b67f - main - www/redmine4*: Fix build after recent rubygem-csv update. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f2df429b67f381c1cf9354216013f7c068c27c7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2021 18:49:18 -0000 The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f2df429b67f381c1cf9354216013f7c068c27c7 commit 2f2df429b67f381c1cf9354216013f7c068c27c7 Author: Mikael Urankar AuthorDate: 2021-06-15 18:48:11 +0000 Commit: Mikael Urankar 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