Hello community, here is the log from the commit of package mlterm for openSUSE:Factory checked in at 2013-11-13 09:44:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mlterm (Old) and /work/SRC/openSUSE:Factory/.mlterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mlterm" Changes: -------- --- /work/SRC/openSUSE:Factory/mlterm/mlterm.changes 2013-09-09 19:46:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mlterm.new/mlterm.changes 2013-11-13 09:44:51.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Nov 6 15:52:53 CET 2013 - [email protected] + +- mlterm-fix-biwidth-font-search.diff: + Fix missing biwidth characeters as default with X11 core fonts + (bnc#849342) +- Update font and aafont config files to use FreeMono and IPAGothic + in etc.patch (bnc#849342) + +------------------------------------------------------------------- New: ---- mlterm-fix-biwidth-font-search.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mlterm.spec ++++++ --- /var/tmp/diff_new_pack.C7OciD/_old 2013-11-13 09:44:52.000000000 +0100 +++ /var/tmp/diff_new_pack.C7OciD/_new 2013-11-13 09:44:52.000000000 +0100 @@ -47,6 +47,8 @@ Source10: %name.desktop Source11: %name.png Patch0: etc.patch +# PATCH-FIX-OPENSUSE mlterm-fix-biwidth-font-search.diff bnc#849342 [email protected] +Patch1: mlterm-fix-biwidth-font-search.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Multilingual Terminal Emulator for X License: BSD-3-Clause @@ -139,7 +141,8 @@ %prep %setup -q -%patch0 +%patch0 -p1 +%patch1 -p1 rm -rf doc/{en,ja}/*win32 %build ++++++ etc.patch ++++++ --- /var/tmp/diff_new_pack.C7OciD/_old 2013-11-13 09:44:52.000000000 +0100 +++ /var/tmp/diff_new_pack.C7OciD/_new 2013-11-13 09:44:52.000000000 +0100 @@ -1,9 +1,50 @@ -Index: etc/aafont -=================================================================== ---- etc/aafont.orig -+++ etc/aafont -@@ -1,37 +1,37 @@ +--- + etc/aafont | 67 +++++++++++++++++++++++++++++------------------------------- + etc/font | 53 ++++++++++++++++++++++++++++++++++++++++++++++- + etc/key | 6 +++++ + etc/main | 26 ++++++++++++++++++++++- + etc/termcap | 2 + + etc/vaafont | 66 +++++++++++++++++++++++++++++------------------------------ + etc/xim | 13 ++++++++--- + 7 files changed, 161 insertions(+), 72 deletions(-) + +--- a/etc/aafont ++++ b/etc/aafont +@@ -1,37 +1,36 @@ #DEFAULT=Kochi Gothic ++ISO8859_1=FreeMono-iso10646-1; ++ISO8859_2=FreeMono-iso10646-1; ++ISO8859_3=FreeMono-iso10646-1; ++ISO8859_4=FreeMono-iso10646-1; ++ISO8859_7=FreeMono-iso10646-1; ++ISO8859_9=FreeMono-iso10646-1; ++ISO8859_10=FreeMono-iso10646-1; ++ISO8859_13=FreeMono-iso10646-1; ++ISO8859_14=FreeMono-iso10646-1; ++ISO8859_15=FreeMono-iso10646-1; ++ ++JISX0201_ROMAN=IPAGothic-iso10646-1; ++JISX0201_KATA=IPAGothic-iso10646-1; ++JISX0208_1983=IPAGothic-iso10646-1; ++JISX0208_1983_BOLD=IPAGothic-iso10646-1; ++ ++GB2312_80=AR PL SungtiL GB-iso10646-1; ++GBK=AR PL SungtiL GB-iso10646-1; ++BIG5=AR PL Mingti2L Big5-iso10646-1; ++HKSCS=AR PL Mingti2L Big5-iso10646-1; ++KSC5601_1987=Baekmuk unigulir-iso10646-1; ++KSX1001_1997=Baekmuk unigulir-iso10646-1; ++ ++ISO10646_UCS2_1 = FreeMono-iso10646-1; ++ISO10646_UCS2_1_BIWIDTH = IPAGothic-iso10646-1; ++#ISO10646_UCS2_1_BIWIDTH = Bitstream Cyberbit-iso10646-1; ++#ISO10646_UCS2_1 = Arial Unicode MS-iso10646-1; ++#ISO10646_UCS2_1_BIWIDTH = Arial Unicode MS-iso10646-1; ++ISO10646_UCS4_1 = FreeMono-iso10646-1; ++ISO10646_UCS4_1_BIWIDTH = IPAGothic-iso10646-1; ++#ISO10646_UCS4_1_BIWIDTH = Bitstream Cyberbit-iso10646-1; ++#ISO10646_UCS4_1 = Arial Unicode MS-iso10646-1; ++#ISO10646_UCS4_1_BIWIDTH = Arial Unicode MS-iso10646-1; -#ISO8859_1=Courier 10 Pitch -#ISO8859_2=Thryomanes @@ -25,64 +66,29 @@ -#BIG5=AR PL Mingti2L Big5 -#GB2312_80=AR PL SungtiL GB -#GBK=AR PL SungtiL GB -- + -#ISO10646_UCS4_1=Courier 10 Pitch -#ISO10646_UCS4_1=Thryomanes - -# Japanese speakers may want to enable the following setting. -#ISO10646_UCS4_1_BIWIDTH=Kochi Gothic -+US_ASCII=Luxi Mono--iso10646-1; -+ISO8859_1=Luxi Mono-iso10646-1; -+ISO8859_2=Luxi Mono-iso10646-1; -+ISO8859_3=Luxi Mono-iso10646-1; -+ISO8859_4=Luxi Mono-iso10646-1; -+#ISO8859_7=Greek Courier-iso10646-1; -+ISO8859_9=Luxi Mono-iso10646-1; -+ISO8859_10=Luxi Mono-iso10646-1; -+ISO8859_13=Luxi Mono-iso10646-1; -+ISO8859_15=Luxi Mono-iso10646-1; -+ -+JISX0201_ROMAN=Sazanami Gothic-iso10646-1; -+JISX0201_KATA=Sazanami Gothic-iso10646-1; -+JISX0208_1983=Sazanami Gothic-iso10646-1; -+JISX0208_1983_BOLD=Sazanami Gothic-iso10646-1; -+ -+GB2312_80=AR PL SungtiL GB-iso10646-1; -+GBK=AR PL SungtiL GB-iso10646-1; -+BIG5=AR PL Mingti2L Big5-iso10646-1; -+HKSCS=AR PL Mingti2L Big5-iso10646-1; -+KSC5601_1987=Baekmuk unigulir-iso10646-1; -+KSX1001_1997=Baekmuk unigulir-iso10646-1; -+ -+ISO10646_UCS2_1 = Luxi Mono-iso10646-1; -+ISO10646_UCS2_1_BIWIDTH = Sazanami Gothic-iso10646-1; -+#ISO10646_UCS2_1_BIWIDTH = Bitstream Cyberbit-iso10646-1; -+#ISO10646_UCS2_1 = Arial Unicode MS-iso10646-1; -+#ISO10646_UCS2_1_BIWIDTH = Arial Unicode MS-iso10646-1; -+ISO10646_UCS4_1 = Luxi Mono-iso10646-1; -+ISO10646_UCS4_1_BIWIDTH = Sazanami Gothic-iso10646-1; -+#ISO10646_UCS4_1_BIWIDTH = Bitstream Cyberbit-iso10646-1; -+#ISO10646_UCS4_1 = Arial Unicode MS-iso10646-1; -+#ISO10646_UCS4_1_BIWIDTH = Arial Unicode MS-iso10646-1; - +- -# Korean speakers may want to enable the following setting. -#ISO10646_UCS4_1_BIWIDTH=dotum - +- -# Traditional Chinese speakers may want to enable the following setting. -#ISO10646_UCS4_1_BIWIDTH=AR PL Mingti2L Big5 - -# Simplified Chinese speakers may want to enable the following setting. -#ISO10646_UCS4_1_BIWIDTH=AR PL SungtiL GB -Index: etc/font -=================================================================== ---- etc/font.orig -+++ etc/font +--- a/etc/font ++++ b/etc/font @@ -1,7 +1,7 @@ #DEFAULT = -kochi-mincho-medium-r-*--%d-*- #DEFAULT_ITALIC = -mona-gothic-medium-i-*--%d-*- #DEC_SPECIAL = 10,a10;12,6x12;14,7x14;16,8x16; -#ISO8859_1 = -kochi-mincho-medium-r-*--%d-*-iso8859-1;10,a10;12,6x12; -+#ISO8859_1 = -misc-sazanami gothic-medium-*-%d-*-iso8859-1;10,a10;12,6x12; ++#ISO8859_1 = -misc-ipagothic-medium-*-%d-*-iso8859-1;10,a10;12,6x12; #ISO8859_1_BOLD = 10,a10B;14,7x14bold; #JISX0201_KATA = 10,r10;12,r12;14,r14;16,r16; #JISX0201_KATA_BOLD = 10,r10; @@ -103,9 +109,9 @@ + +ISO8859_15 = -b&h-luxi mono-medium-r-normal-*-%d-*-*-*-m-*-iso8859-15;10,-b&h-lucidatypewriter-medium-r-normal-*-10-*-iso8859-15;11,-b&h-lucidatypewriter-medium-r-normal-*-11-*-iso8859-15;12,-b&h-lucidatypewriter-medium-r-normal-*-12-*-iso8859-15;14,-b&h-lucidatypewriter-medium-r-normal-*-14-*-iso8859-15;16,-efont-fixed-medium-r-normal--16-160-75-75-c-80-iso8859-15;17,-b&h-lucidatypewriter-medium-r-normal-*-17-*-iso8859-15;18,-b&h-lucidatypewriter-medium-r-normal-*-18-*-iso8859-15;19,-b&h-lucidatypewriter-medium-r-normal-*-19-*-iso8859-15;20,-*-fixed-medium-r-*--20-*-iso8859-15;24,-b&h-lucidatypewriter-medium-r-normal-*-24-*-iso8859-15;25,-b&h-lucidatypewriter-medium-r-normal-*-25-*-iso8859-15;26,-b&h-lucidatypewriter-medium-r-normal-*-26-*-iso8859-15;34,-b&h-lucidatypewriter-medium-r-normal-*-34-*-iso8859-15; + -+JISX0208_1983 = -misc-sazanami gothic-medium-r-normal-*-%d-*-*-*-*-*-jisx0208.1983-0;10,-*-fixed-medium-r-*--10-*-*-*-c-*-jisx0208*-0;12,-*-fixed-medium-r-normal--12-*-*-*-c-*-jisx0208*-0;14,-*-fixed-medium-r-*--14-*-*-*-c-*-jisx0208*-0;16,-jis-fixed-medium-r-*--16-*-*-*-c-160-jisx0208*-0;18,-misc-fixed-medium-r-*--18-*-*-*-c-*-jisx0208*-0;20,-*-fixed-medium-r-*--20-*-*-*-c-200-jisx0208*-0;24,-*-fixed-medium-r-normal--24-*-*-*-c-*-jisx0208*-0 ++JISX0208_1983 = -misc-ipagothic-medium-r-normal-*-%d-*-*-*-*-*-jisx0208.1983-0;10,-*-fixed-medium-r-*--10-*-*-*-c-*-jisx0208*-0;12,-*-fixed-medium-r-normal--12-*-*-*-c-*-jisx0208*-0;14,-*-fixed-medium-r-*--14-*-*-*-c-*-jisx0208*-0;16,-jis-fixed-medium-r-*--16-*-*-*-c-160-jisx0208*-0;18,-misc-fixed-medium-r-*--18-*-*-*-c-*-jisx0208*-0;20,-*-fixed-medium-r-*--20-*-*-*-c-200-jisx0208*-0;24,-*-fixed-medium-r-normal--24-*-*-*-c-*-jisx0208*-0 + -+JISX0208_1990 = -misc-sazanami gothic-medium-r-normal-*-%d-*-*-*-*-*-jisx0208.1990-0;10,-*-fixed-medium-r-*--10-*-*-*-c-*-jisx0208.1990-0;12,-*-fixed-medium-r-normal--12-*-*-*-c-*-jisx0208.1990-0;14,-*-fixed-medium-r-*--14-*-*-*-c-*-jisx0208.1990-0;16,-jis-fixed-medium-r-*--16-*-*-*-c-160-jisx0208.1990-0;18,-misc-fixed-medium-r-*--18-*-*-*-c-*-jisx0208.1990-0;20,-*-fixed-medium-r-*--20-*-*-*-c-200-jisx0208.1990-0 ++JISX0208_1990 = -misc-ipagothic-medium-r-normal-*-%d-*-*-*-*-*-jisx0208.1990-0;10,-*-fixed-medium-r-*--10-*-*-*-c-*-jisx0208.1990-0;12,-*-fixed-medium-r-normal--12-*-*-*-c-*-jisx0208.1990-0;14,-*-fixed-medium-r-*--14-*-*-*-c-*-jisx0208.1990-0;16,-jis-fixed-medium-r-*--16-*-*-*-c-160-jisx0208.1990-0;18,-misc-fixed-medium-r-*--18-*-*-*-c-*-jisx0208.1990-0;20,-*-fixed-medium-r-*--20-*-*-*-c-200-jisx0208.1990-0 + +# if '-baekmuk-gulim-' cannot be found, other Korean fonts will be tried automatically. +# On a minimalistic X11 installation, at least the 'daewoo' fonts should be found. @@ -132,7 +138,7 @@ + +ISO10646_UCS2_1 = -b&h-luxi mono-medium-r-normal-*-%d-*-*-*-m-*-iso10646-1;10,-efont-fixed-medium-r-normal--10-100-75-75-c-50-iso10646-1;12,-efont-fixed-medium-r-normal-*-12-120-75-75-c-60-iso10646-1;13,-misc-fixed-medium-r-semicondensed-*-13-120-75-75-c-60-iso10646-1;14,-efont-fixed-medium-r-normal-*-14-140-75-75-c-70-iso10646-1;16,-gnu-unifont-medium-r-normal--16-*-*-*-c-*-iso10646-1;18,-misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1;20,-misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1;24,-efont-fixed-medium-r-normal-*-24-240-75-75-c-120-iso10646-1; + -+ISO10646_UCS2_1_BIWIDTH = -misc-sazanami gothic-medium-r-normal-*-%d-*-*-*-*-*-iso10646-1;10,-efont-fixed-medium-r-normal--10-100-75-75-c-100-iso10646-1;12,-efont-fixed-medium-r-normal-*-12-120-75-75-c-120-iso10646-1;13,-misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1;14,-efont-fixed-medium-r-normal-*-14-140-75-75-c-140-iso10646-1;16,-gnu-unifont-medium-r-normal--16-*-*-*-c-*-iso10646-1;18,-misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1;20,-misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1;24,-efont-fixed-medium-r-normal-*-24-240-75-75-c-240-iso10646-1; ++ISO10646_UCS2_1_BIWIDTH = -misc-ipagothic-medium-r-normal-*-%d-*-*-*-*-*-iso10646-1;10,-efont-fixed-medium-r-normal--10-100-75-75-c-100-iso10646-1;12,-efont-fixed-medium-r-normal-*-12-120-75-75-c-120-iso10646-1;13,-misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1;14,-efont-fixed-medium-r-normal-*-14-140-75-75-c-140-iso10646-1;16,-gnu-unifont-medium-r-normal--16-*-*-*-c-*-iso10646-1;18,-misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1;20,-misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1;24,-efont-fixed-medium-r-normal-*-24-240-75-75-c-240-iso10646-1; + +# Using '-efont-fixed-medium-r-normal-*-16-160-75-75-c-160-iso10646-1' for +# 16 pixel as well looks better. If you don't absolutely need all the characters @@ -140,11 +146,9 @@ + +#ISO10646_UCS2_1 = -b&h-luxi mono-medium-r-normal-*-%d-*-*-*-m-*-iso10646-1;10,-efont-fixed-medium-r-normal--10-100-75-75-c-50-iso10646-1;12,-efont-fixed-medium-r-normal-*-12-120-75-75-c-60-iso10646-1;13,-misc-fixed-medium-r-semicondensed-*-13-120-75-75-c-60-iso10646-1;14,-efont-fixed-medium-r-normal-*-14-140-75-75-c-70-iso10646-1;16,-efont-fixed-medium-r-normal-*-16-160-75-75-c-80-iso10646-1;18,-misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1;20,-misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1;24,-efont-fixed-medium-r-normal-*-24-240-75-75-c-120-iso10646-1; + -+#ISO10646_UCS2_1_BIWIDTH = -misc-sazanami gothic-medium-r-normal-*-%d-*-*-*-*-*-iso10646-1;10,-efont-fixed-medium-r-normal--10-100-75-75-c-100-iso10646-1;12,-efont-fixed-medium-r-normal-*-12-120-75-75-c-120-iso10646-1;13,-misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1;14,-efont-fixed-medium-r-normal-*-14-140-75-75-c-140-iso10646-1;16,-efont-fixed-medium-r-normal-*-16-160-75-75-c-160-iso10646-1;18,-misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1;20,-misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1;24,-efont-fixed-medium-r-normal-*-24-240-75-75-c-240-iso10646-1; -Index: etc/key -=================================================================== ---- etc/key.orig -+++ etc/key ++#ISO10646_UCS2_1_BIWIDTH = -misc-ipagothic-medium-r-normal-*-%d-*-*-*-*-*-iso10646-1;10,-efont-fixed-medium-r-normal--10-100-75-75-c-100-iso10646-1;12,-efont-fixed-medium-r-normal-*-12-120-75-75-c-120-iso10646-1;13,-misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1;14,-efont-fixed-medium-r-normal-*-14-140-75-75-c-140-iso10646-1;16,-efont-fixed-medium-r-normal-*-16-160-75-75-c-160-iso10646-1;18,-misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1;20,-misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1;24,-efont-fixed-medium-r-normal-*-24-240-75-75-c-240-iso10646-1; +--- a/etc/key ++++ b/etc/key @@ -30,3 +30,9 @@ # Button3="exesel:/cygdrive/c/Program\\ Files/Internet\\ Explorer/iexplore.exe" # Button4="\x1bOA\x1bOA" @@ -155,10 +159,8 @@ +Shift+KP_Subtract="proto:fontsize=smaller" +KP_Begin="\e[E" + -Index: etc/main -=================================================================== ---- etc/main.orig -+++ etc/main +--- a/etc/main ++++ b/etc/main @@ -106,7 +106,31 @@ # (simple,sample,sample2,sample3,next,motif,athena,mozmodern) @@ -192,10 +194,8 @@ # fg_color = black -Index: etc/termcap -=================================================================== ---- etc/termcap.orig -+++ etc/termcap +--- a/etc/termcap ++++ b/etc/termcap @@ -1,5 +1,7 @@ mlterm:\ kb=^?:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~ @@ -204,10 +204,8 @@ xterm:\ ut rxvt:\ -Index: etc/xim -=================================================================== ---- etc/xim.orig -+++ etc/xim +--- a/etc/xim ++++ b/etc/xim @@ -1,6 +1,13 @@ -Ami=ko_KR.eucKR kinput2=ja_JP.eucJP @@ -225,10 +223,8 @@ +uim=ja_JP.UTF-8 + -Index: etc/vaafont -=================================================================== ---- etc/vaafont.orig -+++ etc/vaafont +--- a/etc/vaafont ++++ b/etc/vaafont @@ -1,37 +1,37 @@ #DEFAULT=Kochi Gothic @@ -268,10 +264,10 @@ +ISO8859_13=Luxi Sans-iso10646-1; +ISO8859_15=Luxi Sans-iso10646-1; + -+JISX0201_ROMAN=Sazanami Gothic-iso10646-1; -+JISX0201_KATA=Sazanami Gothic-iso10646-1; -+JISX0208_1983=Sazanami Gothic-iso10646-1; -+JISX0208_1983_BOLD=Sazanami Gothic-iso10646-1; ++JISX0201_ROMAN=IPAGothic-iso10646-1; ++JISX0201_KATA=IPAGothic-iso10646-1; ++JISX0208_1983=IPAGothic-iso10646-1; ++JISX0208_1983_BOLD=IPAGothic-iso10646-1; + +GB2312_80=AR PL SungtiL GB-iso10646-1; +GBK=AR PL SungtiL GB-iso10646-1; @@ -282,12 +278,12 @@ +KSX1001_1997=Baekmuk unigulir-iso10646-1; + +ISO10646_UCS2_1 = Luxi Sans-iso10646-1; -+ISO10646_UCS2_1_BIWIDTH = Sazanami Gothic-iso10646-1; ++ISO10646_UCS2_1_BIWIDTH = IPAGothic-iso10646-1; +#ISO10646_UCS2_1_BIWIDTH = Bitstream Cyberbit-iso10646-1; +#ISO10646_UCS2_1 = Arial Unicode MS-iso10646-1; +#ISO10646_UCS2_1_BIWIDTH = Arial Unicode MS-iso10646-1; +ISO10646_UCS4_1 = Luxi Sans-iso10646-1; -+ISO10646_UCS4_1_BIWIDTH = Sazanami Gothic-iso10646-1; ++ISO10646_UCS4_1_BIWIDTH = IPAGothic-iso10646-1; +#ISO10646_UCS4_1_BIWIDTH = Bitstream Cyberbit-iso10646-1; +#ISO10646_UCS4_1 = Arial Unicode MS-iso10646-1; +#ISO10646_UCS4_1_BIWIDTH = Arial Unicode MS-iso10646-1; ++++++ mlterm-fix-biwidth-font-search.diff ++++++ --- xwindow/xlib/x_font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/xwindow/xlib/x_font.c +++ b/xwindow/xlib/x_font.c @@ -533,14 +533,14 @@ xcore_set_font( if( (font->id & FONT_BIWIDTH) && (FONT_CS(font->id) == ISO10646_UCS4_1) ) { family = "biwidth" ; + num_of_spacings = sizeof(spacings) / sizeof(spacings[0]) ; } else { family = "fixed" ; + num_of_spacings = 1 ; } - num_of_spacings = 1 ; - for( count = 0 ; ; count ++) { FOREACH_FONT_ENCODINGS(csinfo,font_encoding_p) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
