[pkgsrc/trunk]: pkgsrc/net/mikutter mikutter: update to 3.7.3.

[tsutsui <tsutsui%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/63d9c4330589
branches:  trunk
changeset: 310403:63d9c4330589
user:      tsutsui <tsutsui%pkgsrc.org@localhost>
date:      Sat Jul 14 16:59:25 2018 +0000

description:
mikutter: update to 3.7.3.

Upstream changes:

mikutter 3.7.3

* crashed on start up when the twitter plugin was removed
 * thanks cob odo
* reduce cpu load of drawing timeline when higher calculation load of score
* World: could not switch accounts in some cases
* hight of buttons was changed per hight of the listview
 * thanks Yuto Tokunaga
* make a background color of tab icons transparent
 * thanks Yuto Tokunaga
* make a background color of thumbnail of form DSL photoselect
 * thanks Yuto Tokunaga
* command: remove dependency of Web plugin
* command: non-browser applications were suggested as the Intent for
  "Open in browser" command
 * thanks ncaq net

diffstat:

 net/mikutter/Makefile                                                   |   5 +-
 net/mikutter/distinfo                                                   |  16 +--
 net/mikutter/patches/patch-core_mui_cairo__markup__generator.rb         |  16 ----
 net/mikutter/patches/patch-core_plugin_current__world_current__world.rb |  40 ----------
 net/mikutter/patches/patch-core_plugin_current__world_error.rb          |  14 ---
 net/mikutter/patches/patch-core_plugin_score_select.rb                  |  19 ----
 net/mikutter/patches/patch-core_plugin_twitter_model_world.rb           |  18 ----
 net/mikutter/patches/patch-core_plugin_world_world.rb                   |  35 --------
 8 files changed, 7 insertions(+), 156 deletions(-)

diffs (206 lines):

diff -r 43f1b4620f26 -r 63d9c4330589 net/mikutter/Makefile
--- a/net/mikutter/Makefile     Sat Jul 14 16:05:51 2018 +0000
+++ b/net/mikutter/Makefile     Sat Jul 14 16:59:25 2018 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.162 2018/07/08 06:08:09 tsutsui Exp $
+# $NetBSD: Makefile,v 1.163 2018/07/14 16:59:25 tsutsui Exp $
 #
 
-DISTNAME=      mikutter.3.7.2
+DISTNAME=      mikutter.3.7.3
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/./-/}
-PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  https://mikutter.hachune.net/bin/
 
diff -r 43f1b4620f26 -r 63d9c4330589 net/mikutter/distinfo
--- a/net/mikutter/distinfo     Sat Jul 14 16:05:51 2018 +0000
+++ b/net/mikutter/distinfo     Sat Jul 14 16:59:25 2018 +0000
@@ -1,16 +1,10 @@
-$NetBSD: distinfo,v 1.146 2018/07/08 06:08:09 tsutsui Exp $
+$NetBSD: distinfo,v 1.147 2018/07/14 16:59:25 tsutsui Exp $
 
