[ibus] Updated to 1.3.8
Takao Fujiwara
fujiwara at fedoraproject.org
Fri Oct 22 15:40:52 UTC 2010
commit 793508187e74d1b79ec461df66df69c8474ef8d9
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date: Sat Oct 23 00:39:25 2010 +0900
Updated to 1.3.8
.gitignore | 1 +
ibus-435880-surrounding-text.patch | 30 ++--
ibus-541492-xkb.patch | 45 ++--
ibus-621795-engineproxy-segv.patch | 27 ---
ibus-626652-leak.patch | 27 ---
ibus-xx-g-ir-compiler.patch | 414 ------------------------------------
ibus.spec | 46 ++---
sources | 2 +-
8 files changed, 53 insertions(+), 539 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e7fcc74..9ccf52a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
ibus-1.3.6.tar.gz
/ibus-1.3.7.tar.gz
+/ibus-1.3.8.tar.gz
diff --git a/ibus-435880-surrounding-text.patch b/ibus-435880-surrounding-text.patch
index 1b860f4..744f1a9 100644
--- a/ibus-435880-surrounding-text.patch
+++ b/ibus-435880-surrounding-text.patch
@@ -1,6 +1,6 @@
-From d4b10b2e9aec0e1fb0674bab70c439ccc91ea07b Mon Sep 17 00:00:00 2001
+From de91361ea502c63e54ceb23389b3c88b234f40a0 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno at unixuser.org>
-Date: Wed, 29 Sep 2010 13:40:58 +0900
+Date: Thu, 21 Oct 2010 18:48:51 +0900
Subject: [PATCH] Support surrounding-text retrieval.
This change adds a new API function ibus_engine_get_surrounding_text().
@@ -207,10 +207,10 @@ index b5ab201..1aa9f21 100644
ibus_message_set_sender (message, bus_connection_get_unique_name (connection));
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
-index c104f38..86350f5 100644
+index 0bb71b5..eaa4a54 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
-@@ -107,6 +107,12 @@ static void ibus_im_context_set_cursor_location
+@@ -113,6 +113,12 @@ static void ibus_im_context_set_cursor_location
static void ibus_im_context_set_use_preedit
(GtkIMContext *context,
gboolean use_preedit);
@@ -223,7 +223,7 @@ index c104f38..86350f5 100644
/* static methods*/
static void _create_input_context (IBusIMContext *context);
-@@ -125,15 +131,16 @@ static void _slave_preedit_start_cb (GtkIMContext *slave,
+@@ -131,15 +137,16 @@ static void _slave_preedit_start_cb (GtkIMContext *slave,
IBusIMContext *context);
static void _slave_preedit_end_cb (GtkIMContext *slave,
IBusIMContext *context);
@@ -242,7 +242,7 @@ index c104f38..86350f5 100644
-@@ -200,6 +207,16 @@ ibus_im_context_new (void)
+@@ -206,6 +213,16 @@ ibus_im_context_new (void)
return IBUS_IM_CONTEXT (obj);
}
@@ -259,7 +259,7 @@ index c104f38..86350f5 100644
static gint
_key_snooper_cb (GtkWidget *widget,
GdkEventKey *event,
-@@ -239,6 +256,8 @@ _key_snooper_cb (GtkWidget *widget,
+@@ -245,6 +262,8 @@ _key_snooper_cb (GtkWidget *widget,
_input_window = event->window;
}
@@ -268,7 +268,7 @@ index c104f38..86350f5 100644
switch (event->type) {
case GDK_KEY_RELEASE:
retval = ibus_input_context_process_key_event (ibuscontext,
-@@ -285,6 +304,7 @@ ibus_im_context_class_init (IBusIMContextClass *klass)
+@@ -291,6 +310,7 @@ ibus_im_context_class_init (IBusIMContextClass *klass)
im_context_class->set_client_window = ibus_im_context_set_client_window;
im_context_class->set_cursor_location = ibus_im_context_set_cursor_location;
im_context_class->set_use_preedit = ibus_im_context_set_use_preedit;
@@ -276,7 +276,7 @@ index c104f38..86350f5 100644
gobject_class->finalize = ibus_im_context_finalize;
_signal_commit_id =
-@@ -477,6 +497,8 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
+@@ -488,6 +508,8 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
if (ibusimcontext->client_window == NULL && event->window != NULL)
gtk_im_context_set_client_window ((GtkIMContext *)ibusimcontext, event->window);
@@ -285,7 +285,7 @@ index c104f38..86350f5 100644
switch (event->type) {
case GDK_KEY_RELEASE:
retval = ibus_input_context_process_key_event (ibusimcontext->ibuscontext,
-@@ -541,6 +563,8 @@ ibus_im_context_focus_in (GtkIMContext *context)
+@@ -552,6 +574,8 @@ ibus_im_context_focus_in (GtkIMContext *context)
g_object_weak_ref ((GObject *) context, _weak_notify_cb, NULL);
_focus_im_context = context;
}
@@ -294,7 +294,7 @@ index c104f38..86350f5 100644
}
static void
-@@ -706,6 +730,39 @@ ibus_im_context_set_use_preedit (GtkIMContext *context, gboolean use_preedit)
+@@ -723,6 +747,39 @@ ibus_im_context_set_use_preedit (GtkIMContext *context, gboolean use_preedit)
}
static void
@@ -334,7 +334,7 @@ index c104f38..86350f5 100644
_bus_connected_cb (IBusBus *bus,
IBusIMContext *ibusimcontext)
{
-@@ -724,6 +781,8 @@ _ibus_context_commit_text_cb (IBusInputContext *ibuscontext,
+@@ -741,6 +798,8 @@ _ibus_context_commit_text_cb (IBusInputContext *ibuscontext,
IDEBUG ("%s", __FUNCTION__);
g_signal_emit (ibusimcontext, _signal_commit_id, 0, text->text);
@@ -343,7 +343,7 @@ index c104f38..86350f5 100644
}
static gboolean
-@@ -954,6 +1013,8 @@ _ibus_context_show_preedit_text_cb (IBusInputContext *ibuscontext,
+@@ -1013,6 +1072,8 @@ _ibus_context_show_preedit_text_cb (IBusInputContext *ibuscontext,
ibusimcontext->preedit_visible = TRUE;
g_signal_emit (ibusimcontext, _signal_preedit_start_id, 0);
g_signal_emit (ibusimcontext, _signal_preedit_changed_id, 0);
@@ -352,7 +352,7 @@ index c104f38..86350f5 100644
}
static void
-@@ -1118,17 +1179,21 @@ _slave_preedit_end_cb (GtkIMContext *slave,
+@@ -1177,17 +1238,21 @@ _slave_preedit_end_cb (GtkIMContext *slave,
g_signal_emit (ibusimcontext, _signal_preedit_end_id, 0);
}
@@ -378,7 +378,7 @@ index c104f38..86350f5 100644
_slave_delete_surrounding_cb (GtkIMContext *slave,
gint offset_from_cursor,
guint nchars,
-@@ -1137,9 +1202,10 @@ _slave_delete_surrounding_cb (GtkIMContext *slave,
+@@ -1196,9 +1261,10 @@ _slave_delete_surrounding_cb (GtkIMContext *slave,
gboolean return_value;
if (ibusimcontext->enable && ibusimcontext->ibuscontext) {
diff --git a/ibus-541492-xkb.patch b/ibus-541492-xkb.patch
index 542ac13..3425853 100644
--- a/ibus-541492-xkb.patch
+++ b/ibus-541492-xkb.patch
@@ -1,6 +1,6 @@
-From 27d62755adfa03c11380414b63d8daa239dda905 Mon Sep 17 00:00:00 2001
+From d969e258fc925d16799e34f5b959a15c4c3cb7c3 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1 at gmail.com>
-Date: Tue, 5 Oct 2010 19:24:46 +0900
+Date: Thu, 21 Oct 2010 18:48:45 +0900
Subject: [PATCH] Add XKB layouts
---
@@ -16,11 +16,11 @@ Subject: [PATCH] Add XKB layouts
setup/Makefile.am | 1 +
setup/enginecombobox.py | 7 +-
setup/main.py | 3 +
- setup/setup.ui | 611 ++++++++++++++++++++++++++++++++++++++-
+ setup/setup.ui | 609 ++++++++++++++++++++++++++++++++++++++-
setup/xkbsetup.py | 451 ++++++++++++++++++++++++++++
src/ibusfactory.c | 17 +-
src/ibusfactory.h | 5 +-
- ui/gtk/panel.py | 38 +++
+ ui/gtk/panel.py | 39 +++
xkb/Makefile.am | 104 +++++++
xkb/ibus-engine-xkb-main.c | 397 +++++++++++++++++++++++++
xkb/ibus-engine-xkb-main.h | 46 +++
@@ -31,7 +31,7 @@ Subject: [PATCH] Add XKB layouts
xkb/xkblib.h | 40 +++
xkb/xkbxml.c | 696 ++++++++++++++++++++++++++++++++++++++++++++
xkb/xkbxml.h | 189 ++++++++++++
- 27 files changed, 3746 insertions(+), 6 deletions(-)
+ 27 files changed, 3745 insertions(+), 6 deletions(-)
create mode 100644 ibus/xkblayout.py.in
create mode 100644 ibus/xkbxml.py.in
create mode 100644 setup/xkbsetup.py
@@ -72,7 +72,7 @@ index 7895940..9f534a4 100644
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
-index 9cd60a3..b20c5ee 100644
+index 03b7c03..94e6eab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,6 +168,57 @@ else
@@ -133,7 +133,7 @@ index 9cd60a3..b20c5ee 100644
# GObject introspection
GOBJECT_INTROSPECTION_CHECK([0.6.8])
-@@ -387,6 +438,7 @@ gconf/Makefile
+@@ -380,6 +431,7 @@ gconf/Makefile
gconf/gconf.xml.in
bindings/Makefile
bindings/vala/Makefile
@@ -141,7 +141,7 @@ index 9cd60a3..b20c5ee 100644
])
AC_OUTPUT
-@@ -401,6 +453,7 @@ Build options:
+@@ -394,6 +446,7 @@ Build options:
Build gtk2 immodule $enable_gtk2
Build gtk3 immodule $enable_gtk3
Build XIM agent server $enable_xim
@@ -150,7 +150,7 @@ index 9cd60a3..b20c5ee 100644
Build gconf modules $enable_gconf
Build memconf modules $enable_memconf
diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
-index fae710a..af0cfad 100644
+index 9e92181..26ee970 100644
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -194,6 +194,42 @@
@@ -952,7 +952,7 @@ index c6612d2..228b030 100644
engine = self.__combobox.get_active_engine()
button = self.__builder.get_object("button_engine_add")
diff --git a/setup/setup.ui b/setup/setup.ui
-index 703b4d8..b08a3e2 100644
+index 703b4d8..a758bc7 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -129,7 +129,6 @@
@@ -1045,7 +1045,7 @@ index 703b4d8..b08a3e2 100644
</object>
</child>
</object>
-@@ -958,4 +1007,560 @@ Homepage: http://code.google.com/p/ibus
+@@ -958,4 +1007,558 @@ Homepage: http://code.google.com/p/ibus
</object>
</child>
</object>
@@ -1053,7 +1053,6 @@ index 703b4d8..b08a3e2 100644
+ <property name="title" translatable="yes">Add or Remove Layouts</property>
+ <property name="icon_name">ibus-setup</property>
+ <child internal-child="vbox">
-+
+ <object class="GtkVBox" id="vbox101">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
@@ -1221,7 +1220,6 @@ index 703b4d8..b08a3e2 100644
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
-+
+ <object class="EngineTreeView" id="treeview_system_keyboard_layout_engines">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
@@ -2132,10 +2130,10 @@ index 515083d..42c29b9 100644
/**
diff --git a/ui/gtk/panel.py b/ui/gtk/panel.py
-index 0efc85b..3f1e814 100644
+index e1efd54..159e8aa 100644
--- a/ui/gtk/panel.py
+++ b/ui/gtk/panel.py
-@@ -121,6 +121,22 @@ class Panel(ibus.PanelBase):
+@@ -120,6 +120,22 @@ class Panel(ibus.PanelBase):
self.__config_load_show_im_name()
# self.__bus.request_name(ibus.panel.IBUS_SERVICE_PANEL, 0)
@@ -2156,9 +2154,9 @@ index 0efc85b..3f1e814 100644
+ self.__xkblayout.set_default_option(value)
+
def set_cursor_location(self, x, y, w, h):
- self.__candidate_panel.set_cursor_location(x + w, y + h)
+ self.__candidate_panel.set_cursor_location(x, y, w, h)
-@@ -205,14 +221,20 @@ class Panel(ibus.PanelBase):
+@@ -204,14 +220,20 @@ class Panel(ibus.PanelBase):
if not enabled:
self.__set_im_icon(ICON_KEYBOARD)
self.__set_im_name(None)
@@ -2179,7 +2177,7 @@ index 0efc85b..3f1e814 100644
self.__language_bar.focus_in()
def focus_out(self, ic):
-@@ -222,6 +244,8 @@ class Panel(ibus.PanelBase):
+@@ -221,6 +243,8 @@ class Panel(ibus.PanelBase):
self.__language_bar.focus_out()
self.__set_im_icon(ICON_KEYBOARD)
self.__set_im_name(None)
@@ -2188,7 +2186,7 @@ index 0efc85b..3f1e814 100644
def state_changed(self):
if not self.__focus_ic:
-@@ -234,14 +258,20 @@ class Panel(ibus.PanelBase):
+@@ -233,14 +257,20 @@ class Panel(ibus.PanelBase):
self.reset()
self.__set_im_icon(ICON_KEYBOARD)
self.__set_im_name(None)
@@ -2209,10 +2207,10 @@ index 0efc85b..3f1e814 100644
def reset(self):
-@@ -517,4 +547,12 @@ class Panel(ibus.PanelBase):
- return
- self.__setup_pid = 0
- self.__setup_pid = os.spawnl(os.P_NOWAIT, self.__setup_cmd, "ibus-setup")
+@@ -516,2 +546,11 @@ class Panel(ibus.PanelBase):
+ self.__setup_pid = pid
+ glib.child_watch_add(self.__setup_pid, self.__child_watch_cb)
++
+ def __engine_get_layout_wrapper(self, engine):
+ # This code is for the back compatibility.
+ # Should we remove the codes after all IM engines are changed
@@ -2221,7 +2219,6 @@ index 0efc85b..3f1e814 100644
+ return engine.layout
+ else:
+ return "default"
-
diff --git a/xkb/Makefile.am b/xkb/Makefile.am
new file mode 100644
index 0000000..49b82eb
diff --git a/ibus.spec b/ibus.spec
index 62af154..d7b49aa 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -10,8 +10,8 @@
%define im_chooser_version 1.2.5
Name: ibus
-Version: 1.3.7
-Release: 11%{?dist}
+Version: 1.3.8
+Release: 1%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@@ -19,13 +19,10 @@ URL: http://code.google.com/p/ibus/
Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
Source1: xinput-ibus
# Patch0: ibus-HEAD.patch
-Patch1: ibus-621795-engineproxy-segv.patch
-Patch2: ibus-626652-leak.patch
-Patch3: ibus-xx-g-ir-compiler.patch
-# Patch4: ibus-xx-va_list.patch
-# Patch5: ibus-530711-preload-sys.patch
-Patch6: ibus-541492-xkb.patch
-Patch7: ibus-435880-surrounding-text.patch
+# Patch1: ibus-xx-va_list.patch
+# Patch2: ibus-530711-preload-sys.patch
+Patch3: ibus-541492-xkb.patch
+Patch4: ibus-435880-surrounding-text.patch
# WORKAROUND_GTK3_BUILD_FAILURE @ fedora14
Patch99: ibus-xx-workaround-gtk3.patch
@@ -134,15 +131,12 @@ The ibus-devel-docs package contains developer documentation for ibus
%prep
%setup -q
# %patch0 -p1
-%patch1 -p1 -b .segv
-%patch2 -p1 -b .leak
-%patch3 -p1 -b .gir
-# %patch4 -p1 -b .valist
-# %patch5 -p1 -b .preload-sys
+# %patch1 -p1 -b .valist
+# %patch2 -p1 -b .preload-sys
%if %have_libxkbfile
-%patch6 -p1 -b .xkb
+%patch3 -p1 -b .xkb
%endif
-%patch7 -p1 -b .surrounding
+%patch4 -p1 -b .surrounding
#### start WORKAROUND_GTK3_BUILD_FAILURE
WORKAROUND_GTK3_BUILD_FAILURE=0
@@ -301,27 +295,17 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
-* Thu Oct 07 2010 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.7-11
-- Added ibus-xx-g-ir-compiler.patch to fix g-ir-compiler error.
-- Updated ibus-435880-surrounding-text.patch
- Fixes Bug 634829 - ibus_im_context_set_surrounding() to get strings.
-- Updated ibus-541492-xkb.patch
- Fixed a bug when changed the system layout "jp(kana)" to "jp".
-- Added ibus-xx-workaround-gtk3.patch
- Workaround for f14 http://koji.fedoraproject.org/koji/taskinfo?taskID=2516604
-
-* Tue Sep 14 2010 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.7-5
-- Added ibus-621795-engineproxy-segv.patch
- Fixes crash in ibus_object_destroy
-- Added ibus-626652-leak.patch
- Fixes Bug 626652 - ibus memory leak with ibus_input_context_process_key_event
+* Fri Oct 22 2010 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.8-1
+- Updated to 1.3.8
- Added ibus-541492-xkb.patch
Fixes Bug 541492 - ibus needs to support some xkb layout switching
- Added ibus-435880-surrounding-text.patch
Fixes Bug 435880 - ibus-gtk requires surrounding-text support
+- Added ibus-xx-workaround-gtk3.patch
+ Workaround for f14 http://koji.fedoraproject.org/koji/taskinfo?taskID=2516604
* Mon Aug 23 2010 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.7-1
-- Update to 1.3.7
+- Updated to 1.3.7
* Wed Jul 28 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.6-5
- Rebuild against python 2.7
diff --git a/sources b/sources
index 48076a8..6e43bdb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a2acbda6cad23f6403c88347ac60e2d ibus-1.3.7.tar.gz
+6d345268e3496f2e6be3a6f3a3ba19ea ibus-1.3.8.tar.gz
More information about the scm-commits
mailing list