| 1 |
pacho 13/03/31 13:23:41 |
| 2 |
|
| 3 |
Added: mutter-3.8.0-build-redefine.patch |
| 4 |
mutter-3.8.0-font-crash.patch |
| 5 |
Log: |
| 6 |
Apply two upstream patches fixing a crash and a build failure (#463940 by Torsten Stets) |
| 7 |
|
| 8 |
(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 x11-wm/mutter/files/mutter-3.8.0-build-redefine.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/mutter/files/mutter-3.8.0-build-redefine.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/mutter/files/mutter-3.8.0-build-redefine.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: mutter-3.8.0-build-redefine.patch |
| 17 |
=================================================================== |
| 18 |
From 992a15e6401114a67450dcf10b080044caab6b31 Mon Sep 17 00:00:00 2001 |
| 19 |
From: Jasper Lievisse Adriaanse <jasper@××××××.nl> |
| 20 |
Date: Fri, 29 Mar 2013 15:59:26 +0000 |
| 21 |
Subject: Don't redefine MetaBackgroundPrivate, fixing a build issue: |
| 22 |
|
| 23 |
compositor/meta-background.c:64: error: redefinition of typedef 'MetaBackgroundPrivate' |
| 24 |
./meta/meta-background.h:51: error: previous declaration of 'MetaBackgroundPrivate' was here |
| 25 |
--- |
| 26 |
diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c |
| 27 |
index d15b06c..727000f 100644 |
| 28 |
--- a/src/compositor/meta-background.c |
| 29 |
+++ b/src/compositor/meta-background.c |
| 30 |
@@ -61,7 +61,6 @@ |
| 31 |
* |
| 32 |
* This object provides a ClutterContent object to assist in sharing between actors. |
| 33 |
*/ |
| 34 |
-typedef struct _MetaBackgroundPrivate MetaBackgroundPrivate; |
| 35 |
|
| 36 |
struct _MetaBackgroundPrivate |
| 37 |
{ |
| 38 |
-- |
| 39 |
cgit v0.9.1 |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 x11-wm/mutter/files/mutter-3.8.0-font-crash.patch |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/mutter/files/mutter-3.8.0-font-crash.patch?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/mutter/files/mutter-3.8.0-font-crash.patch?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: mutter-3.8.0-font-crash.patch |
| 49 |
=================================================================== |
| 50 |
From f1620abfad0caf85b5958e32736accb3fecef7f1 Mon Sep 17 00:00:00 2001 |
| 51 |
From: Bastien Nocera <hadess@××××××.net> |
| 52 |
Date: Fri, 29 Mar 2013 07:38:46 +0000 |
| 53 |
Subject: ui: Fix crash getting default font |
| 54 |
|
| 55 |
A correctly constructed GtkStyleContext must have its screen |
| 56 |
and widget paths set. Getting the frame font caused crashes |
| 57 |
on some systems because those were not correctly initialised. |
| 58 |
|
| 59 |
https://bugzilla.gnome.org/show_bug.cgi?id=696814 |
| 60 |
--- |
| 61 |
diff --git a/src/ui/ui.c b/src/ui/ui.c |
| 62 |
index 2f2fc3a..af28263 100644 |
| 63 |
--- a/src/ui/ui.c |
| 64 |
+++ b/src/ui/ui.c |
| 65 |
@@ -744,7 +744,17 @@ meta_ui_theme_get_frame_borders (MetaUI *ui, |
| 66 |
|
| 67 |
if (!font_desc) |
| 68 |
{ |
| 69 |
+ GdkDisplay *display = gdk_x11_lookup_xdisplay (ui->xdisplay); |
| 70 |
+ GdkScreen *screen = gdk_display_get_screen (display, XScreenNumberOfScreen (ui->xscreen)); |
| 71 |
+ GtkWidgetPath *widget_path; |
| 72 |
+ |
| 73 |
style = gtk_style_context_new (); |
| 74 |
+ gtk_style_context_set_screen (style, screen); |
| 75 |
+ widget_path = gtk_widget_path_new (); |
| 76 |
+ gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW); |
| 77 |
+ gtk_style_context_set_path (style, widget_path); |
| 78 |
+ gtk_widget_path_free (widget_path); |
| 79 |
+ |
| 80 |
gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, "font", &free_font_desc, NULL); |
| 81 |
font_desc = (const PangoFontDescription *) free_font_desc; |
| 82 |
} |
| 83 |
-- |
| 84 |
cgit v0.9.1 |
Archives