diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2018-01-03 03:57:47 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2018-01-03 03:57:47 +0000 |
| commit | bc5f1ce8c83ade7bc0c5a8d6e65cc875ec42f666 (patch) | |
| tree | ae4a87f70174df08f09cce6f0fff1d9715706c4c /net-im/mastodon | |
| parent | databases/rubygem-mario-redis-lock: patch to pull in databases/rubygem-redis (diff) | |
net-im/mastodon: Fix run-time issues by updating dependencies
- 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.
Notes
Notes:
svn path=/head/; revision=457946
Diffstat (limited to 'net-im/mastodon')
| -rw-r--r-- | net-im/mastodon/Makefile | 6 | ||||
| -rw-r--r-- | net-im/mastodon/files/patch-Gemfile | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile index da618ded73c3..ed30a867fbe0 100644 --- a/net-im/mastodon/Makefile +++ b/net-im/mastodon/Makefile @@ -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 \ diff --git a/net-im/mastodon/files/patch-Gemfile b/net-im/mastodon/files/patch-Gemfile index 1b0567de5b69..a95871f7ec5e 100644 --- a/net-im/mastodon/files/patch-Gemfile +++ b/net-im/mastodon/files/patch-Gemfile @@ -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' |