Hello community, here is the log from the commit of package ibus-libpinyin for openSUSE:Factory checked in at 2016-09-11 00:54:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-08-13 18:30:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-libpinyin.new/ibus-libpinyin.changes 2016-09-11 00:54:49.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 9 06:49:04 UTC 2016 - hillwood@opensuse.org + +- Update to 1.8.0 + * use libpinyin 1.6.0 + +------------------------------------------------------------------- Old: ---- ibus-libpinyin-1.7.92.tar.gz New: ---- ibus-libpinyin-1.8.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-libpinyin.spec ++++++ --- /var/tmp/diff_new_pack.fTVTUv/_old 2016-09-11 00:54:51.000000000 +0200 +++ /var/tmp/diff_new_pack.fTVTUv/_new 2016-09-11 00:54:51.000000000 +0200 @@ -18,7 +18,7 @@ Name: ibus-libpinyin -Version: 1.7.92 +Version: 1.8.0 Release: 0 Summary: Intelligent Pinyin engine based on libpinyin for IBus License: GPL-2.0+ @@ -41,7 +41,7 @@ BuildRequires: sqlite3-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(gdk-3.0) -BuildRequires: pkgconfig(libpinyin) >= 1.5.92 +BuildRequires: pkgconfig(libpinyin) >= 1.6.0 Requires: python-xdg Provides: locale(ibus:zh_CN;zh_SG) %{ibus_requires} ++++++ ibus-libpinyin-1.7.92.tar.gz -> ibus-libpinyin-1.8.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.92/ChangeLog new/ibus-libpinyin-1.8.0/ChangeLog --- old/ibus-libpinyin-1.7.92/ChangeLog 2016-08-02 07:42:29.000000000 +0200 +++ new/ibus-libpinyin-1.8.0/ChangeLog 2016-09-07 06:53:23.000000000 +0200 @@ -1,3 +1,8 @@ +version 1.7.91 +* use libpinyin 1.5.91 +* allow to remove the user phrase +* enable lua script extension in double pinyin + version 1.7.0 * python 3.x migration * use opencc 1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.92/configure.ac new/ibus-libpinyin-1.8.0/configure.ac --- old/ibus-libpinyin-1.7.92/configure.ac 2016-08-02 07:42:29.000000000 +0200 +++ new/ibus-libpinyin-1.8.0/configure.ac 2016-09-07 06:53:23.000000000 +0200 @@ -21,8 +21,8 @@ # if not 1, append datestamp to the version number. m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) -m4_define([ibus_minor_version], [7]) -m4_define([ibus_micro_version], [92]) +m4_define([ibus_minor_version], [8]) +m4_define([ibus_micro_version], [0]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) @@ -68,7 +68,7 @@ fi PKG_CHECK_MODULES(LIBPINYIN, [ - libpinyin >= 1.5.92 + libpinyin >= 1.6.0 ], [enable_libpinyin=yes]) LIBPINYIN_DATADIR=`$PKG_CONFIG --variable=pkgdatadir libpinyin` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.92/setup/main2.py new/ibus-libpinyin-1.8.0/setup/main2.py --- old/ibus-libpinyin-1.7.92/setup/main2.py 2016-08-02 07:42:29.000000000 +0200 +++ new/ibus-libpinyin-1.8.0/setup/main2.py 2016-09-07 06:53:23.000000000 +0200 @@ -29,7 +29,17 @@ import os import sys +from gi import require_version as gi_require_version +gi_require_version('GLib', '2.0') +gi_require_version('Gtk', '3.0') +gi_require_version('IBus', '1.0') + from gi.repository import GLib + +# set_prgname before importing other modules to show the name in warning +# messages when import modules are failed. E.g. Gtk. +GLib.set_prgname('ibus-setup-libpinyin') + from gi.repository import Gtk from gi.repository import IBus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.92/src/PYPBopomofoEditor.cc new/ibus-libpinyin-1.8.0/src/PYPBopomofoEditor.cc --- old/ibus-libpinyin-1.7.92/src/PYPBopomofoEditor.cc 2016-08-02 07:42:29.000000000 +0200 +++ new/ibus-libpinyin-1.8.0/src/PYPBopomofoEditor.cc 2016-09-07 06:53:23.000000000 +0200 @@ -329,7 +329,7 @@ size_t offset = 0; guint cursor = getPinyinCursor (); - g_assert (pinyin_get_character_offset(m_instance, sentence, cursor, &offset)); + pinyin_get_character_offset(m_instance, sentence, cursor, &offset); Editor::updatePreeditText (preedit_text, offset, TRUE); if (sentence) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.92/src/PYPFullPinyinEditor.cc new/ibus-libpinyin-1.8.0/src/PYPFullPinyinEditor.cc --- old/ibus-libpinyin-1.7.92/src/PYPFullPinyinEditor.cc 2016-08-02 07:42:29.000000000 +0200 +++ new/ibus-libpinyin-1.8.0/src/PYPFullPinyinEditor.cc 2016-09-07 06:53:23.000000000 +0200 @@ -116,3 +116,21 @@ updatePreeditText (); updateAuxiliaryText (); } + +guint +FullPinyinEditor::getLookupCursor (void) +{ + guint lookup_cursor = getPinyinCursor (); + + /* as pinyin_get_pinyin_offset can't handle the last "'" characters, + strip the string to work around it here. */ + String stripped = m_text; + size_t pos = stripped.find_last_not_of ("'") + 1; + if (pos < stripped.length ()) + stripped.erase (pos); + + /* show candidates when pinyin cursor is at end. */ + if (lookup_cursor == stripped.length ()) + lookup_cursor = 0; + return lookup_cursor; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.92/src/PYPFullPinyinEditor.h new/ibus-libpinyin-1.8.0/src/PYPFullPinyinEditor.h --- old/ibus-libpinyin-1.7.92/src/PYPFullPinyinEditor.h 2016-08-02 07:42:29.000000000 +0200 +++ new/ibus-libpinyin-1.8.0/src/PYPFullPinyinEditor.h 2016-09-07 06:53:23.000000000 +0200 @@ -44,6 +44,8 @@ virtual void updatePinyin (void); + virtual guint getLookupCursor (void); + }; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.92/src/PYPPhoneticEditor.cc new/ibus-libpinyin-1.8.0/src/PYPPhoneticEditor.cc --- old/ibus-libpinyin-1.7.92/src/PYPPhoneticEditor.cc 2016-08-02 07:42:29.000000000 +0200 +++ new/ibus-libpinyin-1.8.0/src/PYPPhoneticEditor.cc 2016-09-07 06:53:23.000000000 +0200 @@ -365,15 +365,8 @@ { guint lookup_cursor = getPinyinCursor (); - /* as pinyin_get_pinyin_offset can't handle the last "'" characters, - strip the string to work around it here. */ - String stripped = m_text; - size_t pos = stripped.find_last_not_of ("'") + 1; - if (pos < stripped.length ()) - stripped.erase (pos); - /* show candidates when pinyin cursor is at end. */ - if (lookup_cursor == stripped.length ()) + if (lookup_cursor == m_text.length ()) lookup_cursor = 0; return lookup_cursor; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.7.92/src/PYPPinyinEditor.cc new/ibus-libpinyin-1.8.0/src/PYPPinyinEditor.cc --- old/ibus-libpinyin-1.7.92/src/PYPPinyinEditor.cc 2016-08-02 07:42:29.000000000 +0200 +++ new/ibus-libpinyin-1.8.0/src/PYPPinyinEditor.cc 2016-09-07 06:53:23.000000000 +0200 @@ -266,7 +266,7 @@ size_t offset = 0; guint cursor = getPinyinCursor (); - g_assert (pinyin_get_character_offset(m_instance, sentence, cursor, &offset)); + pinyin_get_character_offset(m_instance, sentence, cursor, &offset); Editor::updatePreeditText (preedit_text, offset, TRUE); if (sentence)