commit ibus-pinyin.2277 for openSUSE:13.1:Update

Hello community, here is the log from the commit of package ibus-pinyin.2277 for openSUSE:13.1:Update checked in at 2013-12-04 20:59:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/ibus-pinyin.2277 (Old) and /work/SRC/openSUSE:13.1:Update/.ibus-pinyin.2277.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ibus-pinyin.2277" Changes: -------- New Changes file: --- /dev/null 2013-11-25 01:44:08.036031256 +0100 +++ /work/SRC/openSUSE:13.1:Update/.ibus-pinyin.2277.new/ibus-pinyin.changes 2013-12-04 20:59:07.000000000 +0100 @@ -0,0 +1,117 @@ +------------------------------------------------------------------- +Thu Nov 21 08:32:02 CET 2013 - tiwai@suse.de + +- ibus-pinyin-support-set-content-type-method.patch: + Fix visible password entry in GNOME lock screen (CVE-2013-4509, + bnc#847718); taken from Fedora package + +------------------------------------------------------------------- +Wed Oct 30 00:00:37 CST 2013 - hillwood@linuxfans.org + +- add python-xdg as Requires + +------------------------------------------------------------------- +Fri Jul 12 12:06:14 CST 2013 - hillwood@linuxfans.org + +- enable lua support + +------------------------------------------------------------------- +Thu Dec 20 23:35:11 CST 2012 - hillwood@linuxfans.org + +- update to 1.5.0 + * Add setup tag. + * Quote $@ in autogen.sh + * Fixes pinyin.xml + Change the keyboard layout from us to default + Update the symbols same as the icons + +------------------------------------------------------------------- +Thu Sep 6 00:02:17 CST 2012 - hillwood@linuxfans.org + +- update to 1.4.99.20120808 + Integrates pyzy + Fix make dist & rpm errors. + +------------------------------------------------------------------- +Tue Jul 24 21:20:21 CST 2012 - hillwood@linuxfans.org + +- add a .desktop file for ibus-setup-pinyin from upstream + +------------------------------------------------------------------- +Wed Jul 4 21:31:27 CST 2012 - hillwood@linuxfans.org + +- add a requires package, opencc is needed by ibus-pinyin + +------------------------------------------------------------------- +Mon Jul 1 09:44:31 CST 2012 - hillwood@linuxfans.org + +- add a .desktop file + +------------------------------------------------------------------- +Fri Jun 1 23:09:14 CST 2012 - hillwood@linuxfans.org + +- enable opencc support +- fix build in Factory + +------------------------------------------------------------------- +Tue Mar 20 22:24:17 CST 2012 - hillwood@linuxfans.org + +- Update to 1.4.0 +- Fix FSF-address warnings in RPMLINT report + +------------------------------------------------------------------- +Wed Oct 12 12:38:49 CEST 2011 - tiwai@suse.de + +- Fix build with ibus-1.4 (bnc#723591) + +------------------------------------------------------------------- +Fri Jul 22 16:59:16 CEST 2011 - tiwai@suse.de + +- Add locale-specific provides tag (bnc#707712) + +------------------------------------------------------------------- +Tue Jun 14 04:33:57 UTC 2011 - swyear@gmail.com + +- Update to 1.3.11; + including fixes for new ibus + +------------------------------------------------------------------- +Mon Jul 12 08:54:56 UTC 2010 - mxwu@novell.com + +- Upgrade to 1.3.8: + * Fix config problem + * Fix punct editor problem + * Add Ctrl + Shift + F to switch between Simplified Chinese and Traditional Chinese. + * Reset Pinyin properties when enable input method. + * Add ZhuYin (Bopomofo) input method setup UI + * Add Several ZhuYin keyboard mappings (Standard GinYieh Eten IBM). + * Add Chinese ZhuYin input method, contributed by BYVoid more information + * Add punct input mode. Press '`' could switch punct input mode. + * Fix crash in pinyin parser. + +------------------------------------------------------------------- +Wed May 12 09:12:22 UTC 2010 - mxwu@novell.com + +- Upgrade to 1.3.5 - + * Fix double pinyin parse problem + * Remove dependence library sigc++ + * Fix half full punct problem + * Clear preedit text, when user presses Shift to switch En/Ch mode + * Support auto correct: v=>u, ve=>ue, van=>uan, vn=>un, ven=>un, vang=>uang + * Refine pinyin parser to split pinyin more accuracy. + * Fix build problems in BSD + * Support user custom phrases phrases.txt + * Do not prefetch data to save several seconds during start + * Optimize database query method for better performance + * Several bug fixing + +------------------------------------------------------------------- +Wed Mar 24 14:21:10 CET 2010 - tiwai@suse.de + +- fix file list + +------------------------------------------------------------------- +Thu Jan 28 07:39:45 UTC 2010 - mxwu@novell.com + +- Initial import + New: ---- ibus-pinyin-1.5.0.tar.gz ibus-pinyin-support-set-content-type-method.patch ibus-pinyin.changes ibus-pinyin.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-pinyin.spec ++++++ # # spec file for package ibus-pinyin # # Copyright (c) 2013 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: ibus-pinyin Version: 1.5.0 Release: 0 Summary: The PinYin engine for IBus platform License: GPL-2.0+ Group: System/I18n/Chinese Provides: locale(ibus:zh) Url: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz # PATCH-FIX-FEDORA ibus-pinyin-support-set-content-type-method.patch bnc#847718 Patch1: ibus-pinyin-support-set-content-type-method.patch BuildRequires: boost-devel BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: ibus-devel >= 1.4.99 BuildRequires: intltool BuildRequires: libuuid-devel BuildRequires: lua51-devel BuildRequires: python >= 2.5 BuildRequires: pyzy-devel >= 1.0 BuildRequires: sqlite3 BuildRequires: sqlite3-devel BuildRequires: update-desktop-files Requires: ibus >= 1.4.99 Requires: opencc Requires: python-xdg Requires: pyzy-db-android Requires: pyzy-db-open-phrase %description PinYin engine for IBus platform. It provides a Chinese PinYin input method. %description -l zh_CN IBus 输入平台的拼音输入法支持引擎，本软件包为 IBus 提供中文拼音输入支持。 %prep %setup -q %patch1 -p1 %build %configure --disable-static \ --libexecdir=%{_prefix}/%{_lib}/ibus # make -C po update-gmo make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install %find_lang %{name} %suse_update_desktop_file ibus-setup-pinyin Utility DesktopUtility System %suse_update_desktop_file ibus-setup-bopomofo Utility DesktopUtility System %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_datadir}/ibus-pinyin %{_datadir}/applications/ibus-*.desktop %dir %{_datadir}/ibus %dir %{_datadir}/ibus/component %{_datadir}/ibus/component/* %dir %{_libdir}/ibus %{_libdir}/ibus/ibus-engine-pinyin %{_libdir}/ibus/ibus-setup-pinyin %changelog ++++++ ibus-pinyin-support-set-content-type-method.patch ++++++

