Apply two upstream patches fixing a crash and a build failure (#463940 by Torsten Stets)

(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 73 insertions, 2 deletions

diff --git a/x11-wm/mutter/ChangeLog b/x11-wm/mutter/ChangeLog
index a43138a4ac19..dd5c691ca597 100644
--- a/x11-wm/mutter/ChangeLog
+++ b/x11-wm/mutter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/mutter
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.23 2013/03/30 17:30:51 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.24 2013/03/31 13:23:41 pacho Exp $
+
+  31 Mar 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/mutter-3.8.0-build-redefine.patch,
+  +files/mutter-3.8.0-font-crash.patch, mutter-3.8.0.ebuild:
+  Apply two upstream patches fixing a crash and a build failure (#463940 by
+  Torsten Stets)
 
   30 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
   -files/mutter-3.2.2-disable-introspection.patch,
diff --git a/x11-wm/mutter/files/mutter-3.8.0-build-redefine.patch b/x11-wm/mutter/files/mutter-3.8.0-build-redefine.patch
new file mode 100644
index 000000000000..f62ffda33e75
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-3.8.0-build-redefine.patch
@@ -0,0 +1,22 @@
+From 992a15e6401114a67450dcf10b080044caab6b31 Mon Sep 17 00:00:00 2001
+From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
+Date: Fri, 29 Mar 2013 15:59:26 +0000
+Subject: Don't redefine MetaBackgroundPrivate, fixing a build issue:
+
+compositor/meta-background.c:64: error: redefinition of typedef 'MetaBackgroundPrivate'
+./meta/meta-background.h:51: error: previous declaration of 'MetaBackgroundPrivate' was here
+---
+diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c
+index d15b06c..727000f 100644
+--- a/src/compositor/meta-background.c
++++ b/src/compositor/meta-background.c
+@@ -61,7 +61,6 @@
+  *
+  * This object provides a ClutterContent object to assist in sharing between actors.
+  */
+-typedef struct _MetaBackgroundPrivate MetaBackgroundPrivate;
+ 
+ struct _MetaBackgroundPrivate
+ {
+--
+cgit v0.9.1
diff --git a/x11-wm/mutter/files/mutter-3.8.0-font-crash.patch b/x11-wm/mutter/files/mutter-3.8.0-font-crash.patch
new file mode 100644
index 000000000000..f345b2db0372
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-3.8.0-font-crash.patch
@@ -0,0 +1,35 @@
+From f1620abfad0caf85b5958e32736accb3fecef7f1 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 29 Mar 2013 07:38:46 +0000
+Subject: ui: Fix crash getting default font
+
+A correctly constructed GtkStyleContext must have its screen
+and widget paths set. Getting the frame font caused crashes
+on some systems because those were not correctly initialised.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696814
+---
+diff --git a/src/ui/ui.c b/src/ui/ui.c
+index 2f2fc3a..af28263 100644
+--- a/src/ui/ui.c
++++ b/src/ui/ui.c
+@@ -744,7 +744,17 @@ meta_ui_theme_get_frame_borders (MetaUI *ui,
+ 
+       if (!font_desc)
+         {
++          GdkDisplay *display = gdk_x11_lookup_xdisplay (ui->xdisplay);
++          GdkScreen *screen = gdk_display_get_screen (display, XScreenNumberOfScreen (ui->xscreen));
++          GtkWidgetPath *widget_path;
++
+           style = gtk_style_context_new ();
++          gtk_style_context_set_screen (style, screen);
++          widget_path = gtk_widget_path_new ();
++          gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW);
++          gtk_style_context_set_path (style, widget_path);
++          gtk_widget_path_free (widget_path);
++
+           gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, "font", &free_font_desc, NULL);
+           font_desc = (const PangoFontDescription *) free_font_desc;
+         }
+--
+cgit v0.9.1
diff --git a/x11-wm/mutter/mutter-3.8.0.ebuild b/x11-wm/mutter/mutter-3.8.0.ebuild
index db402d8503d9..17cb33644765 100644
--- a/x11-wm/mutter/mutter-3.8.0.ebuild
+++ b/x11-wm/mutter/mutter-3.8.0.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.8.0.ebuild,v 1.1 2013/03/28 22:31:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.8.0.ebuild,v 1.2 2013/03/31 13:23:41 pacho Exp $
 
 EAPI="5"
+GCONF_DEBUG="yes"
+
 inherit eutils gnome2
 
 DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
@@ -69,5 +71,11 @@ src_prepare() {
 	# Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes)
 	epatch "${FILESDIR}/${PN}-3.2.1-ignore-shadow-and-padding.patch"
 
+	# Fix crash getting default font (from master)
+	epatch "${FILESDIR}/${PN}-3.8.0-font-crash.patch"
+
+	# Don't redefine MetaBackgroundPrivate, fixing a build issue (from master)
+	epatch "${FILESDIR}/${PN}-3.8.0-build-redefine.patch"
+
 	gnome2_src_prepare
 }