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

Accepting request 246465 from M17N

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/246465
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ibus?expand=0&rev=58
This commit is contained in:
Stephan Kulow 2014-09-03 06:30:08 +00:00 committed by Git OBS Bridge
commit 8a79482d18
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ibus.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Aug 26 08:15:16 UTC 2014 - fcrozat@suse.com
- Do not only requires typelib-1_0-Gtk-3_0 when building with
python3.
-------------------------------------------------------------------
Fri Aug 22 12:49:54 UTC 2014 - fcrozat@suse.com
- Update ibus xim script to properly detect GNOME 3.12+ and to use
ibus default configuration on first startup of GNOME (bnc#862589
internal), with help from Takashi Iwai.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 11 15:03:41 CEST 2014 - fcrozat@suse.com Mon Aug 11 15:03:41 CEST 2014 - fcrozat@suse.com

2
ibus.spec
View File

@ -98,12 +98,10 @@ Requires: dbus-1-python
Requires: dconf Requires: dconf
Requires: iso-codes Requires: iso-codes
Requires: libibus-1_0-5 = %{version} Requires: libibus-1_0-5 = %{version}
%if %{with_python3}
# ibus-setup will require typelib(Gdk) typelib(GdkX11), typelib(Gtk) # ibus-setup will require typelib(Gdk) typelib(GdkX11), typelib(Gtk)
# which are provided by two packages in openSUSE, so we limit their # which are provided by two packages in openSUSE, so we limit their
# versions to 3.0 only. # versions to 3.0 only.
Requires: typelib-1_0-Gtk-3_0 Requires: typelib-1_0-Gtk-3_0
%endif
Recommends: %{name}-lang Recommends: %{name}-lang
#Fix cursor following problem in KDE4 for libreoffice. #Fix cursor following problem in KDE4 for libreoffice.

14
xim.d-ibus-121
View File

@ -31,7 +31,19 @@ __END
# GNOME 3 Settings Daemon keyboard plugin manages all ibus settings itself, # GNOME 3 Settings Daemon keyboard plugin manages all ibus settings itself,
# so don't do manual setup&startup of ibus otherwise it would conflict with # so don't do manual setup&startup of ibus otherwise it would conflict with
# G-S-D. see bnc#873016. # G-S-D. see bnc#873016.
*gnome-session*) *gnome*)
SOURCES=$(gsettings get org.freedesktop.ibus.general preload-engines)
if [ "$SOURCES" == '@as []' ]; then
echo "initial GNOME startup, ibus default configuration applied"
ibus-daemon -d
timer=5
while [ "$SOURCES" == '@as []' ] && [ ${timer} -gt 0 ]; do
sleep 1
timer=$[${timer}-1]
SOURCES=$(gsettings get org.freedesktop.ibus.general preload-engines)
done
ibus exit
fi
# make sure G-S-D keyboard plugin is active # make sure G-S-D keyboard plugin is active
echo "ibus will be managed by GNOME." echo "ibus will be managed by GNOME."
gsettings set org.gnome.settings-daemon.plugins.keyboard active true gsettings set org.gnome.settings-daemon.plugins.keyboard active true