mikutter: update to 3.6.1.

Upstream changes:

mikutter 3.6.1

* happy new year
* honor iPhone X
* require Diva gem 0.3.1 or later
 * JSON exported Time was not in iso8601 format
* Spell to update user profile (thanks shibafu528)
* fix typo (thanks akkiesoft)
* twitter: crash when using World other than Twitter due to wrong assumption
           that User#idname was always defined
* openimg: sporadic crash when opening images

4 files changed, 12 insertions, 65 deletions

diff --git a/net/mikutter/Makefile b/net/mikutter/Makefile
index 22630eb6380..599d12cb3fa 100644
--- a/net/mikutter/Makefile
+++ b/net/mikutter/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.152 2018/01/13 04:46:39 tsutsui Exp $
+# $NetBSD: Makefile,v 1.153 2018/01/14 05:15:05 tsutsui Exp $
 #
 
-DISTNAME=	mikutter.3.6.0
-PKGREVISION=	2
+DISTNAME=	mikutter.3.6.1
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/./-/}
 CATEGORIES=	net
 MASTER_SITES=	http://mikutter.hachune.net/bin/
@@ -17,7 +16,7 @@ RUBY_VERSIONS_ACCEPTED=	23 24
 .include "../../lang/ruby/rubyversion.mk"
 
 DEPENDS+=	${RUBY_PKGPREFIX}-pluggaloid>=1.1.1:../../net/ruby-pluggaloid
-DEPENDS+=	${RUBY_PKGPREFIX}-diva>=0.3.0:../../devel/ruby-diva
+DEPENDS+=	${RUBY_PKGPREFIX}-diva>=0.3.1:../../devel/ruby-diva
 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 558f382ae8e..ab9dd4a02ae 100644
--- a/net/mikutter/distinfo
+++ b/net/mikutter/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.136 2018/01/13 04:46:39 tsutsui Exp $
+$NetBSD: distinfo,v 1.137 2018/01/14 05:15:05 tsutsui Exp $
 
-SHA1 (mikutter.3.6.0.tar.gz) = 8dd1b52e8fe00bdc7d1ac1c25c3a8fa16d91ff8c
-RMD160 (mikutter.3.6.0.tar.gz) = 40d493d2660ba3e5af92a522fd4cd03d7949dd14
-SHA512 (mikutter.3.6.0.tar.gz) = 99d7f4fe8f3deea1027206664b6e482657df750c0b46219fafe519432e5e571827e2a63a831678db1aa42d8861937e566b9444885d06a56c3fcdf4803ec1c944
-Size (mikutter.3.6.0.tar.gz) = 2899397 bytes
+SHA1 (mikutter.3.6.1.tar.gz) = 7fcae2d4843897618c9e1c6710a813a0312c38c5
+RMD160 (mikutter.3.6.1.tar.gz) = b10bd2745e157817cb9c5c29dbf24dbbe72d8162
+SHA512 (mikutter.3.6.1.tar.gz) = c44ae2985cd78494dbce2055f5785e46342e0edd3a173753e860b443d11c201176462e3f429ce26133a43079dd7c80931c9326831a65b4e8838ba5e03fb5aa0c
+Size (mikutter.3.6.1.tar.gz) = 2894665 bytes
 SHA1 (patch-core_mui_gtk__inneruserlist.rb) = 552338b5029ca6236993b2c75f892a2b9fd64d2d
 SHA1 (patch-core_mui_gtk__userlist.rb) = fc7a2d850e7e9ab4d5716c2534f991afbda88a7e
 SHA1 (patch-core_plugin_libnotify_rnotify.rb) = 0bb5630f4411d11ad188c722fb1d14e2d6748d17
-SHA1 (patch-core_plugin_openimg_window.rb) = 436127822c21382a091c4c121ca471bca1fa1fb4
 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-mikutter.rb) = 2d0cd0b9bb168a6b033fcdea1f1b71d57f39f331
+SHA1 (patch-mikutter.rb) = 061d1b5d4fcf9296bc111a5da1e34a3d622c62a1
diff --git a/net/mikutter/patches/patch-core_plugin_openimg_window.rb b/net/mikutter/patches/patch-core_plugin_openimg_window.rb
deleted file mode 100644
index 0b2fdc52c6e..00000000000
--- a/net/mikutter/patches/patch-core_plugin_openimg_window.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-core_plugin_openimg_window.rb,v 1.1 2018/01/13 04:46:39 tsutsui Exp $
-
-- pull upstream fix
- https://dev.mikutter.hachune.net/issues/1137
-
---- core/plugin/openimg/window.rb.orig	2017-12-24 15:00:56.000000000 +0000
-+++ core/plugin/openimg/window.rb
-@@ -20,23 +20,28 @@ module Plugin::Openimg
-         if pixbufloader.is_a? GdkPixbuf::PixbufLoader
-           rect = nil
-           pixbufloader.ssc(:area_updated, self) do |_, x, y, width, height|
--            if rect
--              rect[:left] = [rect[:left], x].min
--              rect[:top] = [rect[:top], y].min
--              rect[:right] = [rect[:right], x+width].max
--              rect[:bottom] = [rect[:bottom], y+height].max
--            else
--              rect = {left: x, top: y, right: x+width, bottom: y+height}
--              Delayer.new do
--                progress(pixbufloader.pixbuf,
--                         x: rect[:left],
--                         y: rect[:top],
--                         width: rect[:right] - rect[:left],
--                         height: rect[:bottom] - rect[:top])
--                rect = nil
-+            atomic do
-+              if rect
-+                rect[:left] = [rect[:left], x].min
-+                rect[:top] = [rect[:top], y].min
-+                rect[:right] = [rect[:right], x+width].max
-+                rect[:bottom] = [rect[:bottom], y+height].max
-+              else
-+                rect = {left: x, top: y, right: x+width, bottom: y+height}
-+                Delayer.new do
-+                  atomic do
-+                    progress(pixbufloader.pixbuf,
-+                             x: rect[:left],
-+                             y: rect[:top],
-+                             width: rect[:right] - rect[:left],
-+                             height: rect[:bottom] - rect[:top])
-+                    rect = nil
-+                  end
-+                end
-               end
-             end
--            true end
-+            true
-+          end
- 
-           complete_promise.next{
-             progress(pixbufloader.pixbuf, paint: true)
diff --git a/net/mikutter/patches/patch-mikutter.rb b/net/mikutter/patches/patch-mikutter.rb
index 4350b12942e..3ac3cec3d20 100644
--- a/net/mikutter/patches/patch-mikutter.rb
+++ b/net/mikutter/patches/patch-mikutter.rb
@@ -1,9 +1,9 @@
-$NetBSD: patch-mikutter.rb,v 1.5 2017/12/30 05:05:14 tsutsui Exp $
+$NetBSD: patch-mikutter.rb,v 1.6 2018/01/14 05:15:05 tsutsui Exp $
 
 - pkgsrc can handle location of ruby binary
   https://dev.mikutter.hachune.net/issues/889
 
---- mikutter.rb.orig	2017-06-10 01:11:51.000000000 +0000
+--- mikutter.rb.orig	2018-01-13 17:07:11.000000000 +0000
 +++ mikutter.rb
 @@ -1,7 +1,5 @@
 -#!/bin/sh
@@ -13,4 +13,4 @@ $NetBSD: patch-mikutter.rb,v 1.5 2017/12/30 05:05:14 tsutsui Exp $
 -#!ruby
  =begin rdoc
  = mikutter - the moest twitter client
- Copyright (C) 2009-2017 Toshiaki Asai
+ Copyright (C) 2009-2018 Toshiaki Asai