-SHA1 (mikutter.3.7.2.tar.gz) = 21b823c752ae4fa49de226f196dadcda5d224aec
-RMD160 (mikutter.3.7.2.tar.gz) = 13bca59a3040d40ee0cc885a31a5f7bfe072e71c
-SHA512 (mikutter.3.7.2.tar.gz) = 58b8fc4734aafa32bfa616c32f1f72c1ce484c56ba52f46c1eb9aeec462853a1a66f2af31db7544dd0ee74f78833444fab8a2041eac0a1e7767bddf2f17788d8
-Size (mikutter.3.7.2.tar.gz) = 2908984 bytes
-SHA1 (patch-core_mui_cairo__markup__generator.rb) = e39dec59758d15db48da82e95375158c7353253d
-SHA1 (patch-core_plugin_current__world_current__world.rb) = bffddf24f59b48b4f954b2812df51880a05236f8
-SHA1 (patch-core_plugin_current__world_error.rb) = cf3bc785b4adde9bf19071e2bd4a7d5628ace732
+SHA1 (mikutter.3.7.3.tar.gz) = 613886ebe934048b037861a52846b6b3ddf87cdd
+RMD160 (mikutter.3.7.3.tar.gz) = a287f8dc403174966c0724f1f73e2f517f65067c
+SHA512 (mikutter.3.7.3.tar.gz) = 123dd5beb4936e13c19bf0ec9eb362ae6a29533daeb494ab3441b02f7ea1165f8473ef65afb3e6b7c6a6ac8533e356e55bacb7c3d4b996d95ce79d84267e4a0d
+Size (mikutter.3.7.3.tar.gz) = 2908173 bytes
 SHA1 (patch-core_plugin_libnotify_rnotify.rb) = 0bb5630f4411d11ad188c722fb1d14e2d6748d17
 SHA1 (patch-core_plugin_photo__support_Gemfile) = 754b96024904e2e2f55c83e88fd3c763eecf723c
 SHA1 (patch-core_plugin_photo__support_photo__support.rb) = 2d10f907d278000168210c5325e7d41c5dd2ca08
-SHA1 (patch-core_plugin_score_select.rb) = 6b53774fc7061e5c7ad875fb28d199c77397859d
-SHA1 (patch-core_plugin_twitter_model_world.rb) = 94a28af27c1e1cab754884f4b498feeb62cea035
-SHA1 (patch-core_plugin_world_world.rb) = 455e91ff8756f40195e5a4290fe2fc292f25a125
 SHA1 (patch-mikutter.rb) = 061d1b5d4fcf9296bc111a5da1e34a3d622c62a1
