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

Package-Manager: portage-2.1.11.58/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 80 insertions, 7 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/Manifest b/x11-wm/mutter/Manifest
index 9d595cf5ca8a..258dd6ea1a9a 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -3,16 +3,18 @@ Hash: SHA256
 
 AUX mutter-3.2.1-ignore-shadow-and-padding.patch 2640 SHA256 765c04ba4d177789407a25d3cbdf358e3fa125170cfd37c53095372bc4ec883d SHA512 ba04a2265be9b2816ada33cb2dcf71ff02eb8667ada7c41139fc9e44e85a37030b8f0b7eb8064af2b6e691539a6dae5a0f8e66e06e2e3b803287eec798f13b52 WHIRLPOOL e85a2e27c9f036156dca68276793ea4bee5381ca43acdd85e7a37b4f577c6ae581be70866fa390a62fa4edf57d78b133185062642c96f30053a0b36f8c946893
 AUX mutter-3.4.1-meta_window_move_frame-crash.patch 1779 SHA256 5e8b565a223cab1055ecd65a85381ffd69f547b1efeb7b23ff69295869f6dfd8 SHA512 946b88a84b87d8f7a31120376633293e9dc3601a6aa1be846922f2333d0412a14c4b24712115bec88cc38cca027c88bd031cdb28d0be02ff2a736c3d891a791f WHIRLPOOL e8cfa08890a50d17acf5e004c2ddb265dc6c17c7549a53d462e93f15006b07970e7c0fccea647c3f02db3ded3cd7e9f031ebcfa9ed6d273fc5217c647938827f
+AUX mutter-3.8.0-build-redefine.patch 830 SHA256 8b3f0f879a959d17622ab278aab101e055613df14691c0a521ea82ac3ea15f34 SHA512 a145c79d019341771f00a4405c3d502f5aa931c5f7fb8d16667f760b75f6286fd65e721bf85b230583c27a56d00c45883f427a08999bfb0dcfe941878d70ef6c WHIRLPOOL ff8d582f33f6017acfbbdbac3e69ab8e2f2a6d1dcb62c52eef6d8ad852492bcf3df3c016e6d0cfb1ca546bb0e73498957c014e456674da1edb0d84d2e68e366d
+AUX mutter-3.8.0-font-crash.patch 1379 SHA256 ca10569f5179822351b136e129af5dd35376e0d6dd063efc9067233ca61087ce SHA512 257644194c6aadcf0f266badf9c46c025ec5e9cd6ad6a3cd75ac9ab69451ba77339b960a28451c128304306c310810f2ce86fbe985522f2d6e7a5ac841beb5ea WHIRLPOOL b08bb790d5258cf897b4fb2f26f715cbb4ce68151d9f93ce6ee25c6f8d0a6dce7288c46f83861df54698e1170ae03574641661175757cf893fcee02d623204fe
 DIST mutter-3.6.3.tar.xz 1619444 SHA256 aa1d558210d58f9a835a7e718a6b6eb8318ac8fb276c43234c47b1efde755c86 SHA512 e4b62b348fa993521b29b201a91f0682d862f5ddf08135e6e733c695562ca8a4e50500cfe2dd4f93c5b87198688e7913513cb1994b9b628acb10bec8ee0be404 WHIRLPOOL 3bb0f9d1d7ffdf6e9d064ced15d1120204dd319d3602f9ee88b5e44e95a101060c24354e93dd736341112648424cc879b38c36d837a64e69e4989f360d3b6906
 DIST mutter-3.8.0.tar.xz 1733000 SHA256 93ab8b7fac58582d9178766118046c4255a7f2f302c74391d7f9f32fde57aa1a SHA512 8e6309bd049a90fa61d8e87a68d34209b1e8d3b0725f1ebde2c0004e793e19a196a74b878f48b7c88282a96c3d6618cf6e9eabed02d49bc3305ab5df16eb0c9a WHIRLPOOL cf1f5f313f6a55b42188a5092cf0857aa2b2c1910169cb6ef3c5d93bf3163562f25efbf8e1639d4bec4d1bdc168aa03f77a6c63061971a058b408fb0df792680
 EBUILD mutter-3.6.3.ebuild 1984 SHA256 7d26010d27f5340c46e658f4d76222874800c291b2fa1b681cbd2cda7e5bc4df SHA512 f120c24232fa54d0e08b68d32c97405c6519f6aff87d855e740b314ce9dec231e380c8d895b6c9bf3df07f2d5f65257727d0444e7a293249331da183e72900c0 WHIRLPOOL 4abf5f1a187ea8dedbbdc0be96999f96d7fed63dc49cc5e9edf97ab230cb089310c9d162e1829f061f67dd1ef2300093d8479ff7353c85a7c9efa42e8d96ce99
