rpms/ibus
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Added ibus-1136623-lost-by-another-focus.patch to fix #1136623

Browse Source
This commit is contained in:
Takao Fujiwara 2014-12-08 19:50:58 +09:00
parent 727f9412b9
commit 99c3e74f66
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ibus-1136623-lost-by-another-focus.patch Normal file
View File

@ -0,0 +1,24 @@
--- ibus-1.5.8/client/gtk2/ibusimcontext.c.orig 2014-10-16 18:35:07.229056767 +0900
+++ ibus-1.5.8/client/gtk2/ibusimcontext.c 2014-10-17 12:36:29.138998318 +0900
@@ -857,12 +857,7 @@ ibus_im_context_focus_in (GtkIMContext *
}
}
- if (_focus_im_context != NULL) {
- g_assert (_focus_im_context != context);
- gtk_im_context_focus_out (_focus_im_context);
- g_assert (_focus_im_context == NULL);
- }
- else {
+ if (_focus_im_context == NULL) {
/* focus out fake context */
if (_fake_context != NULL) {
ibus_input_context_focus_out (_fake_context);
@@ -903,7 +898,6 @@ ibus_im_context_focus_out (GtkIMContext
return;
}
- g_assert (context == _focus_im_context);
g_object_remove_weak_pointer ((GObject *) context,
(gpointer *) &_focus_im_context);
_focus_im_context = NULL;

8
ibus.spec
View File

@ -28,7 +28,7 @@
Name: ibus Name: ibus
Version: 1.5.9 Version: 1.5.9
Release: 6%{?dist} Release: 7%{?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
@ -41,6 +41,7 @@ Source3: https://fujiwara.fedorapeople.org/ibus/po/%{name}-po-%{version}-
# Patch0: %%{name}-HEAD.patch # Patch0: %%{name}-HEAD.patch
Patch0: %{name}-HEAD.patch Patch0: %{name}-HEAD.patch
Patch1: %{name}-xx-increase-timeout.patch Patch1: %{name}-xx-increase-timeout.patch
Patch2: %{name}-1136623-lost-by-another-focus.patch
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: libtool BuildRequires: libtool
@ -224,7 +225,9 @@ zcat %SOURCE3 | tar xfv -
# %%patch0 -p1 # %%patch0 -p1
%patch0 -p1 %patch0 -p1
%patch1 -p1 -b .tmout %patch1 -p1 -b .tmout
%patch2 -p1 -b .fout
# cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || # cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c ||
cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c ||
%build %build
#autoreconf -f -i -v #autoreconf -f -i -v
@ -411,6 +414,9 @@ fi
%{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/*
%changelog %changelog
* Mon Dec 08 2014 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.9-7
- Added ibus-1136623-lost-by-another-focus.patch to fix #1136623
* Mon Dec 08 2014 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.9-6 * Mon Dec 08 2014 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.9-6
- Updated ibus-xx-increase-timeout.patch to fix #1163722 - Updated ibus-xx-increase-timeout.patch to fix #1163722
- Updated ibus-HEAD.patch for upstream #1747, #1748, #1753 - Updated ibus-HEAD.patch for upstream #1747, #1748, #1753