git: ff28792483a1 - main - www/redmine42: Fix build after recent rubygem update.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 19 Jan 2022 07:32:09 UTC
The branch main has been updated by mikael:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ff28792483a154909271580a22460379693b341f
commit ff28792483a154909271580a22460379693b341f
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2022-01-18 20:03:50 +0000
Commit: Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2022-01-19 07:31:56 +0000
www/redmine42: Fix build after recent rubygem update.
---
www/redmine42/files/patch-Gemfile | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/www/redmine42/files/patch-Gemfile b/www/redmine42/files/patch-Gemfile
index 3418d479f5e7..7fccf134febe 100644
--- a/www/redmine42/files/patch-Gemfile
+++ b/www/redmine42/files/patch-Gemfile
@@ -1,8 +1,11 @@
--- Gemfile.orig 2021-04-30 11:34:49 UTC
+++ Gemfile
-@@ -8,12 +8,12 @@ gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
+@@ -6,14 +6,14 @@ gem 'bundler', '>= 1.12.0'
+ gem 'rails', '5.2.6'
+ gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0')
- gem 'rouge', '~> 3.26.0'
+-gem 'rouge', '~> 3.26.0'
++gem 'rouge', '>= 3.26.0'
gem 'request_store', '~> 1.5.0'
-gem "mini_mime", "~> 1.0.1"
+gem "mini_mime", ">= 1.0.1"
@@ -15,7 +18,7 @@
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
+@@ -38,67 +38,6 @@ group :openid do
gem "rack-openid"
end
@@ -83,7 +86,7 @@
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
if File.exists?(local_gemfile)
eval_gemfile local_gemfile
-@@ -106,4 +45,8 @@ end
+@@ -107,4 +46,8 @@ end
# Load plugins' Gemfiles
Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
eval_gemfile file