rpms/clutter
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix a crash

Browse Source
This commit is contained in:
Matthias Clasen 2013-09-20 05:43:34 -04:00
parent 4a212bc4cb
commit dddc1af407
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clutter.spec
View File

@ -6,7 +6,7 @@
Name: clutter
Version: 1.15.94
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Open Source software library for creating rich graphical user interfaces
Group: Development/Libraries
@ -14,6 +14,9 @@ License: LGPLv2+
URL: http://www.clutter-project.org/
Source0: http://download.gnome.org/sources/clutter/1.15/clutter-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=708439
Patch0: no-stage-crash.patch
BuildRequires: glib2-devel mesa-libGL-devel pkgconfig pango-devel
BuildRequires: cairo-gobject-devel gdk-pixbuf2-devel atk-devel
BuildRequires: cogl-devel >= 1.15.1
@ -79,6 +82,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;
@ -130,6 +134,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_datadir}/gtk-doc/html/cally
%changelog
* Fri Sep 20 2013 Matthias Clasen <mclasen@redhat.com> - 1.15.94-2
- Fix a shell crash
* Thu Sep 19 2013 Kalev Lember <kalevlember@gmail.com> - 1.15.94-1
- Update to 1.15.94

32
no-stage-crash.patch Normal file
View File

@ -0,0 +1,32 @@
From 2f90e355310801f78a1be48515c8cf740f3291af Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn@redhat.com>
Date: Fri, 20 Sep 2013 10:24:42 +0200
Subject: [PATCH] clutter-xi2: don't access the stage if we don't have one
For DeviceChanged and HierarchyChanged events we don't have the
stage, so we can't access the scale factor on it.
Fixes hotplugging of devices which would happen when switching VTs.
https://bugzilla.gnome.org/show_bug.cgi?id=708439
---
clutter/x11/clutter-device-manager-xi2.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
index 8f9133f..67f4ce5 100644
--- a/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/x11/clutter-device-manager-xi2.c
@@ -774,7 +774,10 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
event->any.stage = stage;
- window_scale = stage_x11->scale_factor;
+ if (stage_x11)
+ window_scale = stage_x11->scale_factor;
+ else
+ window_scale = 0;
switch (xi_event->evtype)
{
--
1.8.3.1