Accepting request 76661 from GNOME:Factory

Add patch to fix crash in all apps (forwarded request 76639 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/76661
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=20
This commit is contained in:
Sascha Peilicke 2011-07-21 13:56:50 +00:00 committed by Git OBS Bridge
commit c02806360e
3 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,27 @@
commit 7741f5a09a841c4dc93727b990defc303510ed2c
Author: Florian Müllner <fmuellner@gnome.org>
Date: Fri Jul 15 20:45:59 2011 +0200
theming-engine: Adjust register_property() to recent glib change
GParamSpec now uses an intern'ed string for 'name', so the code
in gtk_theming_engine_register_property() which prefixes the name
with a namespace has to be adjusted.
https://bugzilla.gnome.org/show_bug.cgi?id=654695
diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index 66adad6..64a2bc5 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -391,8 +391,8 @@ gtk_theming_engine_register_property (const gchar *name_space,
/* FIXME: hack hack hack, replacing pspec->name to include namespace */
name = g_strdup_printf ("-%s-%s", name_space, pspec->name);
- g_free (pspec->name);
- pspec->name = name;
+ pspec->name = (char *)g_intern_string (name);
+ g_free (name);
gtk_style_properties_register_property (parse_func, pspec);
}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 21 13:10:03 CEST 2011 - vuntz@opensuse.org
- Add gtk3-fix-crash-recent-glib.patch: this fixes a crash in all
apps with glib 2.29.12. Taken from git.
-------------------------------------------------------------------
Wed Jul 6 16:05:11 CEST 2011 - vuntz@opensuse.org

View File

@ -43,6 +43,8 @@ Patch1: gtk3-path-local.patch
Patch2: gtk3-bnc129753-localize-font-style-name.patch
# PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch
# PATCH-FIX-UPSTREAM gtk3-fix-crash-recent-glib.patch vuntz@opensuse.org -- Fix crash with glib 2.29.12, taken from git
Patch4: gtk3-fix-crash-recent-glib.patch
BuildRequires: fdupes
BuildRequires: cups-devel
BuildRequires: gnome-patch-translation
@ -289,6 +291,7 @@ cp -a %{S:1} .
%patch1 -p0
%patch2 -p1
%patch3 -p1
%patch4 -p1
gnome-patch-translation-update
%build