diff options
| -rw-r--r-- | net-im/twirssi/Makefile | 2 | ||||
| -rw-r--r-- | net-im/twirssi/distinfo | 6 | ||||
| -rw-r--r-- | net-im/twirssi/files/patch-twirssi.pl | 60 |
3 files changed, 4 insertions, 64 deletions
diff --git a/net-im/twirssi/Makefile b/net-im/twirssi/Makefile index 9239392c022c..f716b1b83135 100644 --- a/net-im/twirssi/Makefile +++ b/net-im/twirssi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= twirssi -PORTVERSION= 2.4.1 +PORTVERSION= 2.4.2 CATEGORIES= net-im MASTER_SITES= http://twirssi.com/ EXTRACT_SUFX= .pl diff --git a/net-im/twirssi/distinfo b/net-im/twirssi/distinfo index 91112989044f..ed33b3a83824 100644 --- a/net-im/twirssi/distinfo +++ b/net-im/twirssi/distinfo @@ -1,3 +1,3 @@ -MD5 (twirssi-2.4.1.pl) = df7bbac1ee29266b89705842ba052e9f -SHA256 (twirssi-2.4.1.pl) = 1f8531055410c58c5873d6aff6d6054d6cf69095740b765dccae9c1ffdd9712e -SIZE (twirssi-2.4.1.pl) = 63061 +MD5 (twirssi-2.4.2.pl) = e54cb5cb410e12309e82896647d3c41e +SHA256 (twirssi-2.4.2.pl) = 7db8d331067d3b57288cd534af4f00e5442372d341f8e5d7a8a3733b88d667b4 +SIZE (twirssi-2.4.2.pl) = 63625 diff --git a/net-im/twirssi/files/patch-twirssi.pl b/net-im/twirssi/files/patch-twirssi.pl deleted file mode 100644 index 583fc158c7a3..000000000000 --- a/net-im/twirssi/files/patch-twirssi.pl +++ /dev/null @@ -1,60 +0,0 @@ ---- twirssi.pl 2009-11-09 08:40:49.000000000 -0200 -+++ twirssi.pl 2009-11-06 18:03:05.000000000 -0200 -@@ -851,7 +851,7 @@ - return unless &logged_in($twit); - - my ( $fh, $filename ) = File::Temp::tempfile(); -- binmode( $fh, ":utf8" ); -+ binmode( $fh, ":" . &get_charset ); - $child_pid = fork(); - - if ($child_pid) { # parent -@@ -1213,7 +1213,7 @@ - # pretend - - if ( open FILE, $filename ) { -- binmode FILE, ":utf8"; -+ binmode FILE, ":" . &get_charset; - my @lines; - my %new_cache; - while (<FILE>) { -@@ -1596,6 +1596,13 @@ - return 60; - } - -+sub get_charset { -+ my $charset = Irssi::settings_get_str("twirssi_charset"); -+ print scalar localtime, " - charset: '$charset'" if &debug; -+ return "utf8" if $charset =~ /^\s*$/; -+ return $charset; -+} -+ - sub hilight { - my $text = shift; - -@@ -1636,7 +1643,7 @@ - "Set short_url_args to username,API_key or change your", - "short_url_provider." - ); -- return decode "utf8", $data; -+ return decode &get_charset, $data; - } - } - -@@ -1653,7 +1660,7 @@ - } - } - -- return decode "utf8", $data; -+ return decode &get_charset, $data; - } - - sub normalize_username { -@@ -1695,6 +1702,7 @@ - ); - - Irssi::settings_add_int( "twirssi", "twitter_poll_interval", 300 ); -+Irssi::settings_add_str( "twirssi", "twirssi_charset", "utf8" ); - Irssi::settings_add_str( "twirssi", "twitter_window", "twitter" ); - Irssi::settings_add_str( "twirssi", "bitlbee_server", "bitlbee" ); - Irssi::settings_add_str( "twirssi", "short_url_provider", "TinyURL" ); |