diff --git a/Always-save-the-content-type-cache-for-gnome-shell-p.patch b/Always-save-the-content-type-cache-for-gnome-shell-p.patch deleted file mode 100644 index 05c0d22..0000000 --- a/Always-save-the-content-type-cache-for-gnome-shell-p.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9596aea2e2df4cd3ac9b795ad9f354723cf83317 Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Wed, 2 Oct 2013 10:58:36 +0900 -Subject: [PATCH] Always save the content-type cache for gnome-shell password. - -GDBusProxy updates the cache immediatelly with the first call only -and has to save the next call in the cache by manual. - -BUG=RH#1013948 -TEST=password on gnome-shell 3.10. - -Review URL: https://codereview.appspot.com/14196043 ---- - bus/engineproxy.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/bus/engineproxy.c -+++ b/bus/engineproxy.c -@@ -1159,6 +1159,11 @@ bus_engine_proxy_set_content_type (BusEn - NULL, - NULL, - NULL); -+ -+ /* Need to update the cache by manual since there is a timing issue. */ -+ g_dbus_proxy_set_cached_property ((GDBusProxy *) engine, -+ "ContentType", -+ content_type); - } - - if (cached_content_type != NULL) diff --git a/add-libgnomekbd-and-load-preload-engines.patch b/add-libgnomekbd-and-load-preload-engines.patch index e449011..5f6a519 100644 --- a/add-libgnomekbd-and-load-preload-engines.patch +++ b/add-libgnomekbd-and-load-preload-engines.patch @@ -1,23 +1,14 @@ -From 5c8ce9720f607512c2734f08d3e7141d8f5b9e99 Mon Sep 17 00:00:00 2001 +From 8085ca38cb9c2ea370ebe64d80a4d7894a485960 Mon Sep 17 00:00:00 2001 From: fujiwarat -Date: Fri, 20 Sep 2013 17:16:56 +0900 +Date: Tue, 14 Jan 2014 15:27:50 +0900 Subject: [PATCH] Add libgnomekbd and load preload engines. -This patch was generated by ftake@geeko.jp from a git repository maintained by -a upstream developer (fujiwarat). -https://github.com/fujiwarat/ibus/commits/gtk3-vala - -It allows to configure ibus automatically according to the current locale -at the first login. This feature depends on another patch -reload-preload-engines-until-users-customize-the-list-95fd937e.patch -Note that this patch set is used for Fedora, Debian, and Ubuntu since the upstream -version is not sufficient with regard to distribution integration. - --- bindings/vala/Gkbd-3.0.metadata | 1 + bindings/vala/Makefile.am | 19 +- bindings/vala/Xkl-1.0.metadata | 3 + bindings/vala/gkbd.deps | 3 + + bus/ibusimpl.c | 12 +- configure.ac | 40 ++++ data/ibus.schemas.in | 59 +++++ ibus-1.0.pc.in | 1 + @@ -31,7 +22,7 @@ version is not sufficient with regard to distribution integration. ui/gtk3/gkbdlayout.vala.true | 108 ++++++++++ ui/gtk3/panel.vala | 196 ++++++++++++++++- ui/gtk3/xkblayout.vala | 429 ++++++++++++++++++++++++++++++++++++ - 17 files changed, 1623 insertions(+), 4 deletions(-) + 18 files changed, 1634 insertions(+), 5 deletions(-) create mode 100644 bindings/vala/Gkbd-3.0.metadata create mode 100644 bindings/vala/Xkl-1.0.metadata create mode 100644 bindings/vala/gkbd.deps @@ -49,7 +40,7 @@ index 0000000..661e6fd @@ -0,0 +1 @@ +Configuration cheader_filename="libgnomekbd/gkbd-configuration.h" diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am -index 84aa1b4..4d8aae4 100644 +index 29cc1eb..1d28501 100644 --- a/bindings/vala/Makefile.am +++ b/bindings/vala/Makefile.am @@ -28,8 +28,6 @@ vapi_deps = \ @@ -61,7 +52,7 @@ index 84aa1b4..4d8aae4 100644 VAPIGEN_VAPIS = ibus-1.0.vapi ibus_1_0_vapi_DEPS = gio-2.0 -@@ -39,18 +37,33 @@ ibus_1_0_vapi_FILES = \ +@@ -39,19 +37,34 @@ ibus_1_0_vapi_FILES = \ $(srcdir)/IBus-1.0-custom.vala \ $(NULL) @@ -90,6 +81,7 @@ index 84aa1b4..4d8aae4 100644 IBus-1.0.metadata \ IBus-1.0-custom.vala \ ibus-1.0.deps \ + ibus-private.vapi \ config.vapi \ xi.vapi \ + Xkl-1.0.metadata \ @@ -114,8 +106,31 @@ index 0000000..172632c +gtk+-3.0 +glib-2.0 +gmodule-2.0 +diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c +index eec6da3..f84c034 100644 +--- a/bus/ibusimpl.c ++++ b/bus/ibusimpl.c +@@ -1135,7 +1135,17 @@ enum { + g_variant_builder_init (&builder, G_VARIANT_TYPE ("av")); + while (names[i] != NULL) { + IBusEngineDesc *desc = (IBusEngineDesc *) g_hash_table_lookup ( +- ibus->engine_table, names[i++]); ++ ibus->engine_table, names[i]); ++ ++ /* preload engines return user XKB so if the engine does not ++ * exist in simple.xml, fall back to 'us' layout. */ ++ if (desc == NULL && g_str_has_prefix (names[i], "xkb:")) { ++ desc = (IBusEngineDesc *) g_hash_table_lookup ( ++ ibus->engine_table, "xkb:us::eng"); ++ } ++ ++ i++; ++ + if (desc == NULL) + continue; + g_variant_builder_add ( diff --git a/configure.ac b/configure.ac -index e8fde49..d084c8e 100644 +index d71c415..779e29e 100644 --- a/configure.ac +++ b/configure.ac @@ -261,6 +261,45 @@ else @@ -173,7 +188,7 @@ index e8fde49..d084c8e 100644 ]) diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in -index 2779139..88a287f 100644 +index d256cbb..8fd7e15 100644 --- a/data/ibus.schemas.in +++ b/data/ibus.schemas.in @@ -56,6 +56,52 @@ @@ -306,10 +321,10 @@ index 334f37e..2017af9 100644 # make -C po update-gmo diff --git a/src/Makefile.am b/src/Makefile.am -index 811d097..912b75c 100644 +index 404e1d2..f00fab7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -201,6 +201,9 @@ typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) +@@ -202,6 +202,9 @@ typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA) endif @@ -997,7 +1012,7 @@ index 0000000..5aa486d +G_END_DECLS +#endif diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am -index 547ef53..4b32d7e 100644 +index 6012cfa..3dfa0df 100644 --- a/ui/gtk3/Makefile.am +++ b/ui/gtk3/Makefile.am @@ -44,6 +44,8 @@ AM_CPPFLAGS = \ @@ -1059,15 +1074,15 @@ index 547ef53..4b32d7e 100644 handle.vala \ iconwidget.vala \ keybindingmanager.vala \ -@@ -111,6 +143,7 @@ ibus_ui_gtk3_SOURCES = \ - property.vala \ +@@ -112,6 +144,7 @@ ibus_ui_gtk3_SOURCES = \ + propertypanel.vala \ separator.vala \ switcher.vala \ + xkblayout.vala \ $(NULL) ibus_ui_gtk3_LDADD = \ -@@ -119,9 +152,12 @@ ibus_ui_gtk3_LDADD = \ +@@ -120,9 +153,12 @@ ibus_ui_gtk3_LDADD = \ CLEANFILES = \ gtkpanel.xml \ @@ -1264,10 +1279,10 @@ index 0000000..a6e0f8d + */ +} diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala -index 82b9ee5..c08f6f4 100644 +index a7a0c40..1da7966 100644 --- a/ui/gtk3/panel.vala +++ b/ui/gtk3/panel.vala -@@ -57,6 +57,13 @@ class Panel : IBus.PanelService { +@@ -58,6 +58,13 @@ class Panel : IBus.PanelService { private Gtk.CssProvider m_css_provider; private int m_switcher_delay_time = 400; private bool m_use_system_keyboard_layout = false; @@ -1281,7 +1296,7 @@ index 82b9ee5..c08f6f4 100644 private GLib.List m_keybindings = new GLib.List(); -@@ -102,6 +109,14 @@ class Panel : IBus.PanelService { +@@ -108,6 +115,14 @@ class Panel : IBus.PanelService { ~Panel() { unbind_switch_shortcut(); @@ -1296,7 +1311,7 @@ index 82b9ee5..c08f6f4 100644 } private void init_settings() { -@@ -399,6 +414,7 @@ class Panel : IBus.PanelService { +@@ -444,6 +459,7 @@ class Panel : IBus.PanelService { } public void load_settings() { @@ -1304,7 +1319,7 @@ index 82b9ee5..c08f6f4 100644 // Update m_use_system_keyboard_layout before update_engines() // is called. set_use_system_keyboard_layout(); -@@ -415,6 +431,184 @@ class Panel : IBus.PanelService { +@@ -463,6 +479,184 @@ class Panel : IBus.PanelService { set_version(); } @@ -1489,7 +1504,7 @@ index 82b9ee5..c08f6f4 100644 private void exec_setxkbmap(IBus.EngineDesc engine) { string layout = engine.get_layout(); string variant = engine.get_layout_variant(); -@@ -480,7 +674,7 @@ class Panel : IBus.PanelService { +@@ -528,7 +722,7 @@ class Panel : IBus.PanelService { // set xkb layout if (!m_use_system_keyboard_layout) @@ -1934,5 +1949,5 @@ index 0000000..b7dfb3e + */ +} -- -1.8.4 +1.8.5.1 diff --git a/ibus-1.5.4.tar.gz b/ibus-1.5.4.tar.gz deleted file mode 100644 index aab618c..0000000 --- a/ibus-1.5.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:703ebaba3f01b54a86119fb6161d85b9d1ccdb4edb79782d0d23ccde64d214fd -size 2026656 diff --git a/ibus-1.5.5.tar.gz b/ibus-1.5.5.tar.gz new file mode 100644 index 0000000..b96e302 --- /dev/null +++ b/ibus-1.5.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec +size 2063794 diff --git a/ibus.changes b/ibus.changes index 74977e4..d3445eb 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Jan 27 16:49:27 UTC 2014 - ftake@geeko.jp + +- Update to 1.5.5 + * Add Property Panel showing IME properties + * Add French layout variant “oss” and the Slovak qwerty layout + * Support customizing the look-up-table orientation of ibus-ui-gtk3. + * Update en-us compose table and add locale tables for xkb engines + * Delete the up/down buttons and the message about them on ibus-setup. + * Fix candidate panel placed out of screen + * Remove -Werror in autogen.sh +- Remove Always-save-the-content-type-cache-for-gnome-shell-p.patch + * mergerd by upstream +- Refresh show-input-mode-icon.patch +- Update reload-preload-engines-until-users-customize-the-list.patch + and add-libgnomekbd-and-load-preload-engines.patch + * fix ibus-ui-gtk3 crashes if layout is en_intl (bnc#859354) + ------------------------------------------------------------------- Mon Nov 25 21:50:12 CST 2013 - hillwood@linuxfans.org diff --git a/ibus.spec b/ibus.spec index 1e88679..1429ee5 100644 --- a/ibus.spec +++ b/ibus.spec @@ -1,7 +1,7 @@ # # spec file for package ibus # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -19,7 +19,7 @@ %define with_automatic_config 1 Name: ibus -Version: 1.5.4 +Version: 1.5.5 Release: 0 Url: http://code.google.com/p/ibus/ Summary: Intelligent Input Bus for Linux OS @@ -32,17 +32,16 @@ Source3: xim.ibus.suse.template Source4: xim.d-ibus-121 Source5: kde.tar.gz Source6: kde-12.2.tar.gz -%if %{with_automatic_config} Patch0: ibus-python-install-dir.patch # PATCH-FEATURE-UPSTREAM add-libgnomekbd-and-load-preload-engines.patch Issue 1641 ftake@geeko.jp +%if %{with_automatic_config} Patch1: add-libgnomekbd-and-load-preload-engines.patch # PATCH-FEATURE-UPSTREAM reload-preload-engines-until-users-customize-the-list.patch Issue 1641 ftake@geeko.jp Patch2: reload-preload-engines-until-users-customize-the-list.patch %endif # PATCH-FIX-OPENSUSE reload-preload-engines-until-users-customize-the-list.patch ftake@geeko.jp Patch3: show-input-mode-icon.patch -# PATCH-FIX-UPSTREAM Always-save-the-content-type-cache-for-gnome-shell-p.patch bnc#847718 -Patch4: Always-save-the-content-type-cache-for-gnome-shell-p.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /usr/bin/touch Provides: locale(ja;ko;zh) @@ -189,7 +188,6 @@ rm -f data/dconf/00-upstream-settings %endif %patch3 -p1 -%patch4 -p1 %build autoreconf -fi diff --git a/reload-preload-engines-until-users-customize-the-list.patch b/reload-preload-engines-until-users-customize-the-list.patch index dec7451..2eab791 100644 --- a/reload-preload-engines-until-users-customize-the-list.patch +++ b/reload-preload-engines-until-users-customize-the-list.patch @@ -1,14 +1,8 @@ -From d566bc83a4672b88a38fa5de25741b99ebaeae62 Mon Sep 17 00:00:00 2001 +From a6d4b9ac9a22c5b88c362b659eaf6fd59a0cf5bd Mon Sep 17 00:00:00 2001 From: fujiwarat -Date: Fri, 20 Sep 2013 17:20:09 +0900 +Date: Tue, 14 Jan 2014 15:30:24 +0900 Subject: [PATCH] Reload preload engines until users customize the list. -This patch was generated by ftake@geeko.jp from a git repository maintained by -a upstream developer (fujiwarat). -https://github.com/fujiwarat/ibus/commits/gtk3-vala - -The following description is from the original commit: - The idea is, if users don't customize the preload_engines with ibus-setup, users would prefer to load the system default engines again by login. The gsettings value 'preload-engine-mode' is @@ -31,7 +25,7 @@ IBUS_PRELOAD_ENGINE_MODE_USER and users can customize the value 5 files changed, 210 insertions(+), 9 deletions(-) diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in -index 88a287f..b6709fd 100644 +index 8fd7e15..28d2219 100644 --- a/data/ibus.schemas.in +++ b/data/ibus.schemas.in @@ -2,6 +2,30 @@ @@ -174,7 +168,7 @@ index d3f4414..235ef9c 100644 self.__bus = IBus.Bus() if self.__bus.is_connected(): diff --git a/setup/setup.ui b/setup/setup.ui -index 1638abb..72a5d57 100644 +index 65dcee4..a6a001b 100644 --- a/setup/setup.ui +++ b/setup/setup.ui @@ -669,7 +669,23 @@ @@ -211,7 +205,7 @@ index 1638abb..72a5d57 100644 -@@ -905,7 +921,7 @@ You may use up/down buttons to change it.</i></small> +@@ -905,7 +921,7 @@ False True @@ -221,10 +215,10 @@ index 1638abb..72a5d57 100644 diff --git a/src/ibustypes.h b/src/ibustypes.h -index 6d30a86..dac7f8f 100644 +index 86fc2cc..cb9eb22 100644 --- a/src/ibustypes.h +++ b/src/ibustypes.h -@@ -204,6 +204,16 @@ +@@ -206,6 +206,16 @@ } IBusError; /** @@ -242,10 +236,10 @@ index 6d30a86..dac7f8f 100644 * @x: x coordinate. * @y: y coordinate. diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala -index c08f6f4..9c1fef5 100644 +index 1da7966..fc60fd4 100644 --- a/ui/gtk3/panel.vala +++ b/ui/gtk3/panel.vala -@@ -130,6 +130,10 @@ class Panel : IBus.PanelService { +@@ -136,6 +136,10 @@ class Panel : IBus.PanelService { null); }); @@ -256,7 +250,7 @@ index c08f6f4..9c1fef5 100644 m_settings_general.changed["switcher-delay-time"].connect((key) => { set_switcher_delay_time(); }); -@@ -476,7 +480,96 @@ class Panel : IBus.PanelService { +@@ -524,7 +528,96 @@ class Panel : IBus.PanelService { init_gkbd(); } @@ -335,8 +329,8 @@ index c08f6f4..9c1fef5 100644 + preload_engines += name; + } + -+ if ("".joinv(",", orig_preload_engines) != -+ "".joinv(",", preload_engines)) ++ if (string.joinv(",", orig_preload_engines) != ++ string.joinv(",", preload_engines)) + m_settings_general.set_strv("preload-engines", preload_engines); + + return true; @@ -354,5 +348,5 @@ index c08f6f4..9c1fef5 100644 private void update_xkb_engines() { -- -1.8.4 +1.8.5.1 diff --git a/show-input-mode-icon.patch b/show-input-mode-icon.patch index dc6138a..72d3043 100644 --- a/show-input-mode-icon.patch +++ b/show-input-mode-icon.patch @@ -1,21 +1,9 @@ -From 8dcad73926dfed30b1aae6bcb6c0ecae35d13777 Mon Sep 17 00:00:00 2001 -From: Fuminobu TAKEYAMA -Date: Sun, 6 Oct 2013 15:29:43 +0900 -Subject: [PATCH] If icons for input modes are available, use those icons - instead of engine's icons. - ---- - ui/gtk3/panel.vala | 41 +++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 41 insertions(+) - -diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala -index 9c1fef5..1d38bfe 100644 ---- a/ui/gtk3/panel.vala -+++ b/ui/gtk3/panel.vala -@@ -1098,10 +1098,51 @@ class Panel : IBus.PanelService { - +--- ibus-1.5.5/ui/gtk3/panel.vala.orig 2014-01-19 01:53:48.144138225 +0900 ++++ ibus-1.5.5/ui/gtk3/panel.vala 2014-01-19 02:03:54.627409768 +0900 +@@ -863,11 +863,52 @@ public override void register_properties(IBus.PropList props) { m_property_manager.set_properties(props); + m_property_panel.set_properties(props); + int i = 0; + while (true) { + IBus.Property prop = props.get(i); @@ -31,6 +19,7 @@ index 9c1fef5..1d38bfe 100644 public override void update_property(IBus.Property prop) { m_property_manager.update_property(prop); + m_property_panel.update_property(prop); + if (prop.key == "InputMode") { + update_input_mode_icon(prop.icon); + } @@ -39,7 +28,7 @@ index 9c1fef5..1d38bfe 100644 + // If InputMode has an icon, use it instead of engine's icon. + public void update_input_mode_icon(string icon) { + var icon_name = icon; -+ if (icon == "") { ++ if (icon == "") { + var engine = m_bus.get_global_engine(); + icon_name = engine.get_icon(); + } @@ -47,8 +36,8 @@ index 9c1fef5..1d38bfe 100644 + if (icon_name[0] == '/') { + try { + // resize icon because icons were desinged for ibus tool bar of 1.4.x -+ // use 24 px because icons are wrongly cropped on KDE -+ var icon_img = new Gdk.Pixbuf.from_file_at_size(icon_name, 24, 24); ++ // use 22 px because icons are wrongly cropped on KDE ++ var icon_img = new Gdk.Pixbuf.from_file_at_size(icon_name, 22, 22); + m_status_icon.set_from_pixbuf(icon_img); + } catch (Error e) { + warning("could not load icon: %s", icon_name); @@ -64,6 +53,3 @@ index 9c1fef5..1d38bfe 100644 } public override void update_preedit_text(IBus.Text text, --- -1.8.4 -