Version bump for gnome-3.4. Settings moved from gconf to gsettings. Drop old.

(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)

3 files changed, 71 insertions, 9 deletions

diff --git a/x11-wm/mutter/ChangeLog b/x11-wm/mutter/ChangeLog
index 05a1554df44d..53b2cff75934 100644
--- a/x11-wm/mutter/ChangeLog
+++ b/x11-wm/mutter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/mutter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.8 2012/05/04 08:58:58 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.9 2012/05/14 00:02:26 tetromino Exp $
+
+*mutter-3.4.1-r1 (14 May 2012)
+
+  14 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -mutter-3.2.1-r1.ebuild, +mutter-3.4.1-r1.ebuild,
+  +files/mutter-3.4.1-meta_window_move_frame-crash.patch:
+  Version bump for gnome-3.4. Settings moved from gconf to gsettings. Drop old.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> mutter-3.2.1-r1.ebuild,
   mutter-3.2.2.ebuild, mutter-3.2.2-r1.ebuild:
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
new file mode 100644
index 000000000000..1d23c1bf3064
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-3.4.1-meta_window_move_frame-crash.patch
@@ -0,0 +1,53 @@
+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/mutter-3.2.1-r1.ebuild b/x11-wm/mutter/mutter-3.4.1-r1.ebuild
index 918d6d110d2d..83746f26e898 100644
--- a/x11-wm/mutter/mutter-3.2.1-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.4.1-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.2.1-r1.ebuild,v 1.2 2012/05/04 08:58:58 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.4.1-r1.ebuild,v 1.1 2012/05/14 00:02:26 tetromino Exp $
 
 EAPI="4"
-GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
@@ -19,13 +18,14 @@ KEYWORDS="~amd64 ~x86"
 COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
 	>=x11-libs/cairo-1.10[X]
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=gnome-base/gconf-2:2
-	>=dev-libs/glib-2.14:2
-	>=media-libs/clutter-1.7.5:1.0
+	>=x11-libs/gtk+-3.3.7:3[introspection?]
+	>=dev-libs/glib-2.25.11:2
+	>=media-libs/clutter-1.9.10:1.0
+	>=media-libs/cogl-1.9.6:1.0
 	>=media-libs/libcanberra-0.26[gtk3]
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
+	>=gnome-base/gsettings-desktop-schemas-3.3.0
 
 	x11-libs/libICE
 	x11-libs/libSM
@@ -44,9 +44,9 @@ COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
 "
 DEPEND="${COMMON_DEPEND}
 	>=app-text/gnome-doc-utils-0.8
+	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
-	>=dev-util/intltool-0.35
 	test? ( app-text/docbook-xml-dtd:4.5 )
 	xinerama? ( x11-proto/xineramaproto )
 	x11-proto/xextproto
@@ -58,7 +58,6 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
 	G2CONF="${G2CONF}
 		--disable-static
-		--enable-gconf
 		--enable-shape
 		--enable-sm
 		--enable-startup-notification
@@ -74,5 +73,8 @@ src_prepare() {
 	# Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes)
 	epatch "${FILESDIR}/${PN}-3.2.1-ignore-shadow-and-padding.patch"
 
+	# In next release
+	epatch "${FILESDIR}/${P}-meta_window_move_frame-crash.patch"
+
 	gnome2_src_prepare
 }