From owner-dev-commits-ports-all@freebsd.org Fri Apr 23 06:50:59 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 B2B8F5E2038; Fri, 23 Apr 2021 06:50:59 +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 4FRQ0z4fCBz3kfr; Fri, 23 Apr 2021 06:50:59 +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 91715726; Fri, 23 Apr 2021 06:50:59 +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 13N6ox6Z059938; Fri, 23 Apr 2021 06:50:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13N6oxms059937; Fri, 23 Apr 2021 06:50:59 GMT (envelope-from git) Date: Fri, 23 Apr 2021 06:50:59 GMT Message-Id: <202104230650.13N6oxms059937@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: 2df6dd52d5b6 - main - www/redmine4: Fix build after recent rubygem-rails52 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: 2df6dd52d5b652b15de6c4b40337a67b07834f36 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: Fri, 23 Apr 2021 06:50:59 -0000 The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=2df6dd52d5b652b15de6c4b40337a67b07834f36 commit 2df6dd52d5b652b15de6c4b40337a67b07834f36 Author: Mikael Urankar AuthorDate: 2021-04-23 06:49:52 +0000 Commit: Mikael Urankar CommitDate: 2021-04-23 06:50:52 +0000 www/redmine4: Fix build after recent rubygem-rails52 update --- www/redmine4/Makefile | 2 +- www/redmine4/files/patch-Gemfile | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/www/redmine4/Makefile b/www/redmine4/Makefile index 6435386f0bf9..e9ac23b854af 100644 --- a/www/redmine4/Makefile +++ b/www/redmine4/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/COPYING RUN_DEPENDS= rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \ - rubygem-rails52>=5.2.4.5<5.2.5:www/rubygem-rails52 \ + rubygem-rails52>=5.2.4.5:www/rubygem-rails52 \ rubygem-rouge312>=3.12.0:textproc/rubygem-rouge312 \ rubygem-request_store14>=1.0.5:devel/rubygem-request_store14 \ rubygem-mini_mime>=1.0.1:mail/rubygem-mini_mime \ diff --git a/www/redmine4/files/patch-Gemfile b/www/redmine4/files/patch-Gemfile index c77fbe9d24e4..b96e9e726725 100644 --- a/www/redmine4/files/patch-Gemfile +++ b/www/redmine4/files/patch-Gemfile @@ -1,13 +1,17 @@ ---- Gemfile.orig 2021-03-21 09:40:24.000000000 +0100 -+++ Gemfile 2021-03-29 08:41:04.325888000 +0200 -@@ -1,6 +1,6 @@ +--- Gemfile.orig 2021-04-22 10:46:10 UTC ++++ Gemfile +@@ -1,9 +1,9 @@ source 'https://rubygems.org' -ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0' +ruby '>= 2.3.0', '< 2.8.0' if Bundler::VERSION >= '1.12.0' gem "bundler", ">= 1.5.0" - gem 'rails', '5.2.4.5' +-gem 'rails', '5.2.4.5' ++gem 'rails', '5.2.5' + 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 "mail", "~> 2.7.1" gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')