From f1accaa9a18bd4a1c7234b40e16ad9889c25a461 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Wed, 6 Nov 2013 13:16:14 +0800 Subject: [PATCH] support setContentType method

--- src/PYBopomofoEngine.cc | 22 ++++++++++++++++++++++ src/PYBopomofoEngine.h | 7 +++++++ src/PYEngine.cc | 21 +++++++++++++++++++++ src/PYEngine.h | 3 +++ src/PYPinyinEngine.cc | 22 ++++++++++++++++++++++ src/PYPinyinEngine.h | 7 +++++++ 6 files changed, 82 insertions(+) diff --git a/src/PYBopomofoEngine.cc b/src/PYBopomofoEngine.cc index 581c4cf..4dfbc2c 100644 --- a/src/PYBopomofoEngine.cc +++ b/src/PYBopomofoEngine.cc @@ -42,6 +42,10 @@ BopomofoEngine::BopomofoEngine (IBusEngine *engine) { 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 BopomofoEditor (m_props, BopomofoConfig::instance ())); m_editors[MODE_PUNCT].reset (new PunctEditor (m_props, BopomofoConfig::instance ())); @@ -72,6 +76,11 @@ BopomofoEngine::processKeyEvent (guint keyval, guint keycode, guint modifiers) { gboolean retval = FALSE; +#if IBUS_CHECK_VERSION (1, 5, 4) + if (IBUS_INPUT_PURPOSE_PASSWORD == m_input_purpose) + return retval; +#endif + /* check Shift + Release hotkey, * and then ignore other Release key event */ if (modifiers & IBUS_RELEASE_MASK) { @@ -139,9 +148,22 @@ BopomofoEngine::focusIn (void) void BopomofoEngine::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 +BopomofoEngine::setContentType (guint purpose, guint hints) +{ + m_input_purpose = (IBusInputPurpose) purpose; +} +#endif + void BopomofoEngine::reset (void) { diff --git a/src/PYBopomofoEngine.h b/src/PYBopomofoEngine.h index ce41ce8..14b6780 100644 --- a/src/PYBopomofoEngine.h +++ b/src/PYBopomofoEngine.h @@ -36,6 +36,9 @@ public: 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); @@ -59,6 +62,10 @@ private: private: PinyinProperties m_props; +#if IBUS_CHECK_VERSION (1, 5, 4) + IBusInputPurpose m_input_purpose; +#endif + guint m_prev_pressed_key; enum { diff --git a/src/PYEngine.cc b/src/PYEngine.cc index d9fa04a..da047b2 100644 --- a/src/PYEngine.cc +++ b/src/PYEngine.cc @@ -67,6 +67,12 @@ static gboolean ibus_pinyin_engine_process_key_event 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 @@ ibus_pinyin_engine_class_init (IBusPinyinEngineClass *klass) 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; @@ -182,6 +192,17 @@ ibus_pinyin_engine_process_key_event (IBusEngine *engine, 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 --git a/src/PYEngine.h b/src/PYEngine.h index b74e6e8..22e1b79 100644 --- a/src/PYEngine.h +++ b/src/PYEngine.h @@ -44,6 +44,9 @@ public: 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 --git a/src/PYPinyinEngine.cc b/src/PYPinyinEngine.cc index 7aea261..570187b 100644 --- a/src/PYPinyinEngine.cc +++ b/src/PYPinyinEngine.cc @@ -45,6 +45,10 @@ PinyinEngine::PinyinEngine (IBusEngine *engine) { gint i; +#if IBUS_CHECK_VERSION (1, 5, 4) + m_input_purpose = IBUS_INPUT_PURPOSE_FREE_FORM; +#endif + if (PinyinConfig::instance ().doublePinyin ()) m_editors[MODE_INIT].reset (new DoublePinyinEditor (m_props, PinyinConfig::instance ())); else @@ -82,6 +86,11 @@ PinyinEngine::processKeyEvent (guint keyval, guint keycode, guint modifiers) { gboolean retval = FALSE; +#if IBUS_CHECK_VERSION (1, 5, 4) + if (IBUS_INPUT_PURPOSE_PASSWORD == m_input_purpose) + return retval; +#endif + /* check Shift + Release hotkey, * and then ignore other Release key event */ if (modifiers & IBUS_RELEASE_MASK) { @@ -195,9 +204,22 @@ PinyinEngine::focusIn (void) void PinyinEngine::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 +PinyinEngine::setContentType (guint purpose, guint hints) +{ + m_input_purpose = (IBusInputPurpose) purpose; +} +#endif + void PinyinEngine::reset (void) { diff --git a/src/PYPinyinEngine.h b/src/PYPinyinEngine.h index fcce73e..de50269 100644 --- a/src/PYPinyinEngine.h +++ b/src/PYPinyinEngine.h @@ -35,6 +35,9 @@ public: 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); @@ -58,6 +61,10 @@ private: private: PinyinProperties m_props; +#if IBUS_CHECK_VERSION (1, 5, 4) + IBusInputPurpose m_input_purpose; +#endif + guint m_prev_pressed_key; enum { -- 1.8.3.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org