git: f256db7c994a - main - devel/gitaly: Fix Gemfile for rubygem-activesupport61 6.1.4.1 update

Po-Chuan Hsieh sunpoet at FreeBSD.org
Mon Sep 27 16:01:37 UTC 2021


The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f256db7c994a5a0bf6ca28a901c1d2852211a81b

commit f256db7c994a5a0bf6ca28a901c1d2852211a81b
Author:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-09-27 15:45:11 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-09-27 15:56:29 +0000

    devel/gitaly: Fix Gemfile for rubygem-activesupport61 6.1.4.1 update
    
    - Bump PORTREVISION for package change
---
 devel/gitaly/Makefile                 | 2 +-
 devel/gitaly/files/patch-ruby_Gemfile | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 8f793ffd6269..fa3c993d856b 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gitaly
 DISTVERSION=	14.3.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner at FreeBSD.org
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index 2e700525ffc0..5cd62893b24e 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,6 +1,11 @@
---- ruby/Gemfile.orig	2021-08-31 13:54:28 UTC
+--- ruby/Gemfile.orig	2021-09-21 10:03:53 UTC
 +++ ruby/Gemfile
-@@ -7,27 +7,16 @@ gem 'activesupport', '~> 6.1.3.2'
+@@ -3,31 +3,20 @@ source 'https://rubygems.org'
+ gem 'rugged', '~> 1.1'
+ gem 'github-linguist', '~> 7.12', require: 'linguist'
+ gem 'gitlab-markup', '~> 1.7.1'
+-gem 'activesupport', '~> 6.1.3.2'
++gem 'activesupport', '>= 6.1.3.2', '< 6.2'
  gem 'rdoc', '~> 6.0'
  gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
  gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false


More information about the dev-commits-ports-main mailing list