[ibus] Added ibus-688034-fedora-g-s.patch for Fedora workaround.
Takao Fujiwara
fujiwara at fedoraproject.org
Wed Mar 23 04:33:40 UTC 2011
commit 38ee625d0aedb16c7d7afd80322cef904c43aca8
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date: Wed Mar 23 13:33:13 2011 +0900
Added ibus-688034-fedora-g-s.patch for Fedora workaround.
ibus-688034-fedora-g-s.patch | 14 ++++++++++++++
ibus.spec | 9 +++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/ibus-688034-fedora-g-s.patch b/ibus-688034-fedora-g-s.patch
new file mode 100644
index 0000000..026fb2c
--- /dev/null
+++ b/ibus-688034-fedora-g-s.patch
@@ -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():
diff --git a/ibus.spec b/ibus.spec
index d96152f..bf7a76c 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -13,7 +13,7 @@
Name: ibus
Version: 1.3.99.20110228
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@@ -30,6 +30,8 @@ Patch3: ibus-530711-preload-sys.patch
Patch4: ibus-657165-panel-libs.patch
# This will be removed after the new gnome-shell is integrated.
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)
@@ -154,6 +156,8 @@ cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c
%endif
%patch3 -p1 -b .preload-sys
%patch4 -p1 -b .panel-libs
+# workaround until the ibus feature is integrated into gnome-shell.
+%patch100 -p1 -b .fedora-g-s
%build
%if %have_libxkbfile
@@ -327,10 +331,11 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
-* Thu Mar 17 2011 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.99.20110228-3
+* Wed Mar 23 2011 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.99.20110228-4
- Updated ibus-HEAD.patch
Fixed Bug 683484 - Timed out SetEngine when select an engine from panel.
- Updated ibus-657165-panel-libs.patch
+- Added ibus-688034-fedora-g-s.patch for Fedora workaround.
* Thu Mar 10 2011 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.99.20110228-1
- Updated to 1.3.99.20110228
More information about the scm-commits
mailing list