sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net-im/mastodon: Fix run-time issues by updating dependencies

Browse source 
- Depend on textproc/rubygem-twitter-text1 to fix a run-time error after
  textproc/rubygem-twitter-text was upgraded to a version unsupported by
  Mastodon.

- After r457876, 457885, and r457886, net-im/mastodon failed to start,
  because of an issue with both versions 3 and 4 of the redis gem being
  pulled in.

  /usr/local/lib/ruby/gems/2.4/gems/bundler-1.16.1/lib/bundler/runtime.rb:313:in
  `check_for_activated_spec!': You have already activated redis 4.0.1, but
  your Gemfile requires redis 3.3.5.

  Patch, so that only version 4 is pulled in.
This commit is contained in:
Joseph Mingrone 2018-01-03 03:57:47 +00:00
parent df1ad146ad
commit bc5f1ce8c8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=457946
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net-im/mastodon/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= mastodon
DISTVERSIONPREFIX= v
DISTVERSION= 2.1.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= net-im www
MAINTAINER= jrm@FreeBSD.org
@ -65,7 +65,7 @@ BR_DEPENDS= ffmpeg>0:multimedia/ffmpeg \
rubygem-rack-timeout>=0.4:www/rubygem-rack-timeout \
rubygem-rails-i18n>=5.0:devel/rubygem-rails-i18n \
rubygem-rails-settings-cached-rails5>=0.6:www/rubygem-rails-settings-cached-rails5 \
rubygem-redis3>=3.3:databases/rubygem-redis3 \
rubygem-redis>=4.0:databases/rubygem-redis \
rubygem-mario-redis-lock>=1.2:databases/rubygem-mario-redis-lock \
rubygem-rqrcode>=0.10:www/rubygem-rqrcode \
rubygem-ruby-oembed>=0.12:www/rubygem-ruby-oembed \
@ -78,7 +78,7 @@ BR_DEPENDS= ffmpeg>0:multimedia/ffmpeg \
rubygem-simple_form-rails5>=3.4:devel/rubygem-simple_form-rails5 \
rubygem-sprockets-rails-rails5>=3.2:devel/rubygem-sprockets-rails-rails5 \
rubygem-strong_migrations>=0.1.9:devel/rubygem-strong_migrations \
rubygem-twitter-text>=1.14:textproc/rubygem-twitter-text \
rubygem-twitter-text1>=1.14:textproc/rubygem-twitter-text1 \
rubygem-tzinfo-data>=1.2017:devel/rubygem-tzinfo-data \
rubygem-webpacker-rails5>=3.0:devel/rubygem-webpacker-rails5 \
rubygem-webpush>=0.3.2_1:security/rubygem-webpush \

9
net-im/mastodon/files/patch-Gemfile
View file

@ -26,6 +26,15 @@
gem 'idn-ruby', require: 'idn'
gem 'kaminari', '~> 1.1'
gem 'link_header', '~> 0.0'
@@ -54,7 +53,7 @@ gem 'rack-cors', '~> 0.4', require: 'rac
gem 'rack-timeout', '~> 0.4'
gem 'rails-i18n', '~> 5.0'
gem 'rails-settings-cached', '~> 0.6'
-gem 'redis', '~> 3.3', require: ['redis', 'redis/connection/hiredis']
+gem 'redis', '>= 3.3', require: ['redis', 'redis/connection/hiredis']
gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
gem 'rqrcode', '~> 0.10'
gem 'ruby-oembed', '~> 0.12', require: 'oembed'
@@ -75,45 +74,6 @@ gem 'webpush'
gem 'json-ld-preloaded', '~> 2.2.1'
gem 'rdf-normalize', '~> 0.3.1'