Hello community, here is the log from the commit of package mlterm for openSUSE:Factory checked in at Wed Jun 1 10:46:40 CEST 2011.
-------- --- mlterm/mlterm.changes 2010-11-11 15:55:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/mlterm/mlterm.changes 2011-05-31 16:32:15.000000000 +0200 @@ -1,0 +2,19 @@ +Tue May 31 14:28:39 UTC 2011 - [email protected] + +- updated to version 3.0.3: + * palette settings are reflected in vte_terminal_set_colors() + * "--initstr" option is prohibited in "mlclient" configuration + protocol. + * x_color_cache_256_t.is_loaded is cleared + in unloading 256 colors in x_color_cache_unload() instead of + x_color_cache_t.is_loaded. + * etc. see ChangeLog + * removed some patches with hope that they are not needed: + - kiklib-configure.patch + - po.patch + - gettext-version.patch + - norootforbuild.patch + - pkconfig.patch + - fribidi-link-fix.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kiklib-configure.diff mlterm-3.0.1.tar.bz2 mlterm-fribidi-link-fix.diff mlterm-gettext-version.patch mlterm-pkgconfig.patch mlterm-po.patch norootforbuild.patch New: ---- mlterm-3.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mlterm.spec ++++++ --- /var/tmp/diff_new_pack.KA3rG0/_old 2011-06-01 10:45:04.000000000 +0200 +++ /var/tmp/diff_new_pack.KA3rG0/_new 2011-06-01 10:45:04.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package mlterm (Version 3.0.1) +# spec file for package mlterm # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ Group: System/X11/Terminals AutoReqProv: on Provides: locale(xorg-x11:ja;ko;zh;ar;he) -Version: 3.0.1 +Version: 3.0.3 Release: 1 Url: http://mlterm.sourceforge.net/ # Source0: http://prdownloads.sourceforge.net/mlterm/mlterm-2.7.0.tar.bz2 @@ -42,15 +42,9 @@ Source10: %name.desktop Source11: %name.png Patch0: etc.patch -Patch1: kiklib-configure.diff -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 -Patch15: mlterm-configure.patch -Patch18: mlterm-fribidi-link-fix.diff +Patch1: cast-from-pointer-to-integer-of-different-size.patch +Patch2: mlconfig_fixdups.diff +Patch3: mlterm-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Multilingual Terminal Emulator for X @@ -143,28 +137,17 @@ %define pixmapdir /usr/share/pixmaps %prep -%setup0 -q +%setup -q %patch0 %patch1 -%patch5 -b .po -%patch6 -b .gettext-version -%patch7 -b .norootforbuild -%patch8 -#%patch9 -p1 -%patch11 -%patch15 -%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 -rm -rf doc/{en,ja}/CVS -find -name configure -exec chmod 755 {} \; -find . -type f | xargs chmod u+w +%patch2 -p1 +%patch3 +rm -rf doc/{en,ja}/*win32 %build -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 --enable-static=no \ + --prefix=/usr \ --libexecdir=%{_libdir}/mlterm \ --sysconfdir=/etc/X11 \ --enable-utmp \ @@ -174,26 +157,14 @@ --enable-m17nlib \ --with-tools=mlclient,mlconfig,mlterm-menu,mlcc,mlterm-zoom \ --with-scrollbars=sample,extra \ -%if %suse_version > 900 - --with-libltdl \ -%endif --enable-scim make %{?jobs:-j %jobs} -# make -C tool/w3mmlconfig \ -# prefix=/usr \ -# LIB_DIR=%{_libdir}/w3mmlconfig \ -# PERL=/usr/bin/perl %install make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{pixmapdir} install -m 644 doc/icon/mlterm*xpm $RPM_BUILD_ROOT%{pixmapdir} install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{pixmapdir} -# make -C tool/w3mmlconfig install \ -# prefix=/usr \ -# LIB_DIR=%{_libdir}/w3mmlconfig \ -# PERL=/usr/bin/perl \ -# DESTDIR=$RPM_BUILD_ROOT install -m 644 contrib/tool/mlterm-menu/menu $RPM_BUILD_ROOT/etc/X11/mlterm/ mv $RPM_BUILD_ROOT/usr/%{_lib}/mlterm/mlterm-zoom \ $RPM_BUILD_ROOT/usr/bin/mlterm-zoom @@ -203,9 +174,6 @@ # 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 %find_lang mlconfig %suse_update_desktop_file -i %name TerminalEmulator @@ -224,8 +192,6 @@ /usr/bin/mlclientx /usr/bin/mlcc /usr/bin/mlterm-zoom -# %{_bindir}/* -# %{_libdir}/w3mmlconfig/ %{_libdir}/libkik.* %{_libdir}/libmkf.* %dir %{_libdir}/mlterm/ @@ -236,6 +202,7 @@ %{_libdir}/mlterm/libnext.so %{_libdir}/mlterm/libsample.so %{_libdir}/mlterm/libsample2.so +%{_libdir}/mlterm/mlimgloader %dir %{_libdir}/mkf/ %{_libdir}/mkf/*.so %{_libdir}/mlterm/mlconfig @@ -244,7 +211,6 @@ %config /etc/X11/mlterm/* %{_mandir}/man?/* %{pixmapdir}/* -#/usr/share/terminfo/m/mlterm %files -n mlterm-scim %defattr(-, root, root) ++++++ etc.patch ++++++ --- /var/tmp/diff_new_pack.KA3rG0/_old 2011-06-01 10:45:04.000000000 +0200 +++ /var/tmp/diff_new_pack.KA3rG0/_new 2011-06-01 10:45:04.000000000 +0200 @@ -192,7 +192,7 @@ kD=\E[3~:kb=^? +kterm:\ + kD=\E[3~:kb=^? - xterm|rxvt:\ + xterm|xterm-256color|rxvt|rxvt-unicode:\ kD=^?:kb=^H:kh=\E[H:@7=\E[F:ut *:\ Index: etc/xim ++++++ mlconfig_fixdups.diff ++++++ --- /var/tmp/diff_new_pack.KA3rG0/_old 2011-06-01 10:45:04.000000000 +0200 +++ /var/tmp/diff_new_pack.KA3rG0/_new 2011-06-01 10:45:04.000000000 +0200 @@ -36,12 +36,12 @@ } - - kik_dl_close(handle); -+ ++#if 0 + if( num_of_info >= MAX_IM_INFO){ + /* shouldn't happen */ + /* i.e. MAX_IM_INFO should be large enough */ + break; -+ } ++#endif } } return 0; ++++++ mlterm-3.0.1.tar.bz2 -> mlterm-3.0.3.tar.bz2 ++++++ ++++ 94283 lines of diff (skipped) ++++++ mlterm-configure.patch ++++++ --- /var/tmp/diff_new_pack.KA3rG0/_old 2011-06-01 10:45:05.000000000 +0200 +++ /var/tmp/diff_new_pack.KA3rG0/_new 2011-06-01 10:45:05.000000000 +0200 @@ -1,25 +1,13 @@ ---- - configure.in | 1 - - 1 file changed, 1 deletion(-) - -Index: configure.in +Index: configure =================================================================== ---- configure.in.orig -+++ configure.in -@@ -697,7 +697,6 @@ if test "$optimize_redrawing" = "yes" ; - fi - - # gettext --AM_INIT_AUTOMAKE(mlterm,3.0.1) - AM_GNU_GETTEXT([external]) - AM_GNU_GETTEXT_VERSION(0.12) +--- configure.orig ++++ configure +@@ -24694,7 +24694,7 @@ subdirs="$subdirs ${SUBDIRS}" -@@ -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) + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
