Add a patch from upstream fixing a memory-management crasher

This commit is contained in:
Owen W. Taylor 2010-11-15 14:27:50 -05:00
parent 3252b7ece5
commit 5603e8e516
2 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,31 @@
From 141b4ffe877948335ddf5e09722cb618935fa192 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Sat, 13 Nov 2010 23:11:42 +0100
Subject: [PATCH] StFocusManager: don't unref removed groups
It is not referencing them when adding, and also it is connecting
to the "destroy" signal, emitted on dispose, so there is no risk
of storing finalized objects.
https://bugzilla.gnome.org/show_bug.cgi?id=634781
---
src/st/st-focus-manager.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/st/st-focus-manager.c b/src/st/st-focus-manager.c
index 542fc5a..8c7bc9d 100644
--- a/src/st/st-focus-manager.c
+++ b/src/st/st-focus-manager.c
@@ -70,8 +70,7 @@ static void
st_focus_manager_init (StFocusManager *manager)
{
manager->priv = ST_FOCUS_MANAGER_GET_PRIVATE (manager);
- manager->priv->groups = g_hash_table_new_full (NULL, NULL,
- g_object_unref, NULL);
+ manager->priv->groups = g_hash_table_new (NULL, NULL);
}
static gboolean
--
1.7.3.2

View File

@ -1,6 +1,6 @@
Name: gnome-shell Name: gnome-shell
Version: 2.91.2 Version: 2.91.2
Release: 1%{?dist} Release: 2%{?dist}
Summary: Window management and application launching for GNOME Summary: Window management and application launching for GNOME
Group: User Interface/Desktops Group: User Interface/Desktops
@ -8,6 +8,10 @@ License: GPLv2+
URL: http://live.gnome.org/GnomeShell URL: http://live.gnome.org/GnomeShell
#VCS: git:git://git.gnome.org/gnome-shell #VCS: git:git://git.gnome.org/gnome-shell
Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/2.91/%{name}-%{version}.tar.bz2 Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/2.91/%{name}-%{version}.tar.bz2
# https://bugzilla.gnome.org/show_bug.cgi?id=634781
Patch1: StFocusManager-don-t-unref-removed-groups.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%define clutter_version 1.4.0 %define clutter_version 1.4.0
@ -66,6 +70,7 @@ easy to use experience.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .unreferenced-groups
%build %build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi; (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@ -129,6 +134,9 @@ gconftool-2 --makefile-install-rule \
glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||: glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
%changelog %changelog
* Mon Nov 15 2010 Owen Taylor <otaylor@redhat.com> - 2.91.2-2
- Add a patch from upstream fixing a memory-management crasher
* Tue Nov 9 2010 Owen Taylor <otaylor@redhat.com> - 2.91.2-1 * Tue Nov 9 2010 Owen Taylor <otaylor@redhat.com> - 2.91.2-1
- Update to 2.91.2 - Update to 2.91.2