Fix glib dependency, bug #467334 by Pim Vullers; drop old.

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

6 files changed, 12 insertions, 195 deletions

diff --git a/x11-wm/mutter/ChangeLog b/x11-wm/mutter/ChangeLog
index f094026b9bdb..e61527a24c21 100644
--- a/x11-wm/mutter/ChangeLog
+++ b/x11-wm/mutter/ChangeLog
@@ -1,6 +1,13 @@
 # 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.25 2013/04/20 09:55:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.26 2013/04/26 19:36:11 pacho Exp $
+
+  26 Apr 2013; Pacho Ramos <pacho@gentoo.org>
+  -files/mutter-3.4.1-meta_window_move_frame-crash.patch,
+  -files/mutter-3.8.0-build-redefine.patch,
+  -files/mutter-3.8.0-font-crash.patch, -mutter-3.8.0.ebuild,
+  mutter-3.8.1.ebuild:
+  Fix glib dependency, bug #467334 by Pim Vullers; drop old.
 
 *mutter-3.8.1 (20 Apr 2013)
 
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
diff --git a/x11-wm/mutter/mutter-3.8.0.ebuild b/x11-wm/mutter/mutter-3.8.0.ebuild
deleted file mode 100644
index 17cb33644765..000000000000
--- a/x11-wm/mutter/mutter-3.8.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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.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"
-HOMEPAGE="http://git.gnome.org/browse/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.3.7:3[X,introspection?]
-	>=dev-libs/glib-2.25.11:2
-	>=media-libs/clutter-1.13.5:1.0[introspection?]
-	>=media-libs/cogl-1.13.3:1.0=[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/startup-notification-0.7
-	>=x11-libs/libXcomposite-0.2
-	>=gnome-base/gsettings-desktop-schemas-3.7.3[introspection?]
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-libs/libXi-1.6.2
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-shape
-		--enable-sm
-		--enable-startup-notification
-		--enable-xsync
-		--enable-verbose-mode
-		--enable-compile-warnings=maximum
-		--with-libcanberra
-		$(use_enable introspection)"
-
-	# 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
-}
diff --git a/x11-wm/mutter/mutter-3.8.1.ebuild b/x11-wm/mutter/mutter-3.8.1.ebuild
index 37f3b3cf9212..7945c2b9ae47 100644
--- a/x11-wm/mutter/mutter-3.8.1.ebuild
+++ b/x11-wm/mutter/mutter-3.8.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2013/04/20 09:55:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.8.1.ebuild,v 1.2 2013/04/26 19:36:11 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -15,11 +15,12 @@ SLOT="0"
 IUSE="+introspection test"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
 	>=x11-libs/cairo-1.10[X]
 	x11-libs/gdk-pixbuf:2[introspection?]
 	>=x11-libs/gtk+-3.3.7:3[X,introspection?]
-	>=dev-libs/glib-2.25.11:2
+	>=dev-libs/glib-2.36.0:2
 	>=media-libs/clutter-1.13.5:1.0[introspection?]
 	>=media-libs/cogl-1.13.3:1.0=[introspection?]
 	>=media-libs/libcanberra-0.26[gtk3]