Added ibus-688034-fedora-g-s.patch for Fedora workaround.

This commit is contained in:
Takao Fujiwara 2011-03-23 13:33:13 +09:00
parent 1640e30cdc
commit 38ee625d0a
2 changed files with 21 additions and 2 deletions

View File

@ -0,0 +1,14 @@
--- ibus/ui/gtk/main.py.bak 2011-03-23 13:15:53.150298531 +0900
+++ ibus/ui/gtk/main.py 2011-03-23 13:16:35.336275938 +0900
@@ -114,8 +114,9 @@ def main():
print_help(sys.stderr, 1)
if stop_by_shell and ibus.is_running_gnome_shell():
- print "Exit because GNOME-Shell is running"
- sys.exit()
+ if os.path.exists('/usr/share/gnome-shell/js/ui/status/ibus'):
+ print "Exit because GNOME-Shell is running"
+ sys.exit()
if daemonize:
if os.fork():

View File

@ -13,7 +13,7 @@
Name: ibus Name: ibus
Version: 1.3.99.20110228 Version: 1.3.99.20110228
Release: 3%{?dist} Release: 4%{?dist}
Summary: Intelligent Input Bus for Linux OS Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -30,6 +30,8 @@ Patch3: ibus-530711-preload-sys.patch
Patch4: ibus-657165-panel-libs.patch Patch4: ibus-657165-panel-libs.patch
# This will be removed after the new gnome-shell is integrated. # This will be removed after the new gnome-shell is integrated.
Patch99: ibus-675503-gnome-shell-workaround.patch Patch99: ibus-675503-gnome-shell-workaround.patch
# This will be removed after the gnome-shell ibus patch is integrated.
Patch100: ibus-688034-fedora-g-s.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -154,6 +156,8 @@ cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c
%endif %endif
%patch3 -p1 -b .preload-sys %patch3 -p1 -b .preload-sys
%patch4 -p1 -b .panel-libs %patch4 -p1 -b .panel-libs
# workaround until the ibus feature is integrated into gnome-shell.
%patch100 -p1 -b .fedora-g-s
%build %build
%if %have_libxkbfile %if %have_libxkbfile
@ -327,10 +331,11 @@ fi
%{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/*
%changelog %changelog
* Thu Mar 17 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110228-3 * Wed Mar 23 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110228-4
- Updated ibus-HEAD.patch - Updated ibus-HEAD.patch
Fixed Bug 683484 - Timed out SetEngine when select an engine from panel. Fixed Bug 683484 - Timed out SetEngine when select an engine from panel.
- Updated ibus-657165-panel-libs.patch - Updated ibus-657165-panel-libs.patch
- Added ibus-688034-fedora-g-s.patch for Fedora workaround.
* Thu Mar 10 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110228-1 * Thu Mar 10 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110228-1
- Updated to 1.3.99.20110228 - Updated to 1.3.99.20110228