CVS commit: pkgsrc/net/mikutter

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Jan 13 04:46:39 UTC 2018

Modified Files:
        pkgsrc/net/mikutter: Makefile distinfo
Added Files:
        pkgsrc/net/mikutter/patches: patch-core_plugin_openimg_window.rb

Log Message:
mikutter: pull upstream fix for ticket 1137 (errors on image preview).

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 pkgsrc/net/mikutter/Makefile
cvs rdiff -u -r1.135 -r1.136 pkgsrc/net/mikutter/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/mikutter/patches/patch-core_plugin_openimg_window.rb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/mikutter/Makefile
diff -u pkgsrc/net/mikutter/Makefile:1.151 pkgsrc/net/mikutter/Makefile:1.152
--- pkgsrc/net/mikutter/Makefile:1.151  Tue Jan  2 02:43:59 2018
+++ pkgsrc/net/mikutter/Makefile        Sat Jan 13 04:46:39 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.151 2018/01/02 02:43:59 tsutsui Exp $
+# $NetBSD: Makefile,v 1.152 2018/01/13 04:46:39 tsutsui Exp $
 #
 
 DISTNAME=      mikutter.3.6.0
-PKGREVISION=   1
+PKGREVISION=   2
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/./-/}
 CATEGORIES=    net
 MASTER_SITES=  http://mikutter.hachune.net/bin/

Index: pkgsrc/net/mikutter/distinfo
diff -u pkgsrc/net/mikutter/distinfo:1.135 pkgsrc/net/mikutter/distinfo:1.136
--- pkgsrc/net/mikutter/distinfo:1.135  Sat Dec 30 05:05:14 2017
+++ pkgsrc/net/mikutter/distinfo        Sat Jan 13 04:46:39 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.135 2017/12/30 05:05:14 tsutsui Exp $
+$NetBSD: distinfo,v 1.136 2018/01/13 04:46:39 tsutsui Exp $
 
 SHA1 (mikutter.3.6.0.tar.gz) = 8dd1b52e8fe00bdc7d1ac1c25c3a8fa16d91ff8c
 RMD160 (mikutter.3.6.0.tar.gz) = 40d493d2660ba3e5af92a522fd4cd03d7949dd14
@@ -7,6 +7,7 @@ Size (mikutter.3.6.0.tar.gz) = 2899397 b
 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

Added files:

Index: pkgsrc/net/mikutter/patches/patch-core_plugin_openimg_window.rb
diff -u /dev/null pkgsrc/net/mikutter/patches/patch-core_plugin_openimg_window.rb:1.1
--- /dev/null   Sat Jan 13 04:46:39 2018
+++ pkgsrc/net/mikutter/patches/patch-core_plugin_openimg_window.rb     Sat Jan 13 04:46:39 2018
@@ -0,0 +1,51 @@
+$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)