Author: gotar Date: Sat Nov 7 15:49:45 2009 GMT Module: packages Tag: HEAD ---- Log message: - proposed patch to #1668, reenabled charset conversion
---- Files affected: packages/mc: mc.spec (1.300 -> 1.301) , slang-8bit_xterm.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/mc/mc.spec diff -u packages/mc/mc.spec:1.300 packages/mc/mc.spec:1.301 --- packages/mc/mc.spec:1.300 Sat Oct 31 19:19:14 2009 +++ packages/mc/mc.spec Sat Nov 7 16:49:39 2009 @@ -23,7 +23,7 @@ Summary(zh_CN.UTF-8): 一个方便实用的文件管理器和虚拟Shell Name: mc Version: 4.7.0 -Release: 0.7 +Release: 0.8 License: GPL v2+ Group: Applications/Shells Source0: http://www.midnight-commander.org/downloads/%{name}-%{version}-%{snap}.tar.bz2 @@ -36,6 +36,7 @@ Source7: %{name}.desktop Source8: %{name}.png Patch0: %{name}-rpmfs.patch +Patch1: slang-8bit_xterm.patch Patch4: %{name}-home_etc2.patch Patch5: %{name}-pl.patch Patch6: %{name}-no-ws-visible.patch @@ -220,6 +221,7 @@ %prep %setup -q -a3 -n %{name}-%{version}-%{snap} %patch0 -p1 +%patch1 -p1 cp -f vfs/extfs/{rpm,srpm} # doesn't apply #%patch4 -p1 @@ -260,7 +262,7 @@ %configure \ --enable-dependency-tracking \ - --disable-charset \ + --enable-charset \ --with%{!?debug:out}-debug \ --with%{!?with_ext2undel:out}-ext2undel \ --with%{!?with_x:out}-x \ @@ -416,6 +418,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.301 2009/11/07 15:49:39 gotar +- proposed patch to #1668, reenabled charset conversion + Revision 1.300 2009/10/31 18:19:14 gotar - disabled charset conversion due to #1668 ================================================================ Index: packages/mc/slang-8bit_xterm.patch diff -u /dev/null packages/mc/slang-8bit_xterm.patch:1.1 --- /dev/null Sat Nov 7 16:49:45 2009 +++ packages/mc/slang-8bit_xterm.patch Sat Nov 7 16:49:39 2009 @@ -0,0 +1,12 @@ +diff -urNp mc-4.7.0-pre4.orig/src/tty/tty-slang.c mc-4.7.0-pre4/src/tty/tty-slang.c +--- mc-4.7.0-pre4.orig/src/tty/tty-slang.c 2009-11-07 16:29:08.000000000 +0100 ++++ mc-4.7.0-pre4/src/tty/tty-slang.c 2009-11-07 16:28:50.000000000 +0100 +@@ -499,7 +499,7 @@ tty_set_alt_charset (gboolean alt_charse + void + tty_display_8bit (gboolean what) + { +- SLsmg_Display_Eight_Bit = what ? 128 : 160; ++ SLsmg_Display_Eight_Bit = what & xterm_flag ? 128 : 160; + } + + void ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mc/mc.spec?r1=1.300&r2=1.301&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
