Hello community, here is the log from the commit of package ibus-libpinyin for openSUSE:Factory checked in at 2014-02-28 16:24:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-libpinyin (Old) and /work/SRC/openSUSE:Factory/.ibus-libpinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-libpinyin" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-libpinyin/ibus-libpinyin.changes 2013-10-31 16:03:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ibus-libpinyin.new/ibus-libpinyin.changes 2014-02-28 16:24:58.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 28 11:06:16 CST 2014 - hillw...@linuxfans.org + +- update to 1.6.92 + * minor bug fixes + +------------------------------------------------------------------- Old: ---- ibus-libpinyin-1.6.91.tar.gz New: ---- ibus-libpinyin-1.6.92.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-libpinyin.spec ++++++ --- /var/tmp/diff_new_pack.zBUFLl/_old 2014-02-28 16:24:59.000000000 +0100 +++ /var/tmp/diff_new_pack.zBUFLl/_new 2014-02-28 16:24:59.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package ibus-libpinyin # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2013 Hillwood Yang (hillw...@linuxfans.org) +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 Hillwood Yang (hillw...@linuxfans.org) # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: ibus-libpinyin -Version: 1.6.91 +Version: 1.6.92 Release: 0 Summary: Intelligent Pinyin engine based on libpinyin for IBus License: GPL-2.0+ ++++++ ibus-libpinyin-1.6.91.tar.gz -> ibus-libpinyin-1.6.92.tar.gz ++++++ ++++ 3638 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/ChangeLog new/ibus-libpinyin-1.6.92/ChangeLog --- old/ibus-libpinyin-1.6.91/ChangeLog 2013-04-30 05:36:34.000000000 +0200 +++ new/ibus-libpinyin-1.6.92/ChangeLog 2013-10-24 07:48:02.000000000 +0200 @@ -1,3 +1,58 @@ +commit 737fdaa6a118729e20378245dbb8af0c142fa187 +Author: Peng Wu <alexep...@gmail.com> +Date: 2013-10-23 16:42:41 +0800 + + bump version 1.6.92 + +M configure.ac + +commit e1ecc3bf821c88d9edab471e70b556e029072c32 +Author: Peng Wu <alexep...@gmail.com> +Date: 2013-10-23 16:35:41 +0800 + + update ibus requires + +M configure.ac + +commit 69f50424ba5be49c4b31543df7bd7970361d4753 +Author: Peng Wu <alexep...@gmail.com> +Date: 2013-10-10 15:48:29 +0800 + + support setContentType method + +M src/PYEngine.cc +M src/PYEngine.h +M src/PYPBopomofoEngine.cc +M src/PYPBopomofoEngine.h +M src/PYPPinyinEngine.cc +M src/PYPPinyinEngine.h + +commit cf8ab7d8e76ed70c182c7588cfe1ebbce8e5174b +Author: Peng Wu <alexep...@gmail.com> +Date: 2013-10-08 10:45:35 +0800 + + remove pyxdg depends + +M setup/main2.py + +commit c42d0a870697e95301deabe0bcb770a68649c81d +Author: Peng Wu <alexep...@gmail.com> +Date: 2013-07-31 10:53:14 +0800 + + fixes lua 5.2 compile + +M lua/lua-plugin-init.c +M lua/lua-plugin.c + +commit 9ef836117508d9c0c938f57a5ffa5ffca7eb2e7b +Author: Peng Wu <alexep...@gmail.com> +Date: 2013-07-26 13:03:44 +0800 + + Update the symbol of the ibus indicator + +M src/PYPinyinProperties.cc +M src/PYProperty.h + commit 7f0ae3f5d0bbaf1b5fe2ab8b0a22892a2d9a1167 Author: Peng Wu <alexep...@gmail.com> Date: 2013-04-24 15:45:32 +0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/configure.ac new/ibus-libpinyin-1.6.92/configure.ac --- old/ibus-libpinyin-1.6.91/configure.ac 2013-04-24 08:23:32.000000000 +0200 +++ new/ibus-libpinyin-1.6.92/configure.ac 2013-10-23 10:36:30.000000000 +0200 @@ -22,7 +22,7 @@ m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [6]) -m4_define([ibus_micro_version], [91]) +m4_define([ibus_micro_version], [92]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) @@ -54,7 +54,7 @@ # check ibus PKG_CHECK_MODULES(IBUS, [ - ibus-1.0 >= 1.3.99 + ibus-1.0 >= 1.4.0 ]) # check sqlite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/lua/lua-plugin-init.c new/ibus-libpinyin-1.6.92/lua/lua-plugin-init.c --- old/ibus-libpinyin-1.6.91/lua/lua-plugin-init.c 2012-10-08 07:54:53.000000000 +0200 +++ new/ibus-libpinyin-1.6.92/lua/lua-plugin-init.c 2013-07-31 05:01:09.000000000 +0200 @@ -26,6 +26,14 @@ #include "lua-plugin.h" +#if LUA_VERSION_NUM >= 502 +/* ugly hack for lua 5.2 */ + +#define lua_objlen lua_rawlen + +#endif + + static const luaL_Reg lualibs[] = { {"", luaopen_base}, {LUA_TABLIBNAME, luaopen_table}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/lua/lua-plugin.c new/ibus-libpinyin-1.6.92/lua/lua-plugin.c --- old/ibus-libpinyin-1.6.91/lua/lua-plugin.c 2012-06-28 09:18:49.000000000 +0200 +++ new/ibus-libpinyin-1.6.92/lua/lua-plugin.c 2013-07-31 04:52:59.000000000 +0200 @@ -25,6 +25,15 @@ #include "lua-plugin.h" +#if LUA_VERSION_NUM >= 502 +/* ugly hack for lua 5.2 */ + +#define lua_open luaL_newstate + +#define lua_objlen lua_rawlen + +#endif + #define IBUS_ENGINE_PLUGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), IBUS_TYPE_ENGINE_PLUGIN, IBusEnginePluginPrivate)) struct _IBusEnginePluginPrivate{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/setup/config.py new/ibus-libpinyin-1.6.92/setup/config.py --- old/ibus-libpinyin-1.6.91/setup/config.py 2013-04-30 05:35:22.000000000 +0200 +++ new/ibus-libpinyin-1.6.92/setup/config.py 2013-10-24 07:47:39.000000000 +0200 @@ -21,7 +21,7 @@ def get_version(): - return "1.6.91" + return "1.6.92" def get_data_dir(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/setup/main2.py new/ibus-libpinyin-1.6.92/setup/main2.py --- old/ibus-libpinyin-1.6.91/setup/main2.py 2013-04-21 06:25:59.000000000 +0200 +++ new/ibus-libpinyin-1.6.92/setup/main2.py 2013-10-08 04:40:34.000000000 +0200 @@ -30,7 +30,6 @@ from gi.repository import GLib from gi.repository import Gtk from gi.repository import IBus -from xdg import BaseDirectory import config from dicttreeview import DictionaryTreeView @@ -373,7 +372,7 @@ def __edit_lua_cb(self, widget): import shutil - path = os.path.join(BaseDirectory.xdg_config_home, "ibus", "libpinyin") + path = os.path.join(GLib.get_user_config_dir(), "ibus", "libpinyin") os.path.exists(path) or os.makedirs(path) path = os.path.join(path, "user.lua") if not os.path.exists(path): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/src/PYEngine.cc new/ibus-libpinyin-1.6.92/src/PYEngine.cc --- old/ibus-libpinyin-1.6.91/src/PYEngine.cc 2012-06-28 09:18:49.000000000 +0200 +++ new/ibus-libpinyin-1.6.92/src/PYEngine.cc 2013-10-10 09:39:08.000000000 +0200 @@ -67,6 +67,12 @@ guint modifiers); static void ibus_pinyin_engine_focus_in (IBusEngine *engine); static void ibus_pinyin_engine_focus_out (IBusEngine *engine); +#if IBUS_CHECK_VERSION (1, 5, 4) +static void ibus_pinyin_engine_set_content_type + (IBusEngine *engine, + guint purpose, + guint hints); +#endif static void ibus_pinyin_engine_reset (IBusEngine *engine); static void ibus_pinyin_engine_enable (IBusEngine *engine); static void ibus_pinyin_engine_disable (IBusEngine *engine); @@ -123,6 +129,10 @@ engine_class->focus_in = ibus_pinyin_engine_focus_in; engine_class->focus_out = ibus_pinyin_engine_focus_out; +#if IBUS_CHECK_VERSION (1, 5, 4) + engine_class->set_content_type = ibus_pinyin_engine_set_content_type; +#endif + engine_class->page_up = ibus_pinyin_engine_page_up; engine_class->page_down = ibus_pinyin_engine_page_down; @@ -189,6 +199,17 @@ return pinyin->engine->processKeyEvent (keyval, keycode, modifiers); } +#if IBUS_CHECK_VERSION (1, 5, 4) +static void +ibus_pinyin_engine_set_content_type (IBusEngine *engine, + guint purpose, + guint hints) +{ + IBusPinyinEngine *pinyin = (IBusPinyinEngine *) engine; + return pinyin->engine->setContentType (purpose, hints); +} +#endif + static void ibus_pinyin_engine_property_activate (IBusEngine *engine, const gchar *prop_name, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/src/PYEngine.h new/ibus-libpinyin-1.6.92/src/PYEngine.h --- old/ibus-libpinyin-1.6.91/src/PYEngine.h 2012-06-28 09:18:49.000000000 +0200 +++ new/ibus-libpinyin-1.6.92/src/PYEngine.h 2013-10-10 09:39:30.000000000 +0200 @@ -44,6 +44,9 @@ virtual gboolean processKeyEvent (guint keyval, guint keycode, guint modifiers) = 0; virtual void focusIn (void) = 0; virtual void focusOut (void) = 0; +#if IBUS_CHECK_VERSION (1, 5, 4) + virtual void setContentType (guint purpose, guint hints) = 0; +#endif virtual void reset (void) = 0; virtual void enable (void) = 0; virtual void disable (void) = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/src/PYPBopomofoEngine.cc new/ibus-libpinyin-1.6.92/src/PYPBopomofoEngine.cc --- old/ibus-libpinyin-1.6.91/src/PYPBopomofoEngine.cc 2013-02-20 03:27:20.000000000 +0100 +++ new/ibus-libpinyin-1.6.92/src/PYPBopomofoEngine.cc 2013-10-10 09:46:58.000000000 +0200 @@ -40,6 +40,10 @@ { gint i; +#if IBUS_CHECK_VERSION (1, 5, 4) + m_input_purpose = IBUS_INPUT_PURPOSE_FREE_FORM; +#endif + /* create editors */ m_editors[MODE_INIT].reset (new LibPinyinBopomofoEditor (m_props, LibPinyinBopomofoConfig::instance ())); m_editors[MODE_PUNCT].reset (new PunctEditor (m_props, LibPinyinBopomofoConfig::instance ())); @@ -64,6 +68,11 @@ { gboolean retval = FALSE; +#if IBUS_CHECK_VERSION (1, 5, 4) + if (IBUS_INPUT_PURPOSE_PASSWORD == m_input_purpose) + return retval; +#endif + /* check Shift or Ctrl + Release hotkey, * and then ignore other Release key event */ if (modifiers & IBUS_RELEASE_MASK) { @@ -140,9 +149,22 @@ void LibPinyinBopomofoEngine::focusOut (void) { + +#if IBUS_CHECK_VERSION (1, 5, 4) + m_input_purpose = IBUS_INPUT_PURPOSE_FREE_FORM; +#endif + reset (); } +#if IBUS_CHECK_VERSION(1, 5, 4) +void +LibPinyinBopomofoEngine::setContentType (guint purpose, guint hints) +{ + m_input_purpose = (IBusInputPurpose) purpose; +} +#endif + void LibPinyinBopomofoEngine::reset (void) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/src/PYPBopomofoEngine.h new/ibus-libpinyin-1.6.92/src/PYPBopomofoEngine.h --- old/ibus-libpinyin-1.6.91/src/PYPBopomofoEngine.h 2012-06-28 09:18:50.000000000 +0200 +++ new/ibus-libpinyin-1.6.92/src/PYPBopomofoEngine.h 2013-10-10 09:41:33.000000000 +0200 @@ -37,6 +37,9 @@ gboolean processKeyEvent (guint keyval, guint keycode, guint modifiers); void focusIn (void); void focusOut (void); +#if IBUS_CHECK_VERSION (1, 5, 4) + void setContentType (guint purpose, guint hints); +#endif void reset (void); void enable (void); void disable (void); @@ -60,6 +63,10 @@ private: PinyinProperties m_props; +#if IBUS_CHECK_VERSION (1, 5, 4) + IBusInputPurpose m_input_purpose; +#endif + guint m_prev_pressed_key; enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/src/PYPPinyinEngine.cc new/ibus-libpinyin-1.6.92/src/PYPPinyinEngine.cc --- old/ibus-libpinyin-1.6.91/src/PYPPinyinEngine.cc 2013-02-20 03:27:20.000000000 +0100 +++ new/ibus-libpinyin-1.6.92/src/PYPPinyinEngine.cc 2013-10-10 09:46:12.000000000 +0200 @@ -50,6 +50,10 @@ { gint i; +#if IBUS_CHECK_VERSION (1, 5, 4) + m_input_purpose = IBUS_INPUT_PURPOSE_FREE_FORM; +#endif + m_double_pinyin = LibPinyinPinyinConfig::instance ().doublePinyin (); if (m_double_pinyin) @@ -100,6 +104,11 @@ { gboolean retval = FALSE; +#if IBUS_CHECK_VERSION (1, 5, 4) + if (IBUS_INPUT_PURPOSE_PASSWORD == m_input_purpose) + return retval; +#endif + /* check Shift or Ctrl + Release hotkey, * and then ignore other Release key event */ if (modifiers & IBUS_RELEASE_MASK) { @@ -222,9 +231,22 @@ void LibPinyinPinyinEngine::focusOut (void) { + +#if IBUS_CHECK_VERSION (1, 5, 4) + m_input_purpose = IBUS_INPUT_PURPOSE_FREE_FORM; +#endif + reset (); } +#if IBUS_CHECK_VERSION(1, 5, 4) +void +LibPinyinPinyinEngine::setContentType (guint purpose, guint hints) +{ + m_input_purpose = (IBusInputPurpose) purpose; +} +#endif + void LibPinyinPinyinEngine::reset (void) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/src/PYPPinyinEngine.h new/ibus-libpinyin-1.6.92/src/PYPPinyinEngine.h --- old/ibus-libpinyin-1.6.91/src/PYPPinyinEngine.h 2012-07-27 06:04:43.000000000 +0200 +++ new/ibus-libpinyin-1.6.92/src/PYPPinyinEngine.h 2013-10-10 08:24:14.000000000 +0200 @@ -35,6 +35,9 @@ gboolean processKeyEvent (guint keyval, guint keycode, guint modifiers); void focusIn (void); void focusOut (void); +#if IBUS_CHECK_VERSION (1, 5, 4) + void setContentType (guint purpose, guint hints); +#endif void reset (void); void enable (void); void disable (void); @@ -56,6 +59,10 @@ private: PinyinProperties m_props; +#if IBUS_CHECK_VERSION (1, 5, 4) + IBusInputPurpose m_input_purpose; +#endif + guint m_prev_pressed_key; enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/src/PYPinyinProperties.cc new/ibus-libpinyin-1.6.92/src/PYPinyinProperties.cc --- old/ibus-libpinyin-1.6.91/src/PYPinyinProperties.cc 2013-02-20 03:27:20.000000000 +0100 +++ new/ibus-libpinyin-1.6.92/src/PYPinyinProperties.cc 2013-07-26 06:59:26.000000000 +0200 @@ -26,6 +26,7 @@ namespace PY { #define _(text) (dgettext (GETTEXT_PACKAGE, text)) +#define N_(text) text PinyinProperties::PinyinProperties (Config & config) : m_config (config), @@ -33,7 +34,7 @@ m_mode_full (m_config.initFull ()), m_mode_full_punct (m_config.initFullPunct ()), m_mode_simp (m_config.initSimpChinese ()), - m_prop_chinese ("mode.chinese", + m_prop_chinese ("InputMode", PROP_TYPE_NORMAL, StaticText (m_mode_chinese ? _("Chinese") : @@ -83,6 +84,11 @@ "ibus-setup", StaticText (_("Preferences"))) { + if (m_mode_chinese) + m_prop_chinese.setSymbol(N_("中")); + else + m_prop_chinese.setSymbol(N_("英")); + m_props.append (m_prop_chinese); m_props.append (m_prop_full); m_props.append (m_prop_full_punct); @@ -98,6 +104,12 @@ m_prop_chinese.setLabel (m_mode_chinese ? _("Chinese") : _("English")); + + if (m_mode_chinese) + m_prop_chinese.setSymbol(N_("中")); + else + m_prop_chinese.setSymbol(N_("英")); + m_prop_chinese.setIcon (m_mode_chinese ? PKGDATADIR"/icons/chinese.svg" : PKGDATADIR"/icons/english.svg"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/src/PYProperty.h new/ibus-libpinyin-1.6.92/src/PYProperty.h --- old/ibus-libpinyin-1.6.91/src/PYProperty.h 2013-02-20 03:27:20.000000000 +0100 +++ new/ibus-libpinyin-1.6.92/src/PYProperty.h 2013-07-26 06:52:50.000000000 +0200 @@ -55,6 +55,16 @@ ibus_property_set_icon (get<IBusProperty> (), icon); } + void setSymbol (IBusText *text) + { + ibus_property_set_symbol (get<IBusProperty> (), text); + } + + void setSymbol (const gchar *text) + { + setSymbol (Text (text)); + } + void setSensitive (gboolean sensitive) { ibus_property_set_sensitive (get<IBusProperty> (), sensitive); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/src/libpinyin.xml.in new/ibus-libpinyin-1.6.92/src/libpinyin.xml.in --- old/ibus-libpinyin-1.6.91/src/libpinyin.xml.in 2013-04-30 05:35:22.000000000 +0200 +++ new/ibus-libpinyin-1.6.92/src/libpinyin.xml.in 2013-10-24 07:47:39.000000000 +0200 @@ -4,7 +4,7 @@ <name>org.freedesktop.IBus.Libpinyin</name> <description>Libpinyin Component</description> <exec>${libexecdir}/ibus-engine-libpinyin --ibus</exec> - <version>1.6.91</version> + <version>1.6.92</version> <author>Peng Wu <alexep...@gmail.com></author> <license>GPL</license> <homepage>https://github.com/libpinyin/ibus-libpinyin</homepage> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-libpinyin-1.6.91/test-driver new/ibus-libpinyin-1.6.92/test-driver --- old/ibus-libpinyin-1.6.91/test-driver 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-libpinyin-1.6.92/test-driver 2013-07-26 06:57:45.000000000 +0200 @@ -0,0 +1,127 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2012-06-27.10; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-autom...@gnu.org> or send patches to +# <automake-patc...@gnu.org>. + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <<END +Usage: + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH + [--expect-failure={yes|no}] [--color-tests={yes|no}] + [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT +The '--test-name', '--log-file' and '--trs-file' options are mandatory. +END +} + +# TODO: better error handling in option parsing (in particular, ensure +# TODO: $log_file, $trs_file and $test_name are defined). +test_name= # Used for reporting. +log_file= # Where to save the output of the test script. +trs_file= # Where to save the metadata of the test run. +expect_failure=no +color_tests=no +enable_hard_errors=yes +while test $# -gt 0; do + case $1 in + --help) print_usage; exit $?;; + --version) echo "test-driver $scriptversion"; exit $?;; + --test-name) test_name=$2; shift;; + --log-file) log_file=$2; shift;; + --trs-file) trs_file=$2; shift;; + --color-tests) color_tests=$2; shift;; + --expect-failure) expect_failure=$2; shift;; + --enable-hard-errors) enable_hard_errors=$2; shift;; + --) shift; break;; + -*) usage_error "invalid option: '$1'";; + esac + shift +done + +if test $color_tests = yes; then + # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. + red='[0;31m' # Red. + grn='[0;32m' # Green. + lgn='[1;32m' # Light green. + blu='[1;34m' # Blue. + mgn='[0;35m' # Magenta. + std='[m' # No color. +else + red= grn= lgn= blu= mgn= std= +fi + +do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' +trap "st=129; $do_exit" 1 +trap "st=130; $do_exit" 2 +trap "st=141; $do_exit" 13 +trap "st=143; $do_exit" 15 + +# Test script is run here. +"$@" >$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org