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

Added ibus-xx-segv-reg-prop.patch to avoid segv

Browse Source
This commit is contained in:
Takao Fujiwara 2012-09-14 21:21:24 +09:00
parent fac47562a7
commit c0fd76cd79
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ibus-xx-segv-reg-prop.patch Normal file
View File

@ -0,0 +1,15 @@
--- ibus-1.4.99.20120914/bus/ibusimpl.c.orig 2012-09-14 21:11:37.627075831 +0900
+++ ibus-1.4.99.20120914/bus/ibusimpl.c 2012-09-14 21:12:41.632072691 +0900
@@ -282,8 +282,10 @@ _dbus_name_owner_changed_cb (BusDBusImpl
if (engine != NULL) {
IBusPropList *prop_list =
bus_engine_proxy_get_properties (engine);
- bus_panel_proxy_register_properties (ibus->panel,
- prop_list);
+ if (prop_list) {
+ bus_panel_proxy_register_properties (ibus->panel,
+ prop_list);
+ }
}
}
}

7
ibus.spec
View File

@ -30,7 +30,7 @@
Name: ibus Name: ibus
Version: 1.4.99.20120914 Version: 1.4.99.20120914
Release: 1%{?dist} Release: 2%{?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
@ -39,6 +39,7 @@ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
Source1: xinput-ibus Source1: xinput-ibus
Source2: http://fujiwara.fedorapeople.org/ibus/gnome-shell/ibus-gjs-%{ibus_gjs_version}.tar.gz Source2: http://fujiwara.fedorapeople.org/ibus/gnome-shell/ibus-gjs-%{ibus_gjs_version}.tar.gz
# Patch0: ibus-HEAD.patch # Patch0: ibus-HEAD.patch
Patch0: ibus-xx-segv-reg-prop.patch
Patch1: ibus-810211-no-switch-by-no-trigger.patch Patch1: ibus-810211-no-switch-by-no-trigger.patch
Patch2: ibus-541492-xkb.patch Patch2: ibus-541492-xkb.patch
Patch3: ibus-530711-preload-sys.patch Patch3: ibus-530711-preload-sys.patch
@ -211,6 +212,7 @@ zcat %SOURCE2 | tar xf -
%endif %endif
# patch0 -p1 # patch0 -p1
%patch0 -p1
%patch92 -p1 -b .g-s-preedit %patch92 -p1 -b .g-s-preedit
cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c ||
%patch1 -p1 -b .noswitch %patch1 -p1 -b .noswitch
@ -473,6 +475,9 @@ dconf update
%{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/*
%changelog %changelog
* Fri Sep 14 2012 Takao Fujiwara <tfujiwar@redhat.com> - 1.4.99.20120914-2
- Added ibus-xx-segv-reg-prop.patch to avoid segv
* Fri Sep 14 2012 Takao Fujiwara <tfujiwar@redhat.com> - 1.4.99.20120914-1 * Fri Sep 14 2012 Takao Fujiwara <tfujiwar@redhat.com> - 1.4.99.20120914-1
- Bumped to 1.4.99.20120914 - Bumped to 1.4.99.20120914