-EBUILD mutter-3.8.0.ebuild 1949 SHA256 3ef9c4ef11c364b5bf9224de6231305d298123b3a2992e7379b7acdb12449fe9 SHA512 2e94b228dbaf47500dc54c7c42e60191273003494dd3ec7e5d00427c9155b2c25684711fa2053f90b067815001eac72a72edaa8b35818786463ffb500eb40625 WHIRLPOOL 50c50d1c27dec34779c041f217c7764ab1d58bff78d22e6dc1f84fe750667f257409b035d309ea1baef084cce4c8ee07f6c7690fd6343766092e3e24dc9e882d
-MISC ChangeLog 4222 SHA256 13a35c87c3b81f4f4388bd400ed25dff1bea4a8e8228049a454cc2a56d29742a SHA512 dd022027367c4ab057cec823b41368475742cd7e34a3f9e1241730d19dc9adf60f0fada67bad6befb448d0fa7668235d9f1c028663391df12365fce344e742d8 WHIRLPOOL e8e6f083fc757e4b39e40cccdf1923c12049db9fed4747c31a65ecdeaaaa25e1d6a79a3bc3ab203fabd5240d6ef88c232a25cb3293bbd00e5f6a14e50974b760
+EBUILD mutter-3.8.0.ebuild 2200 SHA256 d2c2a5ae68c1469ca084f45f2c64943f09ab2cd6563a3822c12368058d0197be SHA512 b12a1b3e8b530100be6c43547ca74e9c9c07e355cc9977e70b4d71112359f95f91bbb955eb6252b153ff9b9b2147a0aa2a3e7796316c64103bb81443b34e7d3d WHIRLPOOL e9b0db7432a56b27879239bebd6e78026d765a05f3b2c90a04cd55f7f1ced470d5f69848bf50ef77ad3532b1bbbaee32372b49fe8135fc742566d132180ec328
+MISC ChangeLog 4469 SHA256 02e146bf7431ad272ee441daccd033cc99f84d3e8e4842619bbc1b7770d52a26 SHA512 4da707aae7734269392a164a76f42447ee7c94449dffddeaab5f5e0f5172b789fbc3e83ffafa6c25b9b25acd36d4a8787c389d9911c7f2489ce9d056c310a0a4 WHIRLPOOL d405150640b229778212249d1eda67eba61e02761d1eee8f9dcc526ca6fa393d7825ac9f63837a2d62d76fb9fcd43494bb6aad1fc5e96d09306ebe1befd1da7c
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFXIUwACgkQ1fmVwcYIWAZBpwCcCEY9iQOyDeLKlpTeybH2qC1Q
-+nUAn0PejntLoWqjED7QNhv8L9tRjm8B
-=e3gY
+iEYEAREIAAYFAlFYON4ACgkQCaWpQKGI+9Tw6gCeKcJ5caZDQuX1cinlP3VpFdvh
+Db4AnRVReKtjXXnVhsWvd8V+7FnRHLGM
+=ruXC
 -----END PGP SIGNATURE-----
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
 }