Hello community, here is the log from the commit of package mlterm for openSUSE:Factory checked in at 2017-07-21 22:49:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mlterm (Old) and /work/SRC/openSUSE:Factory/.mlterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mlterm" Fri Jul 21 22:49:02 2017 rev:41 rq:511400 version:3.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/mlterm/mlterm.changes 2016-11-28 15:04:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mlterm.new/mlterm.changes 2017-07-21 22:49:07.591036654 +0200 @@ -1,0 +2,18 @@ +Tue Jul 18 14:48:11 UTC 2017 - [email protected] + +- Version update to 3.8.2 release: + * Support for wayland + * Support page of VT400 or later. (NP, PP, PPA, PPR, PPB, DECCRA and DECLRP) + * Support DECRQDE, DECSCUSR(Ps = 3,4,5,6), DECATC, DECRQM, DECRQMH, DECSCA, + DECERA, DECSEL and DECSED. + * Support SGR of DECRQSS. + * Bunch of bugfixes +- Add all the named dependencies to the package to make sure all the + features are properly enabled, configure script does not fail on + dependencies not found +- Remove libotf as now rendering is done via harfbuzz +- Disable fctix input method as it fails to compile upstream +- Install svg icons from the archive rather than our distributed png +- Add portability patch mlterm-portability.patch to make rpmlint happy + +------------------------------------------------------------------- Old: ---- mlterm-3.7.2.tar.gz mlterm.png New: ---- mlterm-3.8.2.tar.gz mlterm-portability.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mlterm.spec ++++++ --- /var/tmp/diff_new_pack.ju0NNs/_old 2017-07-21 22:49:10.390641735 +0200 +++ /var/tmp/diff_new_pack.ju0NNs/_new 2017-07-21 22:49:10.394641171 +0200 @@ -1,7 +1,7 @@ # # spec file for package mlterm # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,43 +17,40 @@ Name: mlterm -Version: 3.7.2 +Version: 3.8.2 Release: 0 Summary: Multilingual Terminal Emulator for X License: BSD-3-Clause Group: System/X11/Terminals Url: http://mlterm.sourceforge.net/ -# cvs -d :pserver:[email protected]:/cvsroot/mlterm login -# (hit Enter) -# cvs -d :pserver:[email protected]:/cvsroot/mlterm checkout mlterm -# cvs -z3 -d:ext:[email protected]:/cvsroot/mlterm co mlterm -# tar jcvf mlterm-2.7.0.tar.bz2 mlterm Source0: http://downloads.sourceforge.net/project/mlterm/01release/%{name}-%{version}/%{name}-%{version}.tar.gz Source10: %{name}.desktop -Source11: %{name}.png Patch0: etc.patch +# PATCH-FIX-UPSTREAM: portability issues reported by rpmlint +Patch1: mlterm-portability.patch +BuildRequires: canna-devel BuildRequires: coreutils -BuildRequires: fribidi-devel +BuildRequires: fwnn-devel BuildRequires: gcc-c++ -BuildRequires: gtk2-devel -BuildRequires: m17n-lib-devel -%if 0%{?suse_version} != 1315 +BuildRequires: pkgconfig BuildRequires: scim-devel BuildRequires: uim-devel -%endif BuildRequires: update-desktop-files -BuildRequires: wordcut-devel +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(fcitx) +BuildRequires: pkgconfig(fribidi) +BuildRequires: pkgconfig(gail) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(ibus-1.0) +BuildRequires: pkgconfig(libssh2) +BuildRequires: pkgconfig(m17n-core) +BuildRequires: pkgconfig(vte-2.91) +BuildRequires: pkgconfig(wordcut) Provides: locale(xorg-x11:ja;ko;zh;ar;he) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1130 -BuildRequires: utempter-devel -%else -BuildRequires: utempter -%endif -%if 0%{?suse_version} == 1315 -# for migration -Obsoletes: mlterm-scim -Obsoletes: mlterm-uim +%if 0%{?suse_version} >= 1330 +Requires: group(tty) %endif %description @@ -76,22 +73,38 @@ xims. Other features: - * scroll by wheel mouse - * antialias font (requires Xft and Xrender extensions) - * proportional font - * transparent background - * background image (requires Imlib) - * multiple pty windows - * scrollbar plug-in API (unstable) -%if 0%{?suse_version} != 1315 +%package canna +Summary: Canna plugin for mlterm +Group: System/X11/Terminals +Provides: locale(scim:ja;ko;ar;he) + +%description canna +A plugin to use the canna input methods directly from mlterm. + +%package ibus +Summary: Ibus plugin for mlterm +Group: System/X11/Terminals +Provides: locale(scim:ja;ko;ar;he) + +%description ibus +A plugin to use the ibus input methods directly from mlterm. + +%package wnn +Summary: Wnn plugin for mlterm +Group: System/X11/Terminals +Provides: locale(scim:ja;ko;ar;he) + +%description wnn +A plugin to use the wnn input methods directly from mlterm. + %package scim Summary: SCIM plugin for mlterm Group: System/X11/Terminals @@ -107,7 +120,6 @@ %description uim A plugin to use the uim input methods directly from mlterm. -%endif %package m17n Summary: A m17n plugin for mlterm @@ -117,57 +129,58 @@ %description m17n A plugin to use the m17n input methods directly from mlterm. -%define pixmapdir %{_datadir}/pixmaps - %prep %setup -q %patch0 +%patch1 -p1 rm -rf doc/{en,ja}/*win32 %build -export CFLAGS="%{optflags} -D_GNU_SOURCE -fno-strict-aliasing $(%{_bindir}/freetype-config --cflags) -DUSE_UTMP" -%configure --enable-static=no \ - --prefix=%{_prefix} \ +%configure \ + --disable-static \ --libexecdir=%{_libdir}/mlterm \ --sysconfdir=%{_sysconfdir}/X11 \ --disable-utmp \ --enable-anti-alias \ --enable-fribidi \ + --enable-ssh2 \ + --enable-vt52 \ + --enable-ind \ --enable-m17nlib \ -%if 0%{?suse_version} != 1315 + --enable-ibus \ + --disable-fcitx \ + --enable-wnn \ + --enable-canna \ --enable-scim \ --enable-uim \ -%endif - --with-tools=mlclient,mlconfig,mlterm-menu,mlcc,mlterm-zoom,mlimgloader \ - --with-scrollbars=sample,extra \ - --with-type-engines=xcore,xft - + --with-gtk=3.0 \ + --with-tools=mlclient,mlcc,mlfc,mlmenu,mlterm-zoom,mlimgloader,mlconfig \ + --with-scrollbars=sample,extra,pixmap_engine \ + --with-type-engines=xcore,cairo \ + --with-imagelib=gdk-pixbuf \ + --enable-optimize-redrawing make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} -mkdir -p %{buildroot}%{pixmapdir} -install -m 644 doc/icon/mlterm*xpm %{buildroot}%{pixmapdir} -install -m 644 %{SOURCE11} %{buildroot}%{pixmapdir} +%make_install +mkdir -p %{buildroot}%{_datadir}/pixmaps/ install -m 644 contrib/tool/mlterm-menu/menu %{buildroot}%{_sysconfdir}/X11/mlterm/ +install -D -m644 "contrib/icon/%{name}-icon.svg" \ + "%{buildroot}%{_datadir}/pixmaps/%{name}.svg" +install -D -m644 "contrib/icon/%{name}-icon-trans.svg" \ + "%{buildroot}%{_datadir}/pixmaps/mlclient.svg" + mv %{buildroot}%{_libdir}/mlterm/mlterm/mlterm-zoom \ %{buildroot}%{_bindir}/mlterm-zoom -# remove static libraries in plugin directory: -# (mlconfig duplicates buttons when the static libraries are still there!) -rm %{buildroot}%{_libdir}/mlterm/*.*a -# ditto for libkik and libmkf -rm %{buildroot}%{_libdir}/lib*.*a -rm %{buildroot}%{_libdir}/mkf/*.*a +find %{buildroot} -type f -name "*.la" -delete -print %find_lang mlconfig %suse_update_desktop_file -i %{name} TerminalEmulator %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files -f mlconfig.lang -%defattr(-, root, root) %doc LICENCE* README* doc/en doc/ja %attr(555,root,tty) %{_bindir}/mlterm %{_datadir}/applications/%{name}.desktop @@ -175,9 +188,12 @@ %{_bindir}/mlclientx %{_bindir}/mlcc %{_bindir}/mlterm-zoom -%{_libdir}/libkik.* -%{_libdir}/libmkf.* -%{_libdir}/libmlterm_core.so +%{_bindir}/mlfc +%{_libdir}/libpobl.* +%{_libdir}/libmlterm_coreotl.so +%{_libdir}/libmef.so* +%dir %{_libdir}/mef +%{_libdir}/mef/libmef_* %dir %{_libdir}/mlterm/ %dir %{_libdir}/mlterm/mlterm %{_libdir}/mlterm/libathena.so @@ -187,7 +203,6 @@ %{_libdir}/mlterm/libnext.so %{_libdir}/mlterm/libsample.so %{_libdir}/mlterm/libctl_bidi.so -%{_libdir}/mlterm/libtype_xft.so %{_libdir}/mlterm/libctl_iscii.so %{_libdir}/mlterm/libim-skk.so %{_libdir}/mlterm/libind_assamese.so @@ -203,28 +218,37 @@ %{_libdir}/mlterm/libind_tamil.so %{_libdir}/mlterm/libind_telugu.so %{_libdir}/mlterm/libotl.so +%{_libdir}/mlterm/libpixmap_engine.so +%{_libdir}/mlterm/libptyssh.so +%{_libdir}/mlterm/libtype_cairo.so %{_libdir}/mlterm/mlterm/mlimgloader -%dir %{_libdir}/mkf/ -%{_libdir}/mkf/*.so %{_libdir}/mlterm/mlterm/mlconfig -%{_libdir}/mlterm/mlterm/mlterm-menu +%{_libdir}/mlterm/mlterm/mlmenu %dir %{_sysconfdir}/X11/mlterm/ %config %{_sysconfdir}/X11/mlterm/* %{_mandir}/man?/* -%{pixmapdir}/* +%{_datadir}/pixmaps/* +%dir %{_datadir}/mlterm/ +%dir %{_datadir}/mlterm/scrollbars/ +%dir %{_datadir}/mlterm/scrollbars/sample3/ +%{_datadir}/mlterm/scrollbars/sample3/* + +%files canna +%{_libdir}/mlterm/libim-canna.so + +%files ibus +%{_libdir}/mlterm/libim-ibus.so + +%files wnn +%{_libdir}/mlterm/libim-wnn.so -%if 0%{?suse_version} != 1315 %files scim -%defattr(-, root, root) %{_libdir}/mlterm/libim-scim.so %files uim -%defattr(-, root, root) %{_libdir}/mlterm/libim-uim.so -%endif %files m17n -%defattr(-, root, root) %{_libdir}/mlterm/libim-m17nlib.so %changelog ++++++ mlterm-3.7.2.tar.gz -> mlterm-3.8.2.tar.gz ++++++ ++++ 1482964 lines of diff (skipped) ++++++ mlterm-portability.patch ++++++ Index: mlterm-3.8.2/inputmethod/canna/im_canna.c =================================================================== --- mlterm-3.8.2.orig/inputmethod/canna/im_canna.c +++ mlterm-3.8.2/inputmethod/canna/im_canna.c @@ -300,6 +300,7 @@ static int delete (ui_im_t *im) { static int switch_mode(ui_im_t *im) { im_canna_t *canna; + int default_width = 60; canna = (im_canna_t*)im; @@ -307,7 +308,7 @@ static int switch_mode(ui_im_t *im) { if ((canna->is_enabled = (!canna->is_enabled))) { preedit(canna, NULL, 0, 0, canna->key_status.mode); - jrKanjiControl(0, KC_SETWIDTH, 60); + jrKanjiControl(0, KC_SETWIDTH, &default_width); } else { preedit(canna, "", 0, 0, ""); } Index: mlterm-3.8.2/uitoolkit/libtype/ui_window_cairo.c =================================================================== --- mlterm-3.8.2.orig/uitoolkit/libtype/ui_window_cairo.c +++ mlterm-3.8.2/uitoolkit/libtype/ui_window_cairo.c @@ -54,12 +54,12 @@ static int show_text(cairo_t *cr, cairo_ #endif #if CAIRO_VERSION_ENCODE(1, 4, 0) <= CAIRO_VERSION - if (cairo_get_user_data(cr, 1) != xfont) + if (cairo_get_user_data(cr, (int *)1) != xfont) #endif { cairo_set_scaled_font(cr, xfont); #if CAIRO_VERSION_ENCODE(1, 4, 0) <= CAIRO_VERSION - cairo_set_user_data(cr, 1, xfont, NULL); + cairo_set_user_data(cr, (int *)1, xfont, NULL); #endif } @@ -69,13 +69,13 @@ static int show_text(cairo_t *cr, cairo_ * default one * (black == 0). */ - if ((u_long)cairo_get_user_data(cr, 2) != fg_color->pixel) + if ((u_long)cairo_get_user_data(cr, (int *)2) != fg_color->pixel) #endif { cairo_set_source_rgba(cr, (double)fg_color->red / 255.0, (double)fg_color->green / 255.0, (double)fg_color->blue / 255.0, (double)fg_color->alpha / 255.0); #if CAIRO_VERSION_ENCODE(1, 4, 0) <= CAIRO_VERSION - cairo_set_user_data(cr, 2, fg_color->pixel, NULL); + cairo_set_user_data(cr, (int *)2, (int *)fg_color->pixel, NULL); #endif }
