From owner-dev-commits-ports-all@freebsd.org Thu Apr 29 15:19:51 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 6AE8262DCBA; Thu, 29 Apr 2021 15:19:51 +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 4FWK1M2g8Bz4nMG; Thu, 29 Apr 2021 15:19:51 +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 4E5C11D8B6; Thu, 29 Apr 2021 15:19:51 +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 13TFJpxV008128; Thu, 29 Apr 2021 15:19:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13TFJpAh008127; Thu, 29 Apr 2021 15:19:51 GMT (envelope-from git) Date: Thu, 29 Apr 2021 15:19:51 GMT Message-Id: <202104291519.13TFJpAh008127@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: ecbeac6371c7 - main - www/redmine4: Fix build after recent rubygem 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: ecbeac6371c7253a6ad1d36121ea580ab2725f15 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: Thu, 29 Apr 2021 15:19:51 -0000 The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=ecbeac6371c7253a6ad1d36121ea580ab2725f15 commit ecbeac6371c7253a6ad1d36121ea580ab2725f15 Author: Mikael Urankar AuthorDate: 2021-04-29 15:19:01 +0000 Commit: Mikael Urankar CommitDate: 2021-04-29 15:19:01 +0000 www/redmine4: Fix build after recent rubygem update --- www/redmine4/files/patch-Gemfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/www/redmine4/files/patch-Gemfile b/www/redmine4/files/patch-Gemfile index b96e9e726725..bc3092b1799a 100644 --- a/www/redmine4/files/patch-Gemfile +++ b/www/redmine4/files/patch-Gemfile @@ -1,6 +1,6 @@ --- Gemfile.orig 2021-04-22 10:46:10 UTC +++ Gemfile -@@ -1,9 +1,9 @@ +@@ -1,20 +1,20 @@ source 'https://rubygems.org' -ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0' @@ -12,7 +12,11 @@ gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem "rouge", "~> 3.12.0" gem "request_store", "~> 1.4.1" -@@ -14,7 +14,7 @@ gem "mimemagic" +-gem "mini_mime", "~> 1.0.1" ++gem "mini_mime", ">= 1.0.1" + gem "actionpack-xml_parser" + gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0") + gem "mimemagic" gem "mail", "~> 2.7.1" gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1')