Fix gnome-shell crashing in gdm mode

https://bugzilla.redhat.com/show_bug.cgi?id=1276833
This commit is contained in:
Kalev Lember 2015-11-01 00:38:44 +01:00
parent f9c73dc28c
commit 1be3f380c0
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From df0b465e76305e011c5106d78b6fd19891db900d Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Sun, 1 Nov 2015 00:21:10 +0100
Subject: [PATCH] StTextureCache: Fix a fallout from GTask port
Set the task data that load_pixbuf_thread func expects.
https://bugzilla.gnome.org/show_bug.cgi?id=757418
---
src/st/st-texture-cache.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c
index d4a4ee9..88c6bf3 100644
--- a/src/st/st-texture-cache.c
+++ b/src/st/st-texture-cache.c
@@ -575,6 +575,7 @@ load_texture_async (StTextureCache *cache,
if (data->file)
{
GTask *task = g_task_new (cache, NULL, on_pixbuf_loaded, data);
+ g_task_set_task_data (task, data, NULL);
g_task_run_in_thread (task, load_pixbuf_thread);
g_object_unref (task);
}
--
2.5.0

View File

@ -1,6 +1,6 @@
Name: gnome-shell
Version: 3.19.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Window management and application launching for GNOME
Group: User Interface/Desktops
@ -13,6 +13,8 @@ Source0: http://download.gnome.org/sources/gnome-shell/3.19/%{name}-%{ver
# Replace Epiphany with Firefox in the default favourite apps list
Patch1: gnome-shell-favourite-apps-firefox.patch
Patch2: 0001-appFavorites-Add-gnome-terminal-to-the-rename-list.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=757418
Patch3: 0001-StTextureCache-Fix-a-fallout-from-GTask-port.patch
%define clutter_version 1.21.5
%define gnome_bluetooth_version 1:3.9.0
@ -120,6 +122,7 @@ easy to use experience.
%setup -q
%patch1 -p1 -b .firefox
%patch2 -p1 -b .terminal-renamed-desktop-file
%patch3 -p1
%build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@ -187,6 +190,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
%exclude %{_datadir}/gtk-doc
%changelog
* Sun Nov 01 2015 Kalev Lember <klember@redhat.com> - 3.19.1-2
- Fix gnome-shell crashing in gdm mode (#1276833)
* Thu Oct 29 2015 Florian Müllner <fmuellner@redhat.com> - 3.19.1-1
- Update to 3.19.1