mikutter: update to 3.6.5.

pkgsrc changes:
* explicitly depends on json_pure gem as per Gemfile
* remove patches that has been integrated in upstream

Upstream changes:

mikutter 3.6.5

* world: on serializing World Model, change format to JSON to use
  functions of Diva
* show an active account name in tooltip when mouse hovers on
  World Shifter icon
* logo image in Form DSL about dialog widget was not shown in some case
* avoid warning caused by use of a deprecated constant
* follows and followers are not taken properly so that notifications
  of follow and remove didn't work
* form DLS options were not in order
* Twitter: time of direct messages in the Activity tab was shown in UTC
* clear search timeline if blank is specified in the search box
* update description of requirements in README by assuming use of bundler
* twitpic images were not shown in some case

6 files changed, 11 insertions, 156 deletions

diff --git a/net/mikutter/Makefile b/net/mikutter/Makefile
index 365cfc78ce6..8ce7d6b2a36 100644
--- a/net/mikutter/Makefile
+++ b/net/mikutter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.156 2018/02/25 02:15:19 tsutsui Exp $
+# $NetBSD: Makefile,v 1.157 2018/03/09 14:37:02 tsutsui Exp $
 #
 
-DISTNAME=	mikutter.3.6.4
+DISTNAME=	mikutter.3.6.5
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/./-/}
 CATEGORIES=	net
 MASTER_SITES=	http://mikutter.hachune.net/bin/
@@ -17,6 +17,7 @@ RUBY_VERSIONS_ACCEPTED=	23 24
 
 DEPENDS+=	${RUBY_PKGPREFIX}-pluggaloid>=1.1.1:../../net/ruby-pluggaloid
 DEPENDS+=	${RUBY_PKGPREFIX}-diva>=0.3.1:../../devel/ruby-diva
+DEPENDS+=	${RUBY_PKGPREFIX}-json-pure>=1.8:../../textproc/ruby-json-pure
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk>=3.2.0:../../x11/ruby-gnome2-gtk
 DEPENDS+=	${RUBY_PKGPREFIX}-gettext>=3.0.1:../../devel/ruby-gettext
 DEPENDS+=	${RUBY_PKGPREFIX}-oauth>=0.5.1:../../security/ruby-oauth
diff --git a/net/mikutter/distinfo b/net/mikutter/distinfo
index 8db3648b255..0cf4e1aca5a 100644
--- a/net/mikutter/distinfo
+++ b/net/mikutter/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.140 2018/02/25 02:15:19 tsutsui Exp $
+$NetBSD: distinfo,v 1.141 2018/03/09 14:37:02 tsutsui Exp $
 
-SHA1 (mikutter.3.6.4.tar.gz) = aa6c9c4a1e591903b571821a1230d8ba279d6318
-RMD160 (mikutter.3.6.4.tar.gz) = 411ece5c9cbf78d24cfaa47ada4cc538aba4a3ab
-SHA512 (mikutter.3.6.4.tar.gz) = 0d370fd41a3c622cdeb00cc9b65d9094430f0590587a18b198f3fc8de44d7a476bb15ae810377e778aea17f932ebb31dd22362231bee7e698e026e92ea2a05a0
-Size (mikutter.3.6.4.tar.gz) = 2902010 bytes
-SHA1 (patch-core_mui_gtk__inneruserlist.rb) = 552338b5029ca6236993b2c75f892a2b9fd64d2d
-SHA1 (patch-core_mui_gtk__userlist.rb) = fc7a2d850e7e9ab4d5716c2534f991afbda88a7e
+SHA1 (mikutter.3.6.5.tar.gz) = fd0b7d64c599af5eba6413122c03b81ef31421e5
+RMD160 (mikutter.3.6.5.tar.gz) = 5645f4b995a5ae38502078c2d6e261013a493381
+SHA512 (mikutter.3.6.5.tar.gz) = d7f11c4c107980d2958f8a4ea965cbb14a06f9fab15d8a044ef6a7ddd671a6b5374b91d1a1833eb849b17724c426997e1760a3843e3ea7246ce4edbbfb056411
+Size (mikutter.3.6.5.tar.gz) = 2903668 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) = 182135fc0b46035c343c746ddba091d71cdc81f4
-SHA1 (patch-core_plugin_twitter_mikutwitter_api__shortcuts.rb) = 3742017931e18e4e1c97154b919cf00ddaed474f
+SHA1 (patch-core_plugin_photo__support_photo__support.rb) = 2d10f907d278000168210c5325e7d41c5dd2ca08
 SHA1 (patch-mikutter.rb) = 061d1b5d4fcf9296bc111a5da1e34a3d622c62a1