diff -r 43f1b4620f26 -r 63d9c4330589 net/mikutter/patches/patch-core_mui_cairo__markup__generator.rb
--- a/net/mikutter/patches/patch-core_mui_cairo__markup__generator.rb   Sat Jul 14 16:05:51 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-core_mui_cairo__markup__generator.rb,v 1.1 2018/07/08 06:08:09 tsutsui Exp $
-
-- pull upstream fix
-  https://dev.mikutter.hachune.net/issues/1242
-
---- core/mui/cairo_markup_generator.rb.orig    2018-06-10 15:38:30.000000000 +0000
-+++ core/mui/cairo_markup_generator.rb
-@@ -31,7 +31,7 @@ module Gdk::MarkupGenerator
-   # ==== Return
-   # Pango::AttrList æ?¬æ??ã?«é?©ç?¨ã??ã??è£?飾
-   def description_attr_list(attr_list=Pango::AttrList.new, emoji_height: 24)
--    Plugin[:gtk].score_of(message).inject(0){|start_index, note|
-+    score.inject(0){|start_index, note|
-       end_index = start_index + note.description.bytesize
-       if UserConfig[:miraclepainter_expand_custom_emoji] && note.respond_to?(:inline_photo)
-         end_index += -note.description.bytesize + 1
diff -r 43f1b4620f26 -r 63d9c4330589 net/mikutter/patches/patch-core_plugin_current__world_current__world.rb
--- a/net/mikutter/patches/patch-core_plugin_current__world_current__world.rb   Sat Jul 14 16:05:51 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-core_plugin_current__world_current__world.rb,v 1.1 2018/07/08 06:08:09 tsutsui Exp $
-
-- pull upstream fix
-  https://dev.mikutter.hachune.net/issues/1231
-
---- core/plugin/current_world/current_world.rb.orig    2018-06-10 15:38:30.000000000 +0000
-+++ core/plugin/current_world/current_world.rb
-@@ -1,5 +1,7 @@
- # -*- coding: utf-8 -*-
- 
-+require_relative 'error'
-+
- Plugin.create(:current_world) do
-   # ç?¾å?¨é?¸æ??ã??ã??ã?¦ã??ã??ã?¢ã?«ã?¦ã?³ã??ã?«å¯¾å¿?ã??ã??Modelã??è¿?ã??ã??ã?£ã?«ã?¿ã??
-   filter_world_current do |result|
-@@ -17,8 +19,13 @@ Plugin.create(:current_world) do
-         self.current_world = new
-         Plugin.call(:primary_service_changed, current_world)
-       end
--    rescue RuntimeError => err
--      error err
-+    rescue Plugin::CurrentWorld::WorldNotfoundError
-+      activity :system, _('ã?¢ã?«ã?¦ã?³ã??ã??å­?å?¨ã??ã?ªã??ã?¢ã?«ã?¦ã?³ã??(%{uri})ã?«å??ã??æ?¿ã??ã??ã??ã?¨ã??ã?¾ã??ã??') % {uri: new&.uri || 'nil'},
-+               description: _('ã?¢ã?«ã?¦ã?³ã??ã??å??ã??æ?¿ã??ã??ã??ã?¨ã??ã?¾ã??ã??ã??ã??å??ã??æ?¿ã??ã??ã??ã?¨ã??ã??ã?¢ã?«ã?¦ã?³ã??ã?¯å­?å?¨ã??ã?¾ã??ã??ã?§ã??ã??ã??') + "\n\n" +
-+               _("å??ã??æ?¿ã??å??ã?®ã?¢ã?«ã?¦ã?³ã??:\n%{uri}") % {uri: new&.uri || 'nil'} + "\n\n" +
-+               _('ç?¾å?¨å­?å?¨ã??ã??ã?¢ã?«ã?¦ã?³ã??:') + "\n" +
-+               Enumerator.new{|y| Plugin.filtering(:worlds, y) }.map{|w| "#{w.slug} (#{w.uri})" }.to_a.join("\n") + "\n\n" +
-+               _('%{world_class}#uri ã??å®?義ã??ã??ã??ã?¨ã?§ã??ã?®ã?¨ã?©ã?¼ã??å??é?¿ã?§ã??ã?¾ã??ã??詳ã??ã??ã?¯ %{see} ã??å??ç?§ã??ã?¦ã??ã? ã??ã??') % {world_class: new.class, see: 
'https://dev.mikutter.hachune.net/issues/1231'}
-     end
-   end
- 
-@@ -39,7 +46,7 @@ Plugin.create(:current_world) do
-   # ==== Raise
-   # [Plugin::World::InvalidWorldError] _worlds_ ã?«ã?ªã??ã?¢ã?«ã?¦ã?³ã??ã??渡ã??ã??ã??å ´å??
-   def current_world=(new)
--    raise RuntimeError unless Enumerator.new{|y| Plugin.filtering(:worlds, y) }.include?(new)
-+    raise Plugin::CurrentWorld::WorldNotfoundError unless Enumerator.new{|y| Plugin.filtering(:worlds, y) }.include?(new)
-     @current = new
-   end
- 
diff -r 43f1b4620f26 -r 63d9c4330589 net/mikutter/patches/patch-core_plugin_current__world_error.rb
--- a/net/mikutter/patches/patch-core_plugin_current__world_error.rb    Sat Jul 14 16:05:51 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-core_plugin_current__world_error.rb,v 1.1 2018/07/08 06:08:09 tsutsui Exp $
-
-- pull upstream fix
-  https://dev.mikutter.hachune.net/issues/1231
-
---- core/plugin/current_world/error.rb.orig    2018-07-08 05:27:15.379532058 +0000
-+++ core/plugin/current_world/error.rb
-@@ -0,0 +1,6 @@
-+# -*- coding: utf-8 -*-
-+
-+module Plugin::CurrentWorld
-+  Error = Class.new(RuntimeError)
-+  WorldNotfoundError = Class.new(Error)
-+end
diff -r 43f1b4620f26 -r 63d9c4330589 net/mikutter/patches/patch-core_plugin_score_select.rb
--- a/net/mikutter/patches/patch-core_plugin_score_select.rb    Sat Jul 14 16:05:51 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-core_plugin_score_select.rb,v 1.1 2018/07/08 06:08:09 tsutsui Exp $
-
-- pull upstream fix
-  https://dev.mikutter.hachune.net/issues/1242
-
---- core/plugin/score/select.rb.orig   2018-06-10 15:38:30.000000000 +0000
-+++ core/plugin/score/select.rb
-@@ -4,6 +4,11 @@ module Plugin::Score
-   extend self
- 
-   def score_by_score(model, target_note=model)
-+    @score_cache ||= TimeLimitedStorage.new(Array, Object, 60)
-+    @score_cache[[model, target_note]] ||= score_by_score_nocache(model, target_note)
-+  end
-+
-+  def score_by_score_nocache(model, target_note=model)
-     _, _, available_score_list = Plugin.filtering(:score_filter, model, target_note, Set.new)
-     selected_score = choose_best_score(available_score_list)
-     if selected_score &&  !selected_score.all? { |s| s.is_a?(Plugin::Score::TextNote) }
diff -r 43f1b4620f26 -r 63d9c4330589 net/mikutter/patches/patch-core_plugin_twitter_model_world.rb
--- a/net/mikutter/patches/patch-core_plugin_twitter_model_world.rb     Sat Jul 14 16:05:51 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-core_plugin_twitter_model_world.rb,v 1.1 2018/07/08 06:08:09 tsutsui Exp $
-
-- pull upstream fix
-  https://dev.mikutter.hachune.net/issues/1231
-
---- core/plugin/twitter/model/world.rb.orig    2018-06-10 15:38:30.000000000 +0000
-+++ core/plugin/twitter/model/world.rb
-@@ -53,6 +53,10 @@ module Plugin::Twitter
-                          profile_image_url: user_obj.icon.perma_link.to_s})
-     end
- 
-+    def path
-+      "/#{slug}"
-+    end
-+
-     # ã?µã?¼ã??ã?¹ã?«ã?¯ã?¨ã?ª _kind_ ã??æ??ã??ã??ã??
-     # ã?¬ã?¹ã??ã?³ã?¹ã??å??ã??å??ã??ã?¾ã?§ã??ã?­ã??ã?­ã?³ã?°ã??ã??ã??
-     # ã?¬ã?¹ã??ã?³ã?¹ã??è¿?ã??ã??失æ??ã??ã??å ´å??ã?¯ã??apifailã?¤ã??ã?³ã??ã??ç?ºç??ã??ã??ã?¦nilã??è¿?ã??ã??
diff -r 43f1b4620f26 -r 63d9c4330589 net/mikutter/patches/patch-core_plugin_world_world.rb
--- a/net/mikutter/patches/patch-core_plugin_world_world.rb     Sat Jul 14 16:05:51 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-core_plugin_world_world.rb,v 1.1 2018/07/08 06:08:09 tsutsui Exp $
-
-- pull upstream fix
-  https://dev.mikutter.hachune.net/issues/1231
-
---- core/plugin/world/world.rb.orig    2018-06-10 15:38:30.000000000 +0000
-+++ core/plugin/world/world.rb
-@@ -10,6 +10,7 @@ miquire :lib, 'diva_hacks'
- Plugin.create(:world) do
- 
-   world_struct = Struct.new(:slug, :name, :proc)
-+  @world_slug_dict = {}         # world_slug(Symbol) => World URI(Diva::URI)
- 
-   defdsl :world_setting do |world_slug, world_name, &proc|
-     filter_world_setting_list do |settings|
-@@ -103,6 +104,18 @@ Plugin.create(:world) do
-           nil
-         end
-       end
--    }.compact.freeze
-+    }.compact.freeze.tap(&method(:check_world_uri))
-+  end
-+
-+  def check_world_uri(new_worlds)
-+    new_worlds.each do |w|
-+      if @world_slug_dict.key?(w.slug)
-+        if @world_slug_dict[w.slug] != w.uri
-+          warn "The URI of World `#{w.slug}' is not defined. You must define a consistent URI for World Model. see: https://dev.mikutter.hachune.net/issues/1231";
-+        end
-+      else
-+        @world_slug_dict[w.slug] = w.uri
-+      end
-+    end
-   end
- end