update to mutter-3.8.1

This commit is contained in:
jasper 2013-04-17 09:55:40 +00:00
parent 6d35f0456c
commit b5fb416d6c
4 changed files with 4 additions and 54 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.19 2013/04/16 13:17:02 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.20 2013/04/17 09:55:40 jasper Exp $
COMMENT= window and compositing manager
GNOME_PROJECT= mutter
GNOME_VERSION= 3.8.0
REVISION= 1
GNOME_VERSION= 3.8.1
SHARED_LIBS += mutter 0.1 # 0.0

View File

@ -1,2 +1,2 @@
SHA256 (gnome/mutter-3.8.0.tar.xz) = k6uLf6xYWC2ReHZhGARsQlWn8vMCx0OR1/nzL95Xqho=
SIZE (gnome/mutter-3.8.0.tar.xz) = 1733000
SHA256 (gnome/mutter-3.8.1.tar.xz) = pBqZJiDn5RtqNHCdsmohXobwOSfoKLTbA+kRHZJe9S8=
SIZE (gnome/mutter-3.8.1.tar.xz) = 1733380

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_compositor_meta-background_c,v 1.1 2013/03/29 16:46:14 jasper Exp $
commit 992a15e6401114a67450dcf10b080044caab6b31
Author: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Fri Mar 29 16:59:26 2013 +0100
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
--- src/compositor/meta-background.c.orig Fri Mar 29 16:49:23 2013
+++ src/compositor/meta-background.c Fri Mar 29 16:49:35 2013
@@ -61,7 +61,6 @@
*
* This object provides a ClutterContent object to assist in sharing between actors.
*/
-typedef struct _MetaBackgroundPrivate MetaBackgroundPrivate;
struct _MetaBackgroundPrivate
{

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-src_ui_ui_c,v 1.1 2013/03/29 16:46:14 jasper Exp $
commit f1620abfad0caf85b5958e32736accb3fecef7f1
Author: Bastien Nocera <hadess@hadess.net>
Date: Fri Mar 29 08:38:46 2013 +0100
ui: Fix crash getting default font
--- src/ui/ui.c.orig Fri Mar 1 16:11:17 2013
+++ src/ui/ui.c Fri Mar 29 17:00:54 2013
@@ -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;
}