Accepting request 390784 from M17N

1

OBS-URL: https://build.opensuse.org/request/show/390784
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ibus?expand=0&rev=72

ibus-1.5.11.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49995a298a39a137e65c6ee77811b030850ff344b875f29d4ed088f623a546bc
-size 2177026

ibus-1.5.13.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed73d80542dfdcca190b7958431048cd6830c2ce25c467384630b6a7e957a5f1
+size 2194054

ibus.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+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
+
+- 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
 

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}
@@ -453,8 +450,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

show-input-mode-icon.patch

@@ -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;