pool/ibus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 321616 from home:ftake:branches:M17N

Browse Source 
upstream update and bug fix

OBS-URL: https://build.opensuse.org/request/show/321616
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=144
This commit is contained in:
Takashi Iwai 2015-08-10 13:44:14 +00:00 committed by Git OBS Bridge
parent 78c449f809
commit 066f1fced6
8 changed files with 79 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
appindicator-absolute-icon-path.patch
View File

@ -1,21 +0,0 @@
commit 18d92c792210ede2e1e8f77bff2c4921a106f5cf
Author: Fuminobu TAKEYAMA <ftake@geeko.jp>
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;

3
ibus-1.5.10.tar.gz
View File

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

3
ibus-1.5.11.tar.gz Normal file
View File

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

18
ibus-fix-check-abs-icon-path-support.patch Normal file
View File

@ -0,0 +1,18 @@
--- ibus-1.5.11/configure.ac.org 2015-07-26 02:12:53.141514441 +0900
+++ ibus-1.5.11/configure.ac 2015-07-26 02:34:17.589225723 +0900
@@ -267,7 +267,14 @@
enable_wayland="no (disabled, use --enable-wayland to enable)"
fi
-enable_appindicator_engine_icon="no"
+# --enable_appindicator_engine_icon option.
+AC_ARG_ENABLE(appindicator_engine_icon,
+ AS_HELP_STRING([--enable-appindicator_engine_icon],
+ [Build appindicator engine icon support]),
+ [enable_appindicator_engine_icon=$enableval],
+ [enable_appindicator_engine_icon=no]
+)
+
if test x"$enable_appindicator" = x"yes"; then
enable_appindicator="yes (enabled, use --disable-appindicator to disable)"

26
ibus.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Mon Aug 10 05:03:43 UTC 2015 - ftake@geeko.jp
- Update to 1.5.11
* Add Swedish svdvorak layout support
* Improve UI of ibus-setup
* Show property panel at bottom right under KDE
* Enable absolute path to icon for appindicator
* Support showing language icon and a property for Plasma 5
* Use GTK 3 for xim
* Load locale compose files dynamically
* Enable sync mode for xim
* Support vertical writing
- Enable appindicator status icon for SLE12 and Leap 42.1
(boo#939506)
- Remove a bashism from /etc/xim.d/ibus (boo#941052)
- Requires newer vala compiler
* Cannot compile with an incompatible return type error
* 13.1 support should be dropped after the cause is confirmed
- Drop appindicator-absolute-icon-path.patch
* Merged by upstream
- Add ibus-fix-check-abs-icon-path-support.patch
* Allows to force absolute path regardless of Qt version
- Refresh show-input-mode-icon.patch
* Do not scale up icon for the new appindicator status icon
-------------------------------------------------------------------
Sat Mar 28 09:30:59 UTC 2015 - ftake@geeko.jp

12
ibus.spec
View File

@ -30,7 +30,7 @@
%endif
Name: ibus
Version: 1.5.10
Version: 1.5.11
Release: 0
Summary: Intelligent Input Bus for Linux OS
License: LGPL-2.1+
@ -66,7 +66,7 @@ Patch7: ibus-python3-migration.patch
# 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
Patch9: ibus-fix-check-abs-icon-path-support.patch
BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-1-python-devel >= 0.83.0
BuildRequires: dconf-devel >= 0.7.5
@ -102,6 +102,11 @@ BuildRequires: pkgconfig(vapigen)
BuildRequires: pkgconfig(wayland-client) >= 1.2.0
%endif
BuildRequires: pkgconfig(xkbcommon)
# It seems that old vala compiler cannot build with an incompatible
# return type error among two overriding functions with
# "GLib.Variant?" type
# 13.1 support should be dropped after the cause is confirmed
BuildRequires: vala >= 0.26.0
Requires: dbus-1-python
Requires: dconf
Requires: iso-codes
@ -260,10 +265,11 @@ intltoolize -f
%if %{with_wayland}
--enable-wayland \
%endif
%if 0%{?suse_version} < 1320
%if 0%{?suse_version} < 1315
--disable-appindicator \
%endif
--enable-surrounding-text \
--enable-appindicator_engine_icon \
--libexecdir=%{_libdir}/ibus
make %{?_smp_mflags}

61
show-input-mode-icon.patch
View File

@ -1,42 +1,23 @@
commit ed74a67ff98750903e6ce2e0e638f3e956eab66b
Author: Fuminobu TAKEYAMA <ftake@geeko.jp>
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);
+ int i = 0;
+ while (true) {
+ IBus.Property prop = props.get(i);
+ if (prop == null)
+ break;
+ if (prop.key == "InputMode") {
+ update_input_mode_icon(prop.icon);
+ break;
+ }
+ i++;
--- 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);
}
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);
+ }
+ }
+
+ // 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();
+ }
@ -44,9 +25,9 @@ index 4b59eeb..99a768a 100644
+ if (icon_name[0] == '/') {
+ 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);
+ //
+ // 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);
@ -63,6 +44,8 @@ index 4b59eeb..99a768a 100644
+ m_status_icon.set_from_icon_name("ibus-engine");
+ }
+ }
}
public override void update_preedit_text(IBus.Text text,
+ }
+
private void animate_icon(string symbol, bool all_update) {
if (m_property_icon_delay_time < 0)
return;

2
xim.d-ibus-121
View File

@ -1,4 +1,4 @@
if ! type -p ibus-daemon > /dev/null 2>&1 ; then
if ! type ibus-daemon > /dev/null 2>&1 ; then
echo "ibus is not available."
return 1
fi