summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-04-26 19:36:21 +0000
committerPacho Ramos <pacho@gentoo.org>2013-04-26 19:36:21 +0000
commit4de2e6175b6ee58d4cb355734f8536aa3e9949a0 (patch)
tree3e05a753c1573ef7d536c5f94a8c174291dc2fee /x11-wm/mutter/files
parentApply upstream introspection patch to fix bug#464696. (diff)
downloadhistorical-4de2e6175b6ee58d4cb355734f8536aa3e9949a0.tar.gz
historical-4de2e6175b6ee58d4cb355734f8536aa3e9949a0.tar.bz2
historical-4de2e6175b6ee58d4cb355734f8536aa3e9949a0.zip
Fix glib dependency, bug #467334 by Pim Vullers; drop old.
Package-Manager: portage-2.1.11.62/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'x11-wm/mutter/files')
-rw-r--r--x11-wm/mutter/files/mutter-3.4.1-meta_window_move_frame-crash.patch53
-rw-r--r--x11-wm/mutter/files/mutter-3.8.0-build-redefine.patch22
-rw-r--r--x11-wm/mutter/files/mutter-3.8.0-font-crash.patch35
3 files changed, 0 insertions, 110 deletions
diff --git a/x11-wm/mutter/files/mutter-3.4.1-meta_window_move_frame-crash.patch b/x11-wm/mutter/files/mutter-3.4.1-meta_window_move_frame-crash.patch
deleted file mode 100644
index 1d23c1bf3064..000000000000
--- a/x11-wm/mutter/files/mutter-3.4.1-meta_window_move_frame-crash.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5e453f41befcd86f96ab0f0493fa64ac0f45d87b Mon Sep 17 00:00:00 2001
-From: "Owen W. Taylor" <otaylor@fishsoup.net>
-Date: Tue, 1 May 2012 13:40:08 -0400
-Subject: [PATCH] meta_window_move_frame(): fix crash when frame is NULL
-
-When meta_frame_calc_borders() was made to take a NULL frame argument,
-a crash was accidentally introduced into meta_window_move_frame().
-
-This partially reverts 8c1b2d5.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=675254
----
- src/core/window.c | 22 ++++++++++++----------
- 1 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/src/core/window.c b/src/core/window.c
-index 204bc0c..9e4b93c 100644
---- a/src/core/window.c
-+++ b/src/core/window.c
-@@ -5108,18 +5108,20 @@ meta_window_move_frame (MetaWindow *window,
- {
- int x = root_x_nw;
- int y = root_y_nw;
-- MetaFrameBorders borders;
--
-- meta_frame_calc_borders (window->frame, &borders);
-
-- /* root_x_nw and root_y_nw correspond to where the top of
-- * the visible frame should be. Offset by the distance between
-- * the origin of the window and the origin of the enclosing
-- * window decorations.
-- */
-- x += window->frame->child_x - borders.invisible.left;
-- y += window->frame->child_y - borders.invisible.top;
-+ if (window->frame)
-+ {
-+ MetaFrameBorders borders;
-+ meta_frame_calc_borders (window->frame, &borders);
-
-+ /* root_x_nw and root_y_nw correspond to where the top of
-+ * the visible frame should be. Offset by the distance between
-+ * the origin of the window and the origin of the enclosing
-+ * window decorations.
-+ */
-+ x += window->frame->child_x - borders.invisible.left;
-+ y += window->frame->child_y - borders.invisible.top;
-+ }
- meta_window_move (window, user_op, x, y);
- }
-
---
-1.7.8.6
-
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
deleted file mode 100644
index f62ffda33e75..000000000000
--- a/x11-wm/mutter/files/mutter-3.8.0-build-redefine.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index f345b2db0372..000000000000
--- a/x11-wm/mutter/files/mutter-3.8.0-font-crash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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