Fri Feb 15 22:23:53 2019 UTC ()
mikutter: fix build (a missed patch in previous).


(tsutsui)
diff -r1.154 -r1.155 pkgsrc/net/mikutter/distinfo
diff -r1.6 -r1.7 pkgsrc/net/mikutter/patches/patch-core_plugin_photo__support_photo__support.rb

cvs diff -r1.154 -r1.155 pkgsrc/net/mikutter/distinfo (expand / switch to unified diff)

--- pkgsrc/net/mikutter/distinfo 2019/02/12 17:21:18 1.154
+++ pkgsrc/net/mikutter/distinfo 2019/02/15 22:23:53 1.155
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.154 2019/02/12 17:21:18 tsutsui Exp $ 1$NetBSD: distinfo,v 1.155 2019/02/15 22:23:53 tsutsui Exp $
2 2
3SHA1 (mikutter.3.8.5.tar.gz) = 65c6d07d95706d8bc175102265f2d5179873ac1a 3SHA1 (mikutter.3.8.5.tar.gz) = 65c6d07d95706d8bc175102265f2d5179873ac1a
4RMD160 (mikutter.3.8.5.tar.gz) = 4b8c7bdd86a5fc6252c643074ade03b2c86986fb 4RMD160 (mikutter.3.8.5.tar.gz) = 4b8c7bdd86a5fc6252c643074ade03b2c86986fb
5SHA512 (mikutter.3.8.5.tar.gz) = 2316eb233a68dae19abf0989898281ebe0bb8413d4f0303d318b7fc04160a690a873ff7d6debc32bf6f21a84e92bfcf3995c737e39f9ea7dd26f6b368158f0d8 5SHA512 (mikutter.3.8.5.tar.gz) = 2316eb233a68dae19abf0989898281ebe0bb8413d4f0303d318b7fc04160a690a873ff7d6debc32bf6f21a84e92bfcf3995c737e39f9ea7dd26f6b368158f0d8
6Size (mikutter.3.8.5.tar.gz) = 2941440 bytes 6Size (mikutter.3.8.5.tar.gz) = 2941440 bytes
7SHA1 (patch-core_plugin_libnotify_rnotify.rb) = 0bb5630f4411d11ad188c722fb1d14e2d6748d17 7SHA1 (patch-core_plugin_libnotify_rnotify.rb) = 0bb5630f4411d11ad188c722fb1d14e2d6748d17
8SHA1 (patch-core_plugin_photo__support_Gemfile) = 754b96024904e2e2f55c83e88fd3c763eecf723c 8SHA1 (patch-core_plugin_photo__support_Gemfile) = 754b96024904e2e2f55c83e88fd3c763eecf723c
9SHA1 (patch-core_plugin_photo__support_photo__support.rb) = c338c33108987c5dfd7edb4cd9f178cb1d0e63e7 9SHA1 (patch-core_plugin_photo__support_photo__support.rb) = 910924ef121680a931e036ee1bc32bb713066eeb
10SHA1 (patch-mikutter.rb) = 34f3ae812c5db53b448111ff0d7c36100e93adce 10SHA1 (patch-mikutter.rb) = 34f3ae812c5db53b448111ff0d7c36100e93adce

cvs diff -r1.6 -r1.7 pkgsrc/net/mikutter/patches/Attic/patch-core_plugin_photo__support_photo__support.rb (expand / switch to unified diff)

--- pkgsrc/net/mikutter/patches/Attic/patch-core_plugin_photo__support_photo__support.rb 2018/10/28 06:47:31 1.6
+++ pkgsrc/net/mikutter/patches/Attic/patch-core_plugin_photo__support_photo__support.rb 2019/02/15 22:23:53 1.7
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: patch-core_plugin_photo__support_photo__support.rb,v 1.6 2018/10/28 06:47:31 tsutsui Exp $ 1$NetBSD: patch-core_plugin_photo__support_photo__support.rb,v 1.7 2019/02/15 22:23:53 tsutsui Exp $
2 2
3- temporary workaround to skip totorijp gems (sorry, @toshi_a) 3- temporary workaround to skip totorijp gems (sorry, @toshi_a)
4 4
5--- core/plugin/photo_support/photo_support.rb.orig 2018-10-28 04:50:27.000000000 +0000 5--- core/plugin/photo_support/photo_support.rb.orig 2018-10-28 04:50:27.000000000 +0000
6+++ core/plugin/photo_support/photo_support.rb 6+++ core/plugin/photo_support/photo_support.rb
7@@ -1,7 +1,7 @@ 7@@ -1,7 +1,7 @@
8 # coding: utf-8 8 # coding: utf-8
9 require 'nokogiri' 9 require 'nokogiri'
10 require 'httpclient' 10 require 'httpclient'
11-require 'totoridipjp' 11-require 'totoridipjp'
12+#require 'totoridipjp' 12+#require 'totoridipjp'
 13 require 'json'
13  14
14 module Plugin::PhotoSupport 15 module Plugin::PhotoSupport
15 SUPPORTED_IMAGE_FORMATS = GdkPixbuf::Pixbuf.formats.flat_map{|f| f.extensions }.freeze 
16@@ -172,9 +172,14 @@ Plugin.create :photo_support do 16@@ -172,9 +172,14 @@ Plugin.create :photo_support do
17  17
18 # totori.dip.jp 18 # totori.dip.jp
19 defimageopener('totori.dip.jp', %r#\Ahttp://totori\.dip\.jp/?\Z#) do |display_url| 19 defimageopener('totori.dip.jp', %r#\Ahttp://totori\.dip\.jp/?\Z#) do |display_url|
20- iwashi = Totoridipjp.イワシがいっぱいだあ…ちょっとだけもらっていこうかな 20- iwashi = Totoridipjp.イワシがいっぱいだあ…ちょっとだけもらっていこうかな
21- if iwashi.url 21- if iwashi.url
22- open(iwashi.url) end 22- open(iwashi.url) end
23+# iwashi = Totoridipjp.イワシがいっぱいだあ…ちょっとだけもらっていこうかな 23+# iwashi = Totoridipjp.イワシがいっぱいだあ…ちょっとだけもらっていこうかな
24+# if iwashi.url 24+# if iwashi.url
25+# open(iwashi.url) end 25+# open(iwashi.url) end
26+ connection = HTTPClient.new 26+ connection = HTTPClient.new
27+ page = connection.get_content(display_url) 27+ page = connection.get_content(display_url)
28+ next nil if page.empty? 28+ next nil if page.empty?