Hello community, here is the log from the commit of package mlterm for openSUSE:Factory checked in at Mon Nov 15 18:35:32 CET 2010. -------- --- mlterm/mlterm.changes 2010-09-09 20:42:43.000000000 +0200 +++ mlterm/mlterm.changes 2010-11-11 15:55:26.000000000 +0100 @@ -1,0 +2,22 @@ +Thu Nov 11 14:34:51 CET 2010 - pgajdos@suse.cz + +- updated to version 3.0.1: + * fixed infinite loop. when a sequence-like input was actually + so looooong, mlterm should assume it was just not properly + terminated (Thanks to shinichiro.h). + * should not loop forever when window was too narrow. + * Check if button is pressed before win->button_motion is called. + * Changed font and color configuration protocol numbers(not + compatible with cvs-2009/10/20 or before.) + * Modifier keys with Del/Home/End are distinguished. + The keypad middle key (XK_Begin, XK_KP_Begin) is mapped to + ^[[E, ^[[1;5E etc. + * The default value of button3_behavior option is changed + from "menu1" to "xterm". + * "ESC[9Nm" and "ESC[10Nm" sequences are supported. +- removed unneeded + * scim.patch + * cross-compile-not-needed.patch + * uim-build-fix.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cross-compile-not-needed.patch mlterm-2.9.4.tar.bz2 mlterm-scim.patch mlterm-uim-build-fix.diff New: ---- mlterm-3.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mlterm.spec ++++++ --- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:54.000000000 +0100 +++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mlterm (Version 2.9.4) +# spec file for package mlterm (Version 3.0.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,8 +29,8 @@ Group: System/X11/Terminals AutoReqProv: on Provides: locale(xorg-x11:ja;ko;zh;ar;he) -Version: 2.9.4 -Release: 10 +Version: 3.0.1 +Release: 1 Url: http://mlterm.sourceforge.net/ # Source0: http://prdownloads.sourceforge.net/mlterm/mlterm-2.7.0.tar.bz2 # cvs -d :pserver:anonymous@mlterm.cvs.sourceforge.net:/cvsroot/mlterm login @@ -43,16 +43,13 @@ Source11: %name.png Patch0: etc.patch Patch1: kiklib-configure.diff -Patch3: cross-compile-not-needed.patch Patch5: mlterm-po.patch Patch6: mlterm-gettext-version.patch Patch7: norootforbuild.patch Patch8: cast-from-pointer-to-integer-of-different-size.patch Patch9: mlconfig_fixdups.diff Patch11: mlterm-pkgconfig.patch -Patch12: mlterm-scim.patch Patch15: mlterm-configure.patch -Patch17: mlterm-uim-build-fix.diff Patch18: mlterm-fribidi-link-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Multilingual Terminal Emulator for X @@ -149,16 +146,13 @@ %setup0 -q %patch0 %patch1 -%patch3 %patch5 -b .po %patch6 -b .gettext-version %patch7 -b .norootforbuild %patch8 #%patch9 -p1 %patch11 -%patch12 %patch15 -%patch17 %patch18 GETTEXT_VERSION=$(gettext --version | head -n 1 | awk '{print $NF}') perl -pi'*.orig' -e "s/AM_GNU_GETTEXT_VERSION\\([0-9.]+\\)/AM_GNU_GETTEXT_VERSION(${GETTEXT_VERSION})/g" configure.in @@ -170,7 +164,7 @@ autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing $(/usr/bin/freetype-config --cflags)" #export CFLAGS="-g -O0 -D_GNU_SOURCE -fno-strict-aliasing $(/usr/bin/freetype-config --cflags)" -%configure --disable-static \ +%configure --enable-static=no \ --libexecdir=%{_libdir}/mlterm \ --sysconfdir=/etc/X11 \ --enable-utmp \ @@ -208,6 +202,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/mlterm/*.*a # ditto for libkik and libmkf rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a +rm -r $RPM_BUILD_ROOT%{_libdir}/mkf/*.*a # install terminfo entry-description #mkdir -p $RPM_BUILD_ROOT/usr/share/terminfo/m #tic -o $RPM_BUILD_ROOT/usr/share/terminfo/ doc/term/mlterm.ti @@ -226,6 +221,7 @@ %attr(555,root,tty) /usr/bin/mlterm /usr/share/applications/%name.desktop /usr/bin/mlclient +/usr/bin/mlclientx /usr/bin/mlcc /usr/bin/mlterm-zoom # %{_bindir}/* @@ -240,6 +236,8 @@ %{_libdir}/mlterm/libnext.so %{_libdir}/mlterm/libsample.so %{_libdir}/mlterm/libsample2.so +%dir %{_libdir}/mkf/ +%{_libdir}/mkf/*.so %{_libdir}/mlterm/mlconfig %{_libdir}/mlterm/mlterm-menu %dir /etc/X11/mlterm/ ++++++ cast-from-pointer-to-integer-of-different-size.patch ++++++ --- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:54.000000000 +0100 +++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:54.000000000 +0100 @@ -1,8 +1,8 @@ Index: mlterm/ml_config_proto.c =================================================================== ---- mlterm/ml_config_proto.c.orig 2004-12-07 04:37:00.000000000 +0100 -+++ mlterm/ml_config_proto.c 2009-11-30 19:38:50.783443000 +0100 -@@ -122,7 +122,7 @@ ml_gen_proto_challenge(void) +--- mlterm/ml_config_proto.c.orig ++++ mlterm/ml_config_proto.c +@@ -128,7 +128,7 @@ ml_gen_proto_challenge(void) return 0 ; } ++++++ etc.patch ++++++ --- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:54.000000000 +0100 +++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:54.000000000 +0100 @@ -1,28 +1,36 @@ Index: etc/aafont =================================================================== ---- etc/aafont.orig 2003-10-01 08:09:45.000000000 +0200 -+++ etc/aafont 2009-11-30 19:38:48.874588000 +0100 -@@ -1,35 +1,33 @@ --#ISO8859_1=Courier 10 Pitch-iso10646-1; --#ISO8859_2=Thryomanes-iso10646-1; --#ISO8859_3=Thryomanes-iso10646-1; --#ISO8859_4=Thryomanes-iso10646-1; --#ISO8859_5=Thryomanes-iso10646-1; --#ISO8859_7=Thryomanes-iso10646-1; --#ISO8859_9=Thryomanes-iso10646-1; --#ISO8859_10=Thryomanes-iso10646-1; --#ISO8859_13=Thryomanes-iso10646-1; --#ISO8859_14=Thryomanes-iso10646-1; --#ISO8859_15=Thryomanes-iso10646-1; --#KOI8_R=Nimbus Mono L-iso10646-1; --#KOI8_U=Nimbus Mono L-iso10646-1; --#JISX0208_1978=Kochi Gothic-iso10646-1; --#JISX0208_1983=Kochi Gothic-iso10646-1; --#JISX0208_1990=Kochi Gothic-iso10646-1; --#KSX1001_1997=dotum-iso10646-1; --#BIG5=AR PL Mingti2L Big5-iso10646-1; --#GB2312_80=AR PL SungtiL GB-iso10646-1; --#GBK=AR PL SungtiL GB-iso10646-1; +--- etc/aafont.orig ++++ etc/aafont +@@ -1,37 +1,37 @@ + #DEFAULT=Kochi Gothic + +-#ISO8859_1=Courier 10 Pitch +-#ISO8859_2=Thryomanes +-#ISO8859_3=Thryomanes +-#ISO8859_4=Thryomanes +-#ISO8859_5=Thryomanes +-#ISO8859_7=Thryomanes +-#ISO8859_9=Thryomanes +-#ISO8859_10=Thryomanes +-#ISO8859_13=Thryomanes +-#ISO8859_14=Thryomanes +-#ISO8859_15=Thryomanes +-#KOI8_R=Nimbus Mono L +-#KOI8_U=Nimbus Mono L +-#JISX0208_1978=Kochi Gothic +-#JISX0208_1983=Kochi Gothic +-#JISX0208_1990=Kochi Gothic +-#KSX1001_1997=dotum +-#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; @@ -33,31 +41,19 @@ +ISO8859_10=Luxi Mono-iso10646-1; +ISO8859_13=Luxi Mono-iso10646-1; +ISO8859_15=Luxi Mono-iso10646-1; - --#ISO10646_UCS4_1=Courier 10 Pitch-iso10646-1; --#ISO10646_UCS4_1=Thryomanes-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; - --# Japanese speakers may want to enable the following setting. --#ISO10646_UCS4_1_BIWIDTH=Kochi 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; - --# Korean speakers may want to enable the following setting. --#ISO10646_UCS4_1_BIWIDTH=dotum-iso10646-1; -- --# Traditional Chinese speakers may want to enable the following setting. --#ISO10646_UCS4_1_BIWIDTH=AR PL Mingti2L Big5-iso10646-1; -- --# Simplified Chinese speakers may want to enable the following setting. --#ISO10646_UCS4_1_BIWIDTH=AR PL SungtiL GB-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; @@ -68,18 +64,28 @@ +#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 2002-02-23 07:07:07.000000000 +0100 -+++ etc/font 2009-11-30 19:38:48.880589000 +0100 -@@ -1,5 +1,5 @@ +--- etc/font.orig ++++ etc/font +@@ -1,6 +1,6 @@ + #DEFAULT = -kochi-mincho-medium-*--%d-*- #DEC_SPECIAL = 10,a10;12,6x12;14,7x14;16,8x16; -#ISO8859_1 = -kochi-mincho-medium-*--%d-*-iso8859-1;10,a10;12,6x12; +#ISO8859_1 = -misc-sazanami gothic-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; -@@ -7,3 +7,54 @@ +@@ -8,3 +8,54 @@ #JISX0208_1983 = 10,k10;12,k12;14,k14;16,kanji16; #JISX0208_1983_BOLD = 10,k10B; #TCVN5712 = 14,-*-.vntime-*--14-*-iso8859-1; @@ -136,8 +142,8 @@ +#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 2004-10-10 14:48:42.000000000 +0200 -+++ etc/key 2009-11-30 19:38:48.886587000 +0100 +--- etc/key.orig ++++ etc/key @@ -12,3 +12,7 @@ # Control+F6="proto:font_size=12;encoding=utf8" # Control+F7="proto:input_method=iiimf:ja" @@ -148,8 +154,8 @@ +KP_Begin="\e[E" Index: etc/main =================================================================== ---- etc/main.orig 2003-03-08 13:19:27.000000000 +0100 -+++ etc/main 2009-11-30 19:38:48.891587000 +0100 +--- etc/main.orig ++++ etc/main @@ -1 +1,25 @@ -scrollbar_view_name = sample +use_login_shell=false @@ -176,44 +182,73 @@ +sb_bg_color=gray +geometry=80x25 +mod_meta_mode=esc -+conf_menu_path_2=/usr/X11R6/bin/mlterm-zoom ++conf_menu_path_2=/usr/bin/mlterm-zoom Index: etc/termcap =================================================================== ---- etc/termcap.orig 2002-09-06 17:25:19.000000000 +0200 -+++ etc/termcap 2009-11-30 19:38:48.896587000 +0100 +--- etc/termcap.orig ++++ etc/termcap @@ -1,5 +1,7 @@ mlterm:\ kD=\E[3~:kb=^? +kterm:\ + kD=\E[3~:kb=^? xterm|rxvt:\ - kD=^?:kb=^H:ut + kD=^?:kb=^H:kh=\E[H:@7=\E[F:ut *:\ +Index: etc/xim +=================================================================== +--- etc/xim.orig ++++ etc/xim +@@ -1,6 +1,13 @@ +-Ami=ko_KR.eucKR + kinput2=ja_JP.eucJP +-xcin=zh_TW.Big5 +-xcin-zh_CN.GB2312=zh_CN.GB2312 + skkinput=ja_JP.eucJP ++SCIM=zh_CN.UTF-8 ++nicolatter=ja_JP.eucJP ++jmode=ja_JP.eucJP ++htt=ja_JP.eucJP ++Ami=ko_KR.eucKR ++xcin-zh_TW=zh_TW.Big5 ++xcin-zh_CN=zh_CN.GB2312 ++local=en_GB.UTF-8 # for compose or dead-keys ++uim=ja_JP.UTF-8 ++ + Index: etc/vaafont =================================================================== ---- etc/vaafont.orig 2003-10-01 08:09:45.000000000 +0200 -+++ etc/vaafont 2009-11-30 19:38:48.901587000 +0100 -@@ -1,35 +1,33 @@ --#ISO8859_1=Courier 10 Pitch-iso10646-1; --#ISO8859_2=Thryomanes-iso10646-1; --#ISO8859_3=Thryomanes-iso10646-1; --#ISO8859_4=Thryomanes-iso10646-1; --#ISO8859_5=Thryomanes-iso10646-1; --#ISO8859_7=Thryomanes-iso10646-1; --#ISO8859_9=Thryomanes-iso10646-1; --#ISO8859_10=Thryomanes-iso10646-1; --#ISO8859_13=Thryomanes-iso10646-1; --#ISO8859_14=Thryomanes-iso10646-1; --#ISO8859_15=Thryomanes-iso10646-1; --#KOI8_R=Nimbus Mono L-iso10646-1; --#KOI8_U=Nimbus Mono L-iso10646-1; --#JISX0208_1978=Kochi Gothic-iso10646-1; --#JISX0208_1983=Kochi Gothic-iso10646-1; --#JISX0208_1990=Kochi Gothic-iso10646-1; --#KSX1001_1997=dotum-iso10646-1; --#BIG5=AR PL Mingti2L Big5-iso10646-1; --#GB2312_80=AR PL SungtiL GB-iso10646-1; --#GBK=AR PL SungtiL GB-iso10646-1; +--- etc/vaafont.orig ++++ etc/vaafont +@@ -1,37 +1,37 @@ + #DEFAULT=Kochi Gothic + +-#ISO8859_1=Courier 10 Pitch +-#ISO8859_2=Thryomanes +-#ISO8859_3=Thryomanes +-#ISO8859_4=Thryomanes +-#ISO8859_5=Thryomanes +-#ISO8859_7=Thryomanes +-#ISO8859_9=Thryomanes +-#ISO8859_10=Thryomanes +-#ISO8859_13=Thryomanes +-#ISO8859_14=Thryomanes +-#ISO8859_15=Thryomanes +-#KOI8_R=Nimbus Mono L +-#KOI8_U=Nimbus Mono L +-#JISX0208_1978=Kochi Gothic +-#JISX0208_1983=Kochi Gothic +-#JISX0208_1990=Kochi Gothic +-#KSX1001_1997=dotum +-#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 Sans--iso10646-1; +ISO8859_1=Luxi Sans-iso10646-1; +ISO8859_2=Luxi Sans-iso10646-1; @@ -223,31 +258,20 @@ +ISO8859_10=Luxi Sans-iso10646-1; +ISO8859_13=Luxi Sans-iso10646-1; +ISO8859_15=Luxi Sans-iso10646-1; - --#ISO10646_UCS4_1=Courier 10 Pitch-iso10646-1; --#ISO10646_UCS4_1=Thryomanes-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; - --# Japanese speakers may want to enable the following setting. --#ISO10646_UCS4_1_BIWIDTH=Kochi 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; - --# Korean speakers may want to enable the following setting. --#ISO10646_UCS4_1_BIWIDTH=dotum-iso10646-1; ++ +KSC5601_1987=Baekmuk unigulir-iso10646-1; +KSX1001_1997=Baekmuk unigulir-iso10646-1; - --# Traditional Chinese speakers may want to enable the following setting. --#ISO10646_UCS4_1_BIWIDTH=AR PL Mingti2L Big5-iso10646-1; -- --# Simplified Chinese speakers may want to enable the following setting. --#ISO10646_UCS4_1_BIWIDTH=AR PL SungtiL GB-iso10646-1; ++ +ISO10646_UCS2_1 = Luxi Sans-iso10646-1; +ISO10646_UCS2_1_BIWIDTH = Sazanami Gothic-iso10646-1; +#ISO10646_UCS2_1_BIWIDTH = Bitstream Cyberbit-iso10646-1; @@ -258,24 +282,12 @@ +#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; -Index: etc/xim -=================================================================== ---- etc/xim.orig 2004-09-19 15:24:49.000000000 +0200 -+++ etc/xim 2009-11-30 19:38:48.905589000 +0100 -@@ -1,6 +1,13 @@ --Ami=ko_KR.eucKR - kinput2=ja_JP.eucJP --xcin=zh_TW.Big5 --xcin-zh_CN.GB2312=zh_CN.GB2312 - skkinput=ja_JP.eucJP -+SCIM=zh_CN.UTF-8 -+nicolatter=ja_JP.eucJP -+jmode=ja_JP.eucJP -+htt=ja_JP.eucJP -+Ami=ko_KR.eucKR -+xcin-zh_TW=zh_TW.Big5 -+xcin-zh_CN=zh_CN.GB2312 -+local=en_GB.UTF-8 # for compose or dead-keys -+uim=ja_JP.UTF-8 -+ +-# 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 ++++++ kiklib-configure.diff ++++++ --- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:54.000000000 +0100 +++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:54.000000000 +0100 @@ -1,26 +1,18 @@ Index: kiklib/configure.in =================================================================== ---- kiklib/configure.in.orig 2006-10-20 11:04:01.000000000 +0200 -+++ kiklib/configure.in 2009-11-30 19:38:49.631587000 +0100 +--- kiklib/configure.in.orig ++++ kiklib/configure.in @@ -1,4 +1,4 @@ -AC_INIT() +AC_INIT(configure.in) AC_CONFIG_HEADER(src/kik_config.h) AC_CONFIG_AUX_DIR(script) -@@ -10,6 +10,7 @@ AC_PROG_CC +@@ -13,6 +13,7 @@ AC_PROG_CC # if --with-libtool is specified, cpp isn't detected. AC_PROG_CPP AC_PROG_INSTALL +AC_HEADER_STDC - # - # --- libtool --- -@@ -31,7 +32,6 @@ AC_SUBST(LIBTOOL) - # --- Checks for header files --- - # - # NOTE: if --with-libtool is specified, stdc header isn't detected. --AC_HEADER_STDC - AC_CHECK_HEADERS(langinfo.h dlfcn.h dl.h stropts.h sys/stropts.h stdint.h) - - # + #detect glibc + AC_TRY_COMPILE([#include <features.h>], ++++++ mlterm-2.9.4.tar.bz2 -> mlterm-3.0.1.tar.bz2 ++++++ ++++ 1589042 lines of diff (skipped) ++++++ mlterm-configure.patch ++++++ --- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:56.000000000 +0100 +++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:56.000000000 +0100 @@ -4,13 +4,22 @@ Index: configure.in =================================================================== ---- configure.in.orig 2009-11-30 19:38:51.008420000 +0100 -+++ configure.in 2009-11-30 19:38:51.474420000 +0100 -@@ -607,7 +607,6 @@ AC_SUBST(OUTPUT_FILES) - AC_SUBST(PLATFORM_LIB_LDFLAGS) +--- configure.in.orig ++++ configure.in +@@ -697,7 +697,6 @@ if test "$optimize_redrawing" = "yes" ; + fi # gettext --AM_INIT_AUTOMAKE(mlterm,2.9.4) +-AM_INIT_AUTOMAKE(mlterm,3.0.1) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION(0.12) +@@ -747,7 +746,7 @@ if test "${SUBDIRS}" != "" ; then + AC_CONFIG_SUBDIRS(${SUBDIRS}) + fi + +-MAKE_DIRS="mlterm xwindow man etc ${MAKE_DIRS}" ++MAKE_DIRS="${MAKE_DIRS} mlterm xwindow man etc" + OUTPUT_FILES="Makefile mlterm/Makefile xwindow/Makefile man/Makefile etc/Makefile ${OUTPUT_FILES}" + + AC_SUBST(MAKE_DIRS) ++++++ mlterm-fribidi-link-fix.diff ++++++ --- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:56.000000000 +0100 +++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:56.000000000 +0100 @@ -4,20 +4,22 @@ Index: xwindow/Makefile.in =================================================================== ---- xwindow/Makefile.in.orig 2005-01-13 18:19:37.000000000 +0100 -+++ xwindow/Makefile.in 2009-11-30 19:38:51.951329000 +0100 -@@ -42,10 +42,10 @@ CFLAGS=$(CFLAGS_LOCAL) @AA_CFLAGS@ @KIK_ - -DLIBEXECDIR=\"$(LIBEXECDIR)\" -DDATADIR=\"$(DATADIR)\"\ +--- xwindow/Makefile.in.orig ++++ xwindow/Makefile.in +@@ -49,13 +49,11 @@ CFLAGS = $(CFLAGS_LOCAL) @AA_CFLAGS@ @KI + -DLIBEXECDIR=\"$(LIBEXECDIR)\" -DXDATADIR=\"$(XDATADIR)\"\ -I$(top_srcdir)/mlterm -I${top_builddir}/xwindow -I/usr/local/include --LIBS=$(LIBS_LOCAL) @IND_LIBS@ @FRIBIDI_LIBS@ @IMAGELIB_LIBS@ @AA_LIBS@ \ +-LIBS1 = $(LIBS_LOCAL) $(LMLTERM) $(LMKF) $(LKIK) \ +- -L/usr/local/lib -R/usr/local/lib @FRIBIDI_LIBS@ ++LIBS1 = $(LIBS_LOCAL) $(LMLTERM) $(LMKF) $(LKIK) + + LIBS2 = @IND_LIBS@ @IMAGELIB_LIBS@ @AA_LIBS@ \ - @DL_LIBS_IM@ @DL_LIBS_SB@ \ -- @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ $(LMLTERM) $(LMKF) $(LKIK) \ -- -L/usr/local/lib -R/usr/local/lib -+LIBS=$(LIBS_LOCAL) $(LMLTERM) $(LMKF) $(LKIK) \ -+ @IND_LIBS@ @IMAGELIB_LIBS@ @AA_LIBS@ \ -+ @DL_LIBS_IM@ @DL_LIBS_SB@ @FRIBIDI_LIBS@ \ +- @X_LIBS@ -lX11 @X_EXTRA_LIBS@ +-# @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ ++ @DL_LIBS_IM@ @DL_LIBS_SB@ @FRIBIDI_LIBS@\ + @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ - PROG = mlterm - INSTALL_OPT = @INSTALL_OPT@ + LIBS2_win32 = -mwindows -limm32 @SUBSYSTEM@ + ++++++ mlterm-gettext-version.patch ++++++ --- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:56.000000000 +0100 +++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:56.000000000 +0100 @@ -1,10 +1,10 @@ Index: configure.in =================================================================== ---- configure.in.orig 2009-11-30 19:38:49.867505000 +0100 -+++ configure.in 2009-11-30 19:38:50.349505000 +0100 -@@ -608,6 +608,7 @@ AC_SUBST(PLATFORM_LIB_LDFLAGS) +--- configure.in.orig ++++ configure.in +@@ -698,6 +698,7 @@ fi # gettext - AM_INIT_AUTOMAKE(mlterm,2.9.4) + AM_INIT_AUTOMAKE(mlterm,3.0.1) AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_VERSION(0.12) ++++++ mlterm-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:56.000000000 +0100 +++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:56.000000000 +0100 @@ -1,12 +1,12 @@ Index: configure.in =================================================================== ---- configure.in.orig 2009-11-30 19:38:50.549505000 +0100 -+++ configure.in 2009-11-30 19:38:51.008420000 +0100 -@@ -47,6 +47,7 @@ AC_CHECK_LIB(socket,connect,SOCK_LIBS=-l +--- configure.in.orig ++++ configure.in +@@ -51,6 +51,7 @@ AC_CHECK_LIB(socket,connect,SOCK_LIBS=-l AC_SUBST(SOCK_LIBS) AC_PATH_XTRA +PKG_PROG_PKG_CONFIG - # Li18nux Xlib-I18N defines X_HAVE_UTF8_STRING but has no Xutf8LookupString. - ldflags="$LDFLAGS" cflags="$CFLAGS" + AC_ARG_WITH(gui, + [ --with-gui@<:@=ARG@:>@ gui library(xlib|win32)], ++++++ norootforbuild.patch ++++++ --- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:56.000000000 +0100 +++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:56.000000000 +0100 @@ -1,8 +1,8 @@ Index: configure.in =================================================================== ---- configure.in.orig 2009-11-30 19:38:50.349505000 +0100 -+++ configure.in 2009-11-30 19:38:50.549505000 +0100 -@@ -208,7 +208,7 @@ if test "$utmp" = "yes" ; then +--- configure.in.orig ++++ configure.in +@@ -313,7 +313,7 @@ if test "$utmp" = "yes" ; then UTMP_CFLAGS="-DUSE_UTMP" has_utmp=`grep utmp /etc/group 2>/dev/null` if test "$has_utmp" ; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org