From 99bb253bb2c6d439dd7103ccf0a0f91d01cc3a86 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Oct 12 2011 13:52:12 +0000 Subject: "Fixed 727018, 726335; Fixed Google issue 1245, 1274, 1281, 1303" --- diff --git a/.gitignore b/.gitignore index 6d57d05..b4742de 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ ibus-chewing-1.3.6.20100730-Source.tar.gz /ibus-chewing-1.3.8-Source.tar.gz /ibus-chewing-1.3.9-Source.tar.gz /ibus-chewing-1.3.9.2-Source.tar.gz +/ibus-chewing-1.3.10-Source.tar.gz diff --git a/ibus-chewing-696864-abrt-ibus-1.4.patch b/ibus-chewing-696864-abrt-ibus-1.4.patch deleted file mode 100644 index fc2be85..0000000 --- a/ibus-chewing-696864-abrt-ibus-1.4.patch +++ /dev/null @@ -1,84 +0,0 @@ -From ff138d7a18b7577e5f04f852bd3caf87cbc9e7cc Mon Sep 17 00:00:00 2001 -From: Ding-Yi Chen -Date: Thu, 20 Jan 2011 17:03:07 +1000 -Subject: [PATCH] Addressed comments of yusake - ---- - src/IBusChewingEngine-def.c | 30 ++++++++++++++++++++++-------- - 1 files changed, 22 insertions(+), 8 deletions(-) - -diff --git a/src/IBusChewingEngine-def.c b/src/IBusChewingEngine-def.c -index 90c0384..8c90766 100644 ---- a/src/IBusChewingEngine-def.c -+++ b/src/IBusChewingEngine-def.c -@@ -391,21 +391,29 @@ this option determines how these status be synchronized. Valid values:\n\ - void g_variant_to_g_value(GVariant *gVar, GValue *gValue){ - const GVariantType *gVType=g_variant_get_type(gVar); - if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_BOOLEAN)){ -+ g_value_init(gValue, G_TYPE_BOOLEAN); - g_value_set_boolean(gValue, g_variant_get_boolean(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT16)){ -+ g_value_init(gValue, G_TYPE_UINT); - g_value_set_uint(gValue, g_variant_get_uint16(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT32)){ -+ g_value_init(gValue, G_TYPE_UINT); - g_value_set_uint(gValue, g_variant_get_uint32(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT64)){ -+ g_value_init(gValue, G_TYPE_UINT64); - g_value_set_uint64(gValue, g_variant_get_uint64(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT16)){ -+ g_value_init(gValue, G_TYPE_INT); - g_value_set_int(gValue, g_variant_get_int16(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT32)){ -+ g_value_init(gValue, G_TYPE_INT); - g_value_set_int(gValue, g_variant_get_int32(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT64)){ -+ g_value_init(gValue, G_TYPE_INT); - g_value_set_int64(gValue, g_variant_get_int64(gVar)); - }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_STRING)){ -- g_value_set_int64(gValue, g_variant_get_string(gVar, NULL)); -+ g_value_init(gValue, G_TYPE_STRING); -+ g_value_set_string(gValue, g_variant_get_string(gVar, NULL)); - } - } - -@@ -419,8 +427,14 @@ GVariant *g_value_to_g_variant(GValue *gValue){ - case G_TYPE_UINT: - gVar=g_variant_new_uint32(g_value_get_uint(gValue)); - break; -+ case G_TYPE_UINT64: -+ gVar=g_variant_new_uint64(g_value_get_uint(gValue)); -+ break; - case G_TYPE_INT: -- gVar=g_variant_new_int32(g_value_get_int(gValue)); -+ gVar=g_variant_new_int32(g_value_get_uint(gValue)); -+ break; -+ case G_TYPE_INT64: -+ gVar=g_variant_new_int64(g_value_get_uint(gValue)); - break; - case G_TYPE_STRING: - gVar=g_variant_new_string(g_value_get_string(gValue)); -@@ -435,14 +449,14 @@ GVariant *g_value_to_g_variant(GValue *gValue){ - - static gboolean ibus_chewing_config_get_value(IBusConfig *config, const gchar *section, const gchar *key, GValue *gValue){ - #if IBUS_VERSION >= 10399 -- GVariant *gVar=g_variant_ref_sink(ibus_config_get_value(config, section, key)); -- if (gVar!=NULL){ -- g_variant_to_g_value(gVar, gValue); -- g_variant_unref(gVar); -- return TRUE; -- }else{ -+ GVariant *gVar=ibus_config_get_value(config, section, key); -+ if (gVar==NULL){ - return FALSE; - } -+ g_variant_ref_sink(gVar); -+ g_variant_to_g_value(gVar, gValue); -+ g_variant_unref(gVar); -+ return TRUE; - #else - return ibus_config_get_value(config, section, key, gValue); - #endif --- -1.7.4.4 - diff --git a/ibus-chewing.spec b/ibus-chewing.spec index ca43df0..11444fe 100644 --- a/ibus-chewing.spec +++ b/ibus-chewing.spec @@ -1,19 +1,26 @@ Name: ibus-chewing -Version: 1.3.9.2 -Release: 3%{?dist} +Version: 1.3.10 +Release: 1%{?dist} Summary: The Chewing engine for IBus input platform Summary(zh_TW): IBus新酷音輸入法 License: GPLv2+ Group: System Environment/Libraries URL: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz -Patch0: ibus-chewing-696864-abrt-ibus-1.4.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext-devel BuildRequires: gtk2-devel BuildRequires: ibus-devel >= 1.1 BuildRequires: cmake >= 2.4 +%if 0%{?fedora} >= 14 +BuildRequires: cmake-fedora >= 0.8.1 +%else +Source1: https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-0.8.1-modules-only.tar.gz +%endif + + # Make sure gob2 is patched against https://bugzilla.redhat.com/show_bug.cgi?id=519108 %if 0%{?fedora} == 11 BuildRequires: gob2 >= 2.0.15-5 @@ -48,17 +55,29 @@ IBus-chewing 是新酷音輸入法的IBus前端。 %prep %setup -q -n %{name}-%{version}-Source -%patch0 -p1 -b .abrt-ibus-1.4 + +# RHEL does not have cmake-fedora yet +%if 0%{?fedora} < 13 +tar xzvf %{SOURCE1} +%endif + %build # $RPM_OPT_FLAGS should be loaded from cmake macro. +%if 0%{?fedora} >= 15 +%cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DGNOME_SHELL=1 . +%else +%cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo . +%endif + %cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo . %__make VERBOSE=1 %{?_smp_mflags} %install +%__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT # We install document using %doc -(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-chewing-1.3.9.2 +(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-chewing-1.3.10 %__rm -rf RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING USER-GUIDE ) @@ -66,12 +85,15 @@ IBus-chewing 是新酷音輸入法的IBus前端。 %pre if [ "$1" -gt 1 ] ; then -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -[ -r %{_sysconfdir}/gconf/schemas/%{name}.schemas ] && -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + [ -r %{_sysconfdir}/gconf/schemas/%{name}.schemas ] && + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas\ + >/dev/null || : + # Upgrading 1.0.2.20090302-1.fc11 or older? -[ -r %{_sysconfdir}/gconf/schemas/%{name}.schema ] && -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schema >/dev/null || : + [ -r %{_sysconfdir}/gconf/schemas/%{name}.schema ] && + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schema\ + >/dev/null || : fi %post @@ -84,6 +106,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : fi +%clean +%__rm -rf $RPM_BUILD_ROOT + %files -f %{name}.lang %defattr(-,root,root,-) %doc RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING USER-GUIDE @@ -93,13 +118,25 @@ fi %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas %changelog -* Tue Apr 26 2011 Daiki Ueno - 1.3.9.2-3 -- Apply a patch to fix crash with ibus 1.4 -- Resolves: #696864 -- defining and cleaning buildroot is deprecated (petersen) - -* Wed Feb 09 2011 Fedora Release Engineering - 1.3.9.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild +* Wed Oct 12 2011 Ding-Yi Chen - 1.3.10-1 +- Fixed Bug 726335 (Google issue 1281)- [abrt] ibus-chewing-1.3.9.2-3.fc15: g_atomic_int_get: + Process /usr/libexec/ibus-engine-chewing was killed by signal 11 (SIGSEGV) using patch from Scott Tsai +- Fixed Bug 727018 - ibus compose file needs a symbol tag for gnome-shell +- Fixed characters duplication problem (Google issue 1245, GitHub ibus-chewing issue 2) +- Fixed KP-Enter not been able to commit preedit buffer. (Google issue 1303, GitHub ibus-chewing issue 4) +- Depends on cmake-fedora now. +- Fixed issue 1274, which is addressed by yusake's comments on d9009bf. +- Add compile flag for GNOME3. +- Add command line option: showFlags +- ibus-gnome special symbol +- Thanks Fred Chien's patch against that candidate window cannot be closed + with escape key since selected tone. +- Thanks Fourdollar's patch for Fix plain zhuyin with space as selection problem. +- Remove support for ibus-1.2 and prior. + +* Tue Feb 01 2011 Ding-Yi Chen - 1.3.5.20100714-3 +- Resolves: #627794 +- Add USER-GUIDE * Fri Nov 19 2010 Ding-Yi Chen - 1.3.9.2-1 - Fixed Bug 652909 @@ -117,7 +154,7 @@ fi - Input style of ibus-chewing is decommissioned under ibus >=1.3. Now the input style is determined solely on the setting of "Embed preedit in application window" in IBus. -- Resolves: #608991, #632043 +- Fixed: #608991, #632043 - Fixed Issue 1022: chewing commit some text in reset method (patched by Peng Huang). - Fixed Issue 1032: [ibus-chewing] Chewing not commit some single Chinese diff --git a/sources b/sources index 7c5c493..7dbce72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d177d67647944f5d1f9cca0654eaccb ibus-chewing-1.3.9.2-Source.tar.gz +2a447828ca9290dd6bdf2336b2889bb0 ibus-chewing-1.3.10-Source.tar.gz