fix a shell crash
This commit is contained in:
parent
f7f42fc953
commit
f19e91cd2e
26
clutter-xi2-crash.patch
Normal file
26
clutter-xi2-crash.patch
Normal file
@ -0,0 +1,26 @@
|
||||
diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
|
||||
index 73e99af..b5bf2e4 100644
|
||||
--- a/clutter/x11/clutter-device-manager-xi2.c
|
||||
+++ b/clutter/x11/clutter-device-manager-xi2.c
|
||||
@@ -733,12 +733,15 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
|
||||
|
||||
device = g_hash_table_lookup (manager_xi2->devices_by_id,
|
||||
GINT_TO_POINTER (xev->deviceid));
|
||||
- _clutter_input_device_reset_axes (device);
|
||||
- _clutter_input_device_reset_scroll_info (device);
|
||||
- translate_device_classes (backend_x11->xdpy,
|
||||
- device,
|
||||
- xev->classes,
|
||||
- xev->num_classes);
|
||||
+ if (device)
|
||||
+ {
|
||||
+ _clutter_input_device_reset_axes (device);
|
||||
+ _clutter_input_device_reset_scroll_info (device);
|
||||
+ translate_device_classes (backend_x11->xdpy,
|
||||
+ device,
|
||||
+ xev->classes,
|
||||
+ xev->num_classes);
|
||||
+ }
|
||||
}
|
||||
retval = CLUTTER_TRANSLATE_REMOVE;
|
||||
break;
|
@ -1,8 +1,11 @@
|
||||
Name: clutter
|
||||
Version: 1.13.4
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Open Source software library for creating rich graphical user interfaces
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=692707
|
||||
Patch0: oob-device-fix.patch
|
||||
|
||||
Group: Development/Libraries
|
||||
License: LGPLv2+
|
||||
URL: http://www.clutter-project.org/
|
||||
@ -64,6 +67,7 @@ This package contains documentation for clutter.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
|
||||
@ -108,6 +112,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
||||
%{_datadir}/gtk-doc/html/cally
|
||||
|
||||
%changelog
|
||||
* Wed Jan 30 2013 Matthias Clasen <mclasen@redhat.com> - 1.13.4-3
|
||||
- Fix a gnome-shell crash
|
||||
|
||||
* Fri Jan 25 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1.13.4-2
|
||||
- Rebuild for new cogl
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user