diff --git a/appindicator-absolute-icon-path.patch b/appindicator-absolute-icon-path.patch new file mode 100644 index 0000000..ed723ce --- /dev/null +++ b/appindicator-absolute-icon-path.patch @@ -0,0 +1,21 @@ +commit 18d92c792210ede2e1e8f77bff2c4921a106f5cf +Author: Fuminobu TAKEYAMA +Date: Thu Mar 12 23:47:08 2015 +0900 + + Send an absolute path to icon file because the KDE status notifier can handle it. + +diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala +index 1379860..4b59eeb 100644 +--- a/ui/gtk3/panel.vala ++++ b/ui/gtk3/panel.vala +@@ -1248,9 +1248,7 @@ class Panel : IBus.PanelService { + m_status_icon.set_from_file(icon_name); + } + else if (m_icon_type == IconType.INDICATOR) { +- warning("appindicator requires an icon name in a theme " + +- "path instead of the full path: %s", icon_name); +- m_indicator.set_icon_full("ibus-engine", ""); ++ m_indicator.set_icon_full(icon_name, ""); + } + } else { + string language = null; diff --git a/ibus-1.5.10.tar.gz b/ibus-1.5.10.tar.gz new file mode 100644 index 0000000..d3e24f2 --- /dev/null +++ b/ibus-1.5.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594 +size 2169299 diff --git a/ibus-1.5.9.tar.gz b/ibus-1.5.9.tar.gz deleted file mode 100644 index a72ccb0..0000000 --- a/ibus-1.5.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad41014aa3cb961854ee0aa392a5abd7452fab2c6b77d8ff2d736b7405b48ac6 -size 2128459 diff --git a/ibus.changes b/ibus.changes index a2f701a..3080ddd 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Mar 12 15:27:11 UTC 2015 - ftake@geeko.jp + +- Update to 1.5.9 + * Fix losing focus in/out on Google Chrome + * Fix SEGV of ibus-ui-gtk3 caused by inappropriate 'preload-engines' + * ibus-setup tries C locale to support environment without + en_US.UTF-8 + * Remove "Release" modifier key from ibus-setup + * Show language rather than layout for xkb panel icon + * Track window property offsets correctly + * Add IBus panel icon for Plasma 5 desktop + * Minor bug fixes +- Update show-input-mode-icon.patch + * Support the new panel icon +- Add appindicator-absolute-icon-path.patch + * Show icons installed out of theme directories + ------------------------------------------------------------------- Sat Jan 24 14:44:45 UTC 2015 - antoine.belvire@laposte.net diff --git a/ibus.spec b/ibus.spec index dad215f..3489513 100644 --- a/ibus.spec +++ b/ibus.spec @@ -1,7 +1,7 @@ # # spec file for package ibus # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,7 @@ %endif Name: ibus -Version: 1.5.9 +Version: 1.5.10 Release: 0 Summary: Intelligent Input Bus for Linux OS License: LGPL-2.1+ @@ -65,6 +65,8 @@ Patch7: ibus-python3-migration.patch # PATCH-FIX-UPSTREAM ftake@geeko.jp # Select an IM engine at the first login Patch8: im-engines-precede-xkb.patch +# PATCH-FIX-UPSTREAM ftake@geeko.jp +Patch9: appindicator-absolute-icon-path.patch BuildRequires: dbus-1-glib-devel BuildRequires: dbus-1-python-devel >= 0.83.0 BuildRequires: dconf-devel >= 0.7.5 @@ -236,6 +238,7 @@ sed -i \ %endif %patch8 -p1 +%patch9 -p1 cp -r %{SOURCE2} . cp -r %{SOURCE3} . diff --git a/show-input-mode-icon.patch b/show-input-mode-icon.patch index 72d3043..ad4db13 100644 --- a/show-input-mode-icon.patch +++ b/show-input-mode-icon.patch @@ -1,6 +1,14 @@ ---- 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 @@ +commit ed74a67ff98750903e6ce2e0e638f3e956eab66b +Author: Fuminobu TAKEYAMA +Date: Fri Mar 13 00:04:22 2015 +0900 + + Show input mode icons if the current engine provides + +diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala +index 4b59eeb..99a768a 100644 +--- a/ui/gtk3/panel.vala ++++ b/ui/gtk3/panel.vala +@@ -1183,11 +1183,57 @@ class Panel : IBus.PanelService { public override void register_properties(IBus.PropList props) { m_property_manager.set_properties(props); m_property_panel.set_properties(props); @@ -34,13 +42,18 @@ + } + + if (icon_name[0] == '/') { -+ try { -+ // resize icon because icons were desinged for ibus tool bar of 1.4.x -+ // 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); ++ if (m_icon_type == IconType.STATUS_ICON) { ++ try { ++ // resize icon because icons were desinged for ibus tool bar of 1.4.x ++ // 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); ++ } ++ } ++ else if (m_icon_type == IconType.INDICATOR) { ++ m_indicator.set_icon_full(icon_name, ""); + } + } else { + var theme = Gtk.IconTheme.get_default();