[clutter] fix a shell crash
Matthias Clasen
mclasen at fedoraproject.org
Wed Jan 30 16:16:02 UTC 2013
commit f19e91cd2e9b19768a022e1cedb8066763694d84
Author: Matthias Clasen <mclasen at redhat.com>
Date: Wed Jan 30 11:16:30 2013 -0500
fix a shell crash
clutter-xi2-crash.patch | 26 ++++++++++++++++++++++++++
clutter.spec | 9 ++++++++-
2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/clutter-xi2-crash.patch b/clutter-xi2-crash.patch
new file mode 100644
index 0000000..219144b
--- /dev/null
+++ b/clutter-xi2-crash.patch
@@ -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;
diff --git a/clutter.spec b/clutter.spec
index ead9bb1..b82092e 100644
--- a/clutter.spec
+++ b/clutter.spec
@@ -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 at redhat.com> - 1.13.4-3
+- Fix a gnome-shell crash
+
* Fri Jan 25 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.13.4-2
- Rebuild for new cogl
More information about the scm-commits
mailing list