Hello community, here is the log from the commit of package ibus-chewing for openSUSE:Factory checked in at 2012-03-22 12:32:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-chewing (Old) and /work/SRC/openSUSE:Factory/.ibus-chewing.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-chewing", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-chewing/ibus-chewing.changes 2011-10-25 16:01:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-chewing.new/ibus-chewing.changes 2012-03-22 12:32:55.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 20 12:32:10 UTC 2012 - swy...@gmail.com + +- Fix ibus-chewing build fail for ibus-1.4.1 + https://bugs.gentoo.org/show_bug.cgi?id=407695 + +------------------------------------------------------------------- New: ---- ibus-chewing-for-1.4.1.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-chewing.spec ++++++ --- /var/tmp/diff_new_pack.nQJtBK/_old 2012-03-22 12:33:00.000000000 +0100 +++ /var/tmp/diff_new_pack.nQJtBK/_new 2012-03-22 12:33:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ibus-chewing # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -28,6 +28,7 @@ Url: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz Source1: cmake-fedora-modules.tar.bz2 +Patch1: ibus-chewing-for-1.4.1.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gettext-devel @@ -53,6 +54,7 @@ %prep %setup -q -n %{name}-%{version}-Source +%patch1 -p1 %build tar -jxvf %{SOURCE1} ++++++ ibus-chewing-for-1.4.1.diff ++++++ diff -uNrbB ibus-chewing-1.3.10-Source.bak/src/IBusChewingEngine.gob ibus-chewing-1.3.10-Source/src/IBusChewingEngine.gob --- ibus-chewing-1.3.10-Source.bak/src/IBusChewingEngine.gob 2012-03-10 11:29:01.000000000 +0800 +++ ibus-chewing-1.3.10-Source/src/IBusChewingEngine.gob 2012-03-10 22:47:08.000000000 +0800 @@ -1041,12 +1041,21 @@ /* Toggle Full <-> Half */ chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context)); }else if (strcmp(prop_name,"chewing_settings_prop")==0){ - if (self->settings_prop->state==PROP_STATE_UNCHECKED){ +#if IBUS_CHECK_VERSION(1, 4, 0) + if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED) +#else + if (self->settings_prop->state==PROP_STATE_UNCHECKED) +#endif + { if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){ self_save_config_all(self); } gtk_widget_hide(self->setting_dialog); +#if IBUS_CHECK_VERSION(1, 4, 0) + ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED); +#else self->settings_prop->state=PROP_STATE_UNCHECKED; +#endif } }else{ G_DEBUG_MSG(3,"[I3] property_activate(-, %s, %u) not recognized",prop_name, prop_state); diff -uNrbB ibus-chewing-1.3.10-Source.bak/src/IBusChewingEngine-input-events.c ibus-chewing-1.3.10-Source/src/IBusChewingEngine-input-events.c --- ibus-chewing-1.3.10-Source.bak/src/IBusChewingEngine-input-events.c 2012-03-10 11:29:01.000000000 +0800 +++ ibus-chewing-1.3.10-Source/src/IBusChewingEngine-input-events.c 2012-03-10 23:16:41.000000000 +0800 @@ -291,12 +291,21 @@ /* Toggle Full <-> Half */ chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context)); }else if (strcmp(prop_name,"chewing_settings_prop")==0){ - if (self->settings_prop->state==PROP_STATE_UNCHECKED){ +#if IBUS_CHECK_VERSION(1, 4, 0) + if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED) +#else + if (self->settings_prop->state==PROP_STATE_UNCHECKED) +#endif + { if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){ self_save_config_all(self); } gtk_widget_hide(self->setting_dialog); +#if IBUS_CHECK_VERSION(1, 4, 0) + ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED); +#else self->settings_prop->state=PROP_STATE_UNCHECKED; +#endif } }else{ G_DEBUG_MSG(3,"[I3] property_activate(-, %s, %u) not recognized",prop_name, prop_state); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
