From ac80e43c4bc8c13f7a7ba27af6238f3a3bf21c93278ac1ed8a85a6e233bf8a35 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 14 Apr 2016 12:47:34 +0000 Subject: [PATCH 1/2] Accepting request 389573 from home:sumski:branches:M17N OBS-URL: https://build.opensuse.org/request/show/389573 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=152 --- ibus.changes | 6 ++++++ ibus.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ibus.changes b/ibus.changes index 10ac7b0..4c640a6 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 13 16:47:52 UTC 2016 - hrvoje.senjan@gmail.com + +- Own all oxygen icon subdirs, starting with KF 5.21.0, oxygen is + no longer installed to the same location + ------------------------------------------------------------------- Wed Mar 23 10:29:32 UTC 2016 - fcrozat@suse.com diff --git a/ibus.spec b/ibus.spec index b1e5090..e41a03f 100644 --- a/ibus.spec +++ b/ibus.spec @@ -453,8 +453,8 @@ dconf update %files branding-openSUSE-KDE %defattr(-,root,root) -%dir %{_datadir}/icons/oxygen/24x24 -%dir %{_datadir}/icons/oxygen/24x24/apps +%dir %{_datadir}/icons/oxygen/* +%dir %{_datadir}/icons/oxygen/*/apps %{_datadir}/icons/oxygen/*/apps/ibus-keyboard.* %changelog From eb799bdc06c884d982105b3d2629115d2686d0097470dc114c3cce24a3b2f86b Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 20 Apr 2016 10:47:35 +0000 Subject: [PATCH 2/2] Accepting request 390702 from home:ftake:branches:M17N upstream update OBS-URL: https://build.opensuse.org/request/show/390702 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=153 --- ibus-1.5.11.tar.gz | 3 --- ibus-1.5.13.tar.gz | 3 +++ ibus.changes | 20 +++++++++++++++ ibus.spec | 5 +--- show-input-mode-icon.patch | 51 -------------------------------------- 5 files changed, 24 insertions(+), 58 deletions(-) delete mode 100644 ibus-1.5.11.tar.gz create mode 100644 ibus-1.5.13.tar.gz delete mode 100644 show-input-mode-icon.patch diff --git a/ibus-1.5.11.tar.gz b/ibus-1.5.11.tar.gz deleted file mode 100644 index 013b576..0000000 --- a/ibus-1.5.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49995a298a39a137e65c6ee77811b030850ff344b875f29d4ed088f623a546bc -size 2177026 diff --git a/ibus-1.5.13.tar.gz b/ibus-1.5.13.tar.gz new file mode 100644 index 0000000..89aacaa --- /dev/null +++ b/ibus-1.5.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed73d80542dfdcca190b7958431048cd6830c2ce25c467384630b6a7e957a5f1 +size 2194054 diff --git a/ibus.changes b/ibus.changes index 4c640a6..4b6a72a 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Apr 18 14:40:35 UTC 2016 - ftake@geeko.jp + +- Upstream update to 1.5.13 + * Add SetCursorLocationRelative D-Bus method +- Upstream update to 1.5.12 + * Fix ibus-daemon does not update user cache + * Fix lookup window on a secondary monitor cannot get its correct + size + * Fix default position of property panel under multi monitor + environments + * Change language code from ISO 939-2 to ISO 639-1 + * Fix minor bugs + +------------------------------------------------------------------- +Mon Apr 18 13:51:12 UTC 2016 - ftake@geeko.jp + +- Drop show-input-mode-icon.patch + * this feature has been reimplemented in another approach + ------------------------------------------------------------------- Wed Apr 13 16:47:52 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/ibus.spec b/ibus.spec index e41a03f..d8ea91e 100644 --- a/ibus.spec +++ b/ibus.spec @@ -30,7 +30,7 @@ %endif Name: ibus -Version: 1.5.11 +Version: 1.5.13 Release: 0 Summary: Intelligent Input Bus for Linux OS License: LGPL-2.1+ @@ -49,8 +49,6 @@ Source11: ibus-autostart.desktop Source99: baselibs.conf # PATCH-FIX-OPENSUSE ibus-python-install-dir.patch ftake@geeko.jp Patch0: ibus-python-install-dir.patch -# PATCH-FIX-OPENSUSE reload-preload-engines-until-users-customize-the-list.patch ftake@geeko.jp -Patch3: show-input-mode-icon.patch # PATFH-FIX-SUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869 tiwa@suse.de -- Fix lost XIM input after screenlock Patch4: ibus-xim-fix-re-focus-after-lock.patch # PATCH-FIX-UPSTREAM marguerite@opensuse.org @@ -246,7 +244,6 @@ sed -i \ %{SOURCE99} %endif -%patch3 -p1 %patch4 -p1 %if %{with_python3} diff --git a/show-input-mode-icon.patch b/show-input-mode-icon.patch deleted file mode 100644 index f9f9caa..0000000 --- a/show-input-mode-icon.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- ibus-1.5.11/ui/gtk3/panel.vala.org 2015-07-26 00:33:34.593235534 +0900 -+++ ibus-1.5.11/ui/gtk3/panel.vala 2015-07-26 00:47:19.476663700 +0900 -@@ -1179,12 +1179,48 @@ - - private new void set_property(IBus.Property prop, bool all_update) { - string symbol = prop.get_symbol().get_text(); -+ -+ if (prop.key == "InputMode") { -+ update_input_mode_icon(prop.icon); -+ } - - if (m_icon_prop_key != "" && prop.get_key() == m_icon_prop_key - && symbol != "") - animate_icon(symbol, all_update); - } - -+ // 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 == "") { -+ var engine = m_bus.get_global_engine(); -+ icon_name = engine.get_icon(); -+ } -+ -+ if (icon_name[0] == '/') { -+ if (m_icon_type == IconType.STATUS_ICON) { -+ try { -+ // -+ // Do not need to scale icons for ibus 1.5.10+ indicator -+ var icon_img = new Gdk.Pixbuf.from_file(icon_name); -+ 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(); -+ if (theme.lookup_icon(icon_name, 48, 0) != null) { -+ m_status_icon.set_from_icon_name(icon_name); -+ } else { -+ m_status_icon.set_from_icon_name("ibus-engine"); -+ } -+ } -+ } -+ - private void animate_icon(string symbol, bool all_update) { - if (m_property_icon_delay_time < 0) - return;