diff options
| author | vanilla <vanilla@FreeBSD.org> | 2012-09-03 11:50:42 +0800 |
|---|---|---|
| committer | vanilla <vanilla@FreeBSD.org> | 2012-09-03 11:50:42 +0800 |
| commit | f243f7f688c6ed7b90aa01f7c11390f51bda2ea5 (patch) | |
| tree | ed7879b70166de7a7fa5b90ee1e4d1c476bf0a63 /irc/irssi | |
| parent | 1df9bfd27a2af548bc155bca50c658102ec123f2 (diff) | |
| download | freebsd-ports-gnome-f243f7f688c6ed7b90aa01f7c11390f51bda2ea5.tar.gz freebsd-ports-gnome-f243f7f688c6ed7b90aa01f7c11390f51bda2ea5.tar.zst freebsd-ports-gnome-f243f7f688c6ed7b90aa01f7c11390f51bda2ea5.zip | |
revert last change, it cause some seg faults.
Diffstat (limited to 'irc/irssi')
| -rw-r--r-- | irc/irssi/Makefile | 5 | ||||
| -rw-r--r-- | irc/irssi/files/patch-irssi-utf8 | 38 |
2 files changed, 1 insertions, 42 deletions
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index 619e49dabce9..41fc673a03c4 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -1,13 +1,10 @@ -# New ports collection makefile for: irssi -# Date created: 14 Apr 1999 -# Whom: Jim Mock <jim@FreeBSD.org> # # $FreeBSD$ # PORTNAME= irssi PORTVERSION= 0.8.15 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= irc MASTER_SITES= http://mirror.irssi.org/ diff --git a/irc/irssi/files/patch-irssi-utf8 b/irc/irssi/files/patch-irssi-utf8 deleted file mode 100644 index ab67286bf3d1..000000000000 --- a/irc/irssi/files/patch-irssi-utf8 +++ /dev/null @@ -1,38 +0,0 @@ -# -# $FreeBSD$ -# ---- src/fe-common/core/utf8.h (revision 5189) -+++ src/fe-common/core/utf8.h (working copy) -@@ -12,5 +12,6 @@ - int mk_wcwidth(unichar c); - - #define unichar_isprint(c) (((c) & ~0x80) >= 32) -+#define is_utf8_leading(c) (((c) & 0xc0) != 0x80) - - #endif ---- src/fe-text/textbuffer.c (revision 5189) -+++ src/fe-text/textbuffer.c (working copy) -@@ -23,6 +23,7 @@ - #include "module.h" - #include "misc.h" - #include "formats.h" -+#include "utf8.h" - - #include "textbuffer.h" - -@@ -157,6 +158,16 @@ - if (left > 0 && data[left-1] == 0) - left--; /* don't split the commands */ - -+ /* don't split utf-8 character. (assume we can split non-utf8 anywhere. */ -+ if (left < TEXT_CHUNK_USABLE_SIZE && !is_utf8_leading(data[left])) { -+ int i; -+ for (i = 1; i < 4 && left >= i; i++) -+ if (is_utf8_leading(data[left - i])) { -+ left -= i; -+ break; -+ } -+ } -+ - memcpy(chunk->buffer + chunk->pos, data, left); - chunk->pos += left; |