Date: Sat, 18 Apr 2015 13:20:53 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384226 - in head/shells/fish: . files Message-ID: <201504181320.t3IDKrqM067999@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Sat Apr 18 13:20:52 2015 New Revision: 384226 URL: https://svnweb.freebsd.org/changeset/ports/384226 Log: shells/fish: Fix for hangs on FreeBSD 10.1+ Fix for hangs on FreeBSD 10.1+ due to WCHAR_T missing as an alias for UCS-4-INTERNAL. [1] https://github.com/fish-shell/fish-shell/issues/1741 PR: 196661 Submitted by: David Adam <zanchey ucc.gu.uwa.edu.au> Approved by: maintainer <freebsd.users gmail com> Added: head/shells/fish/files/patch-env__universal__common.cpp (contents, props changed) Modified: head/shells/fish/Makefile Modified: head/shells/fish/Makefile ============================================================================== --- head/shells/fish/Makefile Sat Apr 18 12:58:34 2015 (r384225) +++ head/shells/fish/Makefile Sat Apr 18 13:20:52 2015 (r384226) @@ -3,7 +3,7 @@ PORTNAME= fish PORTVERSION= 2.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= shells MASTER_SITES= http://fishshell.com/files/${PORTVERSION}/ Added: head/shells/fish/files/patch-env__universal__common.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/fish/files/patch-env__universal__common.cpp Sat Apr 18 13:20:52 2015 (r384226) @@ -0,0 +1,14 @@ +# Description: Hangs on freebsd when starting shell +# Issue ID: https://github.com/fish-shell/fish-shell/issues/1741 +# TODO: Remove after 2.1.2 update + +--- env_universal_common.cpp.orig 2015-04-18 11:58:07 UTC ++++ env_universal_common.cpp +@@ -151,6 +151,7 @@ static const char *iconv_wide_names_4[]= + { + "wchar_t", "WCHAR_T", + "wchar", "WCHAR", ++ "UCS-4-INTERNAL", + "ucs-4", "UCS-4", + "ucs4", "UCS4", + "utf-32", "UTF-32",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504181320.t3IDKrqM067999>