diff --git a/net/mikutter/patches/patch-core_mui_gtk__inneruserlist.rb b/net/mikutter/patches/patch-core_mui_gtk__inneruserlist.rb
deleted file mode 100644
index c2174de2cb4..00000000000
--- a/net/mikutter/patches/patch-core_mui_gtk__inneruserlist.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-core_mui_gtk__inneruserlist.rb,v 1.1 2017/06/10 09:45:33 tsutsui Exp $
-
-- pull upstream fixes for ticket #916
-  https://dev.mikutter.hachune.net/issues/916
-
---- core/mui/gtk_inneruserlist.rb.orig	2017-06-10 01:11:51.000000000 +0000
-+++ core/mui/gtk_inneruserlist.rb
-@@ -32,10 +32,10 @@ class Gtk::InnerUserList < Gtk::TreeView
-     }.reject{|user|
-       exist_users.include?(user)
-     }.deach{|user|
-+      break if destroyed?
-       iter = model.append
--      iter[COL_ICON] = user.icon.load_pixbuf(width: 24, height: 24){|pixbuf|
--        iter[COL_ICON] = pixbuf unless destroyed?
--      }
-+      # ここではCOL_ICONを埋めず、nilのままにしてアイコンを表示しない。
-+      # アイコンは Gtk::UserList#emit_expose_user で、カラムが表示された時に初めて埋める
-       iter[COL_SCREEN_NAME] = user[:idname]
-       iter[COL_NAME] = user[:name]
-       iter[COL_USER] = user
diff --git a/net/mikutter/patches/patch-core_mui_gtk__userlist.rb b/net/mikutter/patches/patch-core_mui_gtk__userlist.rb
deleted file mode 100644
index 9ffc23bb93b..00000000000
--- a/net/mikutter/patches/patch-core_mui_gtk__userlist.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-core_mui_gtk__userlist.rb,v 1.1 2017/06/10 09:45:33 tsutsui Exp $
-
-- pull upstream fixes for ticket #916
-  https://dev.mikutter.hachune.net/issues/916
-
---- core/mui/gtk_userlist.rb.orig	2017-06-10 01:11:51.000000000 +0000
-+++ core/mui/gtk_userlist.rb
-@@ -27,6 +27,10 @@ class Gtk::UserList < Gtk::EventBox
-     scrollbar = ::Gtk::VScrollbar.new(@listview.vadjustment)
-     add Gtk::HBox.new(false, 0).add(@listview).closeup(scrollbar)
-     @listview.ssc(:row_activated, &self.class.row_activated)
-+    @listview.ssc(:expose_event){
-+      emit_expose_user
-+      false
-+    }
-   end
- 
-   def each
-@@ -68,5 +72,25 @@ class Gtk::UserList < Gtk::EventBox
-     @listview.reorder(user)
-     self end
- 
-+  private
-+
-+  def emit_expose_user
-+    if @listview.visible_range
-+      current, last = @listview.visible_range
-+      Enumerator.new{|y|
-+        while (current <=> last) < 1
-+          y << @listview.model.get_iter(current)
-+          break if not current.next!
-+        end
-+      }.reject{|iter|
-+        iter[Gtk::InnerUserList::COL_ICON]
-+      }.each do |iter|
-+        iter[Gtk::InnerUserList::COL_ICON] = iter[Gtk::InnerUserList::COL_USER].icon.load_pixbuf(width: 24, height: 24){|pixbuf|
-+          iter[Gtk::InnerUserList::COL_ICON] = pixbuf unless @listview.destroyed?
-+        }
-+      end
-+    end
-+  end
-+
- end
- 
diff --git a/net/mikutter/patches/patch-core_plugin_photo__support_photo__support.rb b/net/mikutter/patches/patch-core_plugin_photo__support_photo__support.rb
index 2d71b0579c5..752c72cfee7 100644
--- a/net/mikutter/patches/patch-core_plugin_photo__support_photo__support.rb
+++ b/net/mikutter/patches/patch-core_plugin_photo__support_photo__support.rb
@@ -1,8 +1,6 @@
-$NetBSD: patch-core_plugin_photo__support_photo__support.rb,v 1.4 2017/06/10 09:45:33 tsutsui Exp $
+$NetBSD: patch-core_plugin_photo__support_photo__support.rb,v 1.5 2018/03/09 14:37:02 tsutsui Exp $
 
 - temporary workaround to skip totorijp gems (sorry, @toshi_a)
-- pull fixes for upstream ticket #1031
-  https://dev.mikutter.hachune.net/issues/1031
 
 --- core/plugin/photo_support/photo_support.rb.orig	2017-06-10 01:11:51.000000000 +0000
 +++ core/plugin/photo_support/photo_support.rb
@@ -15,18 +13,7 @@ $NetBSD: patch-core_plugin_photo__support_photo__support.rb,v 1.4 2017/06/10 09:
  
  module Plugin::PhotoSupport
    INSTAGRAM_PATTERN = %r{\Ahttps?://(?:instagr\.am|(?:www\.)?instagram\.com)/p/([a-zA-Z0-9_\-]+)/}
-@@ -25,8 +25,9 @@ end
- 
- Plugin.create :photo_support do
-   # twitpic
--  defimageopener('twitpic', %r<^http://twitpic\.com/[a-zA-Z0-9]+>) do |display_url|
-+  defimageopener('twitpic', %r<^https?://twitpic\.com/[a-zA-Z0-9]+>) do |display_url|
-     connection = HTTPClient.new
-+    connection.transparent_gzip_decompression = true
-     page = connection.get_content(display_url)
-     next nil if page.empty?
-     doc = Nokogiri::HTML(page)
-@@ -181,9 +182,14 @@ Plugin.create :photo_support do
+@@ -181,9 +181,14 @@ Plugin.create :photo_support do
  
    # totori.dip.jp
    defimageopener('totori.dip.jp', %r#\Ahttp://totori\.dip\.jp/?\Z#) do |display_url|
diff --git a/net/mikutter/patches/patch-core_plugin_twitter_mikutwitter_api__shortcuts.rb b/net/mikutter/patches/patch-core_plugin_twitter_mikutwitter_api__shortcuts.rb
deleted file mode 100644
index 0cb35a90fdd..00000000000
--- a/net/mikutter/patches/patch-core_plugin_twitter_mikutwitter_api__shortcuts.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-core_plugin_twitter_mikutwitter_api__shortcuts.rb,v 1.1 2017/12/30 05:05:14 tsutsui Exp $
-
-- pull upstream fixes for ticket #916
-  https://dev.mikutter.hachune.net/issues/916
-
---- core/plugin/twitter/mikutwitter/api_shortcuts.rb.orig	2017-12-22 15:08:27.000000000 +0000
-+++ core/plugin/twitter/mikutwitter/api_shortcuts.rb
-@@ -52,10 +52,10 @@ module MikuTwitter::APIShortcuts
-   defcursorpager :followers_id, 'followers/ids', :paged_ids, :ids, id: :user_id
- 
-   def followings(args = {})
--    idlist2userlist(friends_id(RELATIONAL_DEFAULT.merge(args))) end
-+    idlist2userlist(friends_id(RELATIONAL_DEFAULT.merge(args)), cache: args[:cache]) end
- 
-   def followers(args = {})
--    idlist2userlist(followers_id(RELATIONAL_DEFAULT.merge(args))) end
-+    idlist2userlist(followers_id(RELATIONAL_DEFAULT.merge(args)), cache: args[:cache]) end
- 
-   def direct_messages(args = {})
-     (self/:direct_messages).direct_messages({:count => 200}.merge(args)) end
-@@ -260,21 +260,30 @@ module MikuTwitter::APIShortcuts
-         cursor_pager(api, parser, key, args.merge(cursor: res[:next_cursor])).next{ |nex|
-           res[key] + nex } end } end
- 
--  def idlist2userlist(deferred)
--    deferred.next{ |ids|
--      promise = Deferred.new(true)
--      Thread.new{
--        begin
--          promise.call(Plugin::Twitter::User.findbyid(ids))
--        rescue Exception => e
--          promise.fail(e) end }
--      promise.next{ |users|
--        if(users.size != ids.size)
--          Deferred.when(*(ids - users.map{ |u| u[:id] }).each_slice(100).map{ |segment|
--                          user_lookup(id: segment.join(',')).trap{ |e| warn e; [] } }).next{ |res|
--            res.inject(users){ |a, b| a + b } }
-+  def idlist2userlist(deferred, cache: :keep)
-+    deferred.next do |ids|
-+      detected = {}           # {id => User}
-+      lookups = Set.new       # [id]
-+      ids.each do |id|
-+        user = Plugin::Twitter::User.findbyid(id, Diva::DataSource::USE_LOCAL_ONLY)
-+        if user.is_a? User
-+          detected[id] = user
-         else
--          users end } } end
-+          lookups << id
-+        end
-+      end
-+      defer = lookups.each_slice(100).map{|lookup_chunk|
-+        user_lookup(id: lookup_chunk.join(','), cache: cache).next{|users|
-+          users.each do |user|
-+            detected[user.id] = user
-+          end
-+        }
-+      }
-+      Delayer::Deferred.when(*defer).next do
-+        ids.map{|id| detected[id] }
-+      end
-+    end
-+  end
- 
-   # upload.twitter.comに画像等をアップロードし、
-   # アップロードしたファイルのmedia_idを返す。