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

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

4 files changed, 89 insertions, 12 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/Manifest b/x11-wm/mutter/Manifest
index 18dd663ffd1a..37af639ed55a 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,10 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mutter-3.2.1-ignore-shadow-and-padding.patch 2640 RMD160 408acd936e0a474714ffaa3c4a0a5c17bcc160ca SHA1 3705a09d1160c6a7ace480c5f51a3c413ac52a0d SHA256 765c04ba4d177789407a25d3cbdf358e3fa125170cfd37c53095372bc4ec883d
 AUX mutter-3.2.2-disable-introspection.patch 678 RMD160 c9a67368e6f618cadb446ca7c8b81158c097412c SHA1 f70de86c5b82be3ed9f6628925ea3b39754108be SHA256 5edfd4204142b4305f96ffe836de717a39cfcd9c5edc954161ab21fb49e98eb4
 AUX mutter-3.2.2-frame-initialize-style-contexts.patch 1053 RMD160 2d7540ee760e0dbc489270a0f81007962040fe64 SHA1 c7ba47d8042d50d9ecc13199ae8f16c73c577c8b SHA256 1718f868b2e2f88519dfef69a67ecddcf411183579ea5497844cbbc11b324932
-DIST mutter-3.2.1.tar.xz 1640556 RMD160 310ad5d91e0c741b95c3e14f1f27c2a5bb32609e SHA1 d3990d3f51481e679dd7e588ca28795a361c6006 SHA256 d6135d5e6c0852f7dc996798e9455fc2e9cbe6d2672f3750fc9b8d27ab141294
+AUX mutter-3.4.1-meta_window_move_frame-crash.patch 1779 RMD160 48c3bb72646e5dff2281bedcc0b897fc24f2a183 SHA1 f8c7c4c1ca1f3b5dd53b0e5699085d77aeff7664 SHA256 5e8b565a223cab1055ecd65a85381ffd69f547b1efeb7b23ff69295869f6dfd8
 DIST mutter-3.2.2.tar.xz 1647416 RMD160 dd186b113149646ef120fa8c4fe89bdfe6c45ec5 SHA1 7ba5bdb7014311d3bfee1e201fdc039b96598471 SHA256 cd5977d86a100d89cfef557c22900b6d061730e2bda66e314e4943505d2bd5a1
-EBUILD mutter-3.2.1-r1.ebuild 1927 RMD160 c01c0afbc7891640737cb3b38008025f622abfe8 SHA1 2884ae39d86a51dd7849c82d52e2d2da2eda4c0a SHA256 61b63c10b5a85504f85b5d32e0ea9938d9e51523bb0ab528edf59ea3dd3ae603
+DIST mutter-3.4.1.tar.xz 1597536 RMD160 f4b1f5cdd1f5724f5af397b143b4bff6523882c8 SHA1 2d9a89f7dc682e683b5184c13568b643cd3dad52 SHA256 dbf08b014179980ab3d0cce645c5391c83b0ce070c73504feea8eec0ad000449
 EBUILD mutter-3.2.2-r1.ebuild 2168 RMD160 697b74923ebff0688144afe05f8cde1c8e4a8427 SHA1 0a3331bb5fa4cdad39dd265062c0521c2750b393 SHA256 49e19bc638702e6770fe06c436bddaaba0d070bb9a4a5b428a59b37970a60478
 EBUILD mutter-3.2.2.ebuild 2038 RMD160 d880327e804ece370be6237345852fa898aedd22 SHA1 559b791d6990a6810e197a49e77460805e168346 SHA256 c4b4f3406e501240747e88cab952a2c5f657a5ab39defa6cd857f22acac79289
-MISC ChangeLog 1905 RMD160 32559831dc0612c089055608cd47a8e83ae624cf SHA1 e34182295f0c19a078e8ea4b27629847f526af1d SHA256 ba698412d4cac3ae655bc9f694f1e99351ffa2cbac2b2131af7292e6eb04b369
+EBUILD mutter-3.4.1-r1.ebuild 2032 RMD160 aa0633dbb31cc3a47840cfb459a74dd456727a37 SHA1 1a005c99669ac0230c9dd50628e576c04f50263f SHA256 4b694d04692ecf31a919d8a72c2f6709c3d3bace1afe6e70d62dc9247687b184
+MISC ChangeLog 2190 RMD160 07681f7b3d2379eb08b787d09e51fad8070d058b SHA1 e90d775e7776badfbd8a7e3d4dae12c6c28e7895 SHA256 9e3b03a1ba424cb92dc8a51d382d85947ef2e8cd704762d87991f688e88605de
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPsEuXAAoJEJ0WA1zPCt1hFW0H/ibK/zkVFyWsCWcdAGva4KLH
+ZiKfvPLXKMt6HBssL0sLMwqFREhSoohxHNNZS8C3wEoyFa4eVrKfSzu/tD7+RruM
+ttBFXgH7BXBFC5PZv9Mt/Vnjw1/tRcethwi3+QNWZK9hOX7jJGD/oYIhY9O9m7w6
+wkT/Or4Epzv8QWwpWgQRkmusWWxKUxOXgEDxW0gqxJQhmf86k54hxrHZJWsrDYlp
+5jo2cN3Iix9m4m+T81sJBtINvZaDZBFBNiQ8R6Y1aLC10Ayf+PUqfablNYwbap31
+ZG8k9BOexjKeH6c7xSV/Ea9j9i2E72YbeIVzOCo5u9oF33RISPStkSStd6ID7zg=
+=UqIz
+-----END PGP SIGNATURE-----
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
 }