Closes Homebrew/homebrew#26884.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
This commit is contained in:
adnissen 2014-02-21 08:15:32 -05:00 committed by Adam Vandenberg
parent dcd3d5d6a3
commit 02564a82a4

View file

@ -2,8 +2,8 @@ require 'formula'
class Tmux < Formula
homepage 'http://tmux.sourceforge.net'
url 'http://downloads.sourceforge.net/project/tmux/tmux/tmux-1.8/tmux-1.8.tar.gz'
sha1 '08677ea914e1973ce605b0008919717184cbd033'
url 'http://downloads.sourceforge.net/project/tmux/tmux/tmux-1.9/tmux-1.9.tar.gz'
sha1 '43197e69716a0430a9e856c13df8ceae31783078'
head do
url 'git://git.code.sf.net/p/tmux/tmux-code'
@ -16,16 +16,6 @@ class Tmux < Formula
depends_on 'pkg-config' => :build
depends_on 'libevent'
def patches
# Fixes installation failure on Snow Leopard
# http://sourceforge.net/mailarchive/forum.php?thread_name=CAJfQvvc2QDU%3DtXWb-sc-NK0J8cgnDRMDod6CNKO1uYqu%3DY5CXg%40mail.gmail.com&forum_name=tmux-users
# http://sourceforge.net/p/tmux/tickets/41/
# Fixes abnormal displaying Korean letters on Mac OS X
# https://gist.github.com/niceview/5343842
# Accepted upstream, can be removed in next version.
DATA unless build.head?
end
def install
system "sh", "autogen.sh" if build.head?
@ -49,44 +39,3 @@ class Tmux < Formula
system "#{bin}/tmux", "-V"
end
end
__END__
diff --git a/osdep-darwin.c b/osdep-darwin.c
index 23de9d5..b5efe84 100644
--- a/osdep-darwin.c
+++ b/osdep-darwin.c
@@ -33,17 +33,17 @@ struct event_base *osdep_event_init(void);
char *
osdep_get_name(int fd, unused char *tty)
{
- struct proc_bsdshortinfo bsdinfo;
+ struct proc_bsdinfo bsdinfo;
pid_t pgrp;
int ret;
if ((pgrp = tcgetpgrp(fd)) == -1)
return (NULL);
- ret = proc_pidinfo(pgrp, PROC_PIDT_SHORTBSDINFO, 0,
+ ret = proc_pidinfo(pgrp, PROC_PIDTBSDINFO, 0,
&bsdinfo, sizeof bsdinfo);
- if (ret == sizeof bsdinfo && *bsdinfo.pbsi_comm != '\0')
- return (strdup(bsdinfo.pbsi_comm));
+ if (ret == sizeof bsdinfo && *bsdinfo.pbi_comm != '\0')
+ return (strdup(bsdinfo.pbi_comm));
return (NULL);
}
diff --git a/utf8.c b/utf8.c
index 88d847a..34e5087 100644
--- a/utf8.c
+++ b/utf8.c
@@ -173,7 +173,7 @@ struct utf8_width_entry utf8_width_table[] = {
{ 0x30000, 0x3fffd, 2, NULL, NULL },
{ 0x00711, 0x00711, 0, NULL, NULL },
{ 0x0fe00, 0x0fe0f, 0, NULL, NULL },
- { 0x01160, 0x011ff, 0, NULL, NULL },
+ { 0x01160, 0x011ff, 1, NULL, NULL },
{ 0x0180b, 0x0180d, 0, NULL, NULL },
{ 0x10a3f, 0x10a3f, 0, NULL, NULL },
{ 0x00981, 0x00981, 0, NULL, NULL },