Fix maximized windows jumping to a different monitor (#470248#c37 by kisak42)

Package-Manager: portage-2.1.13.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 48 insertions, 9 deletions

diff --git a/x11-wm/muffin/ChangeLog b/x11-wm/muffin/ChangeLog
index 154dacf8244d..aa1cefe264b9 100644
--- a/x11-wm/muffin/ChangeLog
+++ b/x11-wm/muffin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/muffin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/ChangeLog,v 1.12 2013/07/27 09:52:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/ChangeLog,v 1.13 2013/07/27 13:11:21 pacho Exp $
+
+*muffin-1.8.2-r1 (27 Jul 2013)
+
+  27 Jul 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/muffin-1.8.2-maximized-jump.patch, +muffin-1.8.2-r1.ebuild,
+  -muffin-1.8.2.ebuild:
+  Fix maximized windows jumping to a different monitor (#470248#c37 by kisak42)
 
 *muffin-1.8.2 (27 Jul 2013)
 
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index f959dd108923..a806270e33c6 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX muffin-1.8.2-maximized-jump.patch 1031 SHA256 1c4897ea53fc7005c98a3bb204a7301a9d056c1bcb900982295d2550034de946 SHA512 873e7bf9942bcf60ba08a15ca16ac53755956075983515091d71f73cec1cf96ce630cb64b1f4f5b33e2f34dc15522c58e942600ea48cc5e4ff035fe4f9e80522 WHIRLPOOL 80717451c7d5cda59750c0710f929ee76d9e10584886672a1e8061858ef120f347b68c317bf4e4636d6eb6f2a6310b14e21a6255475cf62af46e8b9612111de0
 DIST muffin-1.1.2.tar.gz 3084262 SHA256 19523f5286e937d9be0649bcbec49f65ab1e4378b844b408dff70be9fb43dce0 SHA512 83a8d04d10c991f7b05d86fe896af50c121cfabdfbeb08d98498cd68c5dc7320a60cf27b3b8ca048c70c7894d52fffddca60204b8102a46a031a65b5550ff7cf WHIRLPOOL 9df990718537edd002fd7cff7f500a34b8bd124983d7aaf7f68621a0906b0135311b00804d62242027a66aa8c778666409980f719d53b2c832daf5fff52ec2b4
 DIST muffin-1.8.2.tar.gz 2685117 SHA256 903c6ab5e228c8a1b8e05f460ba34c111e8a92ce9382ebd0b014416af4dd7049 SHA512 eb175e201e16c277cf3d3f69726249cc6ca992cafd5fa1c03b563a3a30705362874fc710eef5801cb42bf6692fd0e44723d2a261c757320ed687756a79287b92 WHIRLPOOL 20dcc04d64c0a7a5c594820f29dee9267d5ed2d818a2b8f23f913ec4d4c90a3ff11ae3a7d9d5804d9146798efef60a2eac8dccdb35367c55b5de08a9edfa6d6f
 EBUILD muffin-1.1.2.ebuild 2156 SHA256 e14178e8d885c76d586559938eea943ef441d2053b8ca02aed6cc5d8245f8c7a SHA512 7420aa3f0632bba6e89eb1131ebc55753e9d19cf28e2afa7f9420ceb1781ab5ff173f30c76505f16dd300db6eee46c2a2a5f9829b61bfb40e9c05fb64b562c16 WHIRLPOOL a58aa00eb0bc9c6c28feded2a419badd63bc522c55175d288a45b5d386f8336a1ad71fe3944280f988b88b9d6111900cccfc8c2eb469eb277e3fc3c8cb4663ec
-EBUILD muffin-1.8.2.ebuild 2050 SHA256 62afc3ad70ed0eb04c561fac783278321b9e4abaa31e59972d51cdd2f2f611a3 SHA512 73823699fd8fbfa1b21ac6c42aac56370b810c516c320533116deea5f4d88b7db1022d398372374f7a6293abcb66954ab26cbca828923f5e81458429e221aa2d WHIRLPOOL e813d1088086b5354a705f601108e1d8b45a4a5d6d5db3723a4d28c0667bcf63650e7c0d6f4226f3f820369ba5d0740751bcbe8cf1f16af13c780a8f1e56e875
-MISC ChangeLog 2511 SHA256 2dbee4e6abb9bd4774becf45f0969e3ba2936d09860e88f7fd3c41602f122bcc SHA512 90d6403315371b3d75e660f0331235c0d0ba3d7e05b404c499e8145f928ef29349f27120638ac93972d804fa4c3778e3b91631f32d7759157b9ae7934402ad9d WHIRLPOOL 725994ea1bdd70651c167030243186a0b401abb38a7b4a4bf10de24daf3430a8e76b3ff411d8bb0015fb8859de89ed9ebdc2910719f0eddb73efc75b03f3ac12
+EBUILD muffin-1.8.2-r1.ebuild 2151 SHA256 4e37143c93f051f205d3638e7c108c83a3cedad360befd27f1b86624ae49ced2 SHA512 3c58e6a180bab1da971b97cd2a8fc52a6ec1d5eb44da4cdac93a27c9ff5773ca05b393c0cc0c12dfdd7a68723137f80ffa746b9315bbaa0d4d0c9c4f2689db94 WHIRLPOOL b4af4835772fb6f942bc2a74e27a6ff76bff2d5dc1f8a67a40d1ef88cab250853679bff323f2f5d89a9ca980ba55aecefe1ea758820bb688899aecaaf8525900
+MISC ChangeLog 2763 SHA256 ecbdc775cf4222ac64fcbbbbf4d7637bcba08f6e0482d9cd16ba51e816c4b5e6 SHA512 fffe1ed327a68772617cd20dd5ded00a56913c6fdb1250457731ac719796b6eed210fed1928d7fdaf4d5c67e1ea5d1d84b867c34f870fc4fd937e11d44077df4 WHIRLPOOL bc205582c7ca7cce0bb83ac13cd4f978203d53cc7365521d47c4a8a41bac339358c9b851beaf38a7f37e1a32f209d5778b69b0a9c076f32c5581b96124cbe662
 MISC metadata.xml 277 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb SHA512 ca1d5e77776eb584f9e897f4abb7b4a1e2bc7942564d81c812ff94d64593c6e1e0a7996c0be8f6493cce579c815024e006bf5642b8fc57d59e3818d960b9cb0c WHIRLPOOL ea0c213f488fd7c0cf1783f9542feaed34859244150a79926029bad19b066db2ce6d2cd3e539c860e9eee50b3138bfe32c520e8c663dbe9a86999c04b28b140f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHzmHkACgkQCaWpQKGI+9SXPACcDQdZ0BnTuUrsm6UHklx+hjmk
-970An2VQFjCEhIx5vtCfC7Bt6j2F2lNa
-=M2Oj
+iEYEAREIAAYFAlHzxvsACgkQCaWpQKGI+9TrHQCePNZ4WN2Q/rpY4yJi+f/K1+Ip
+h2cAnjOnbgIll7mr73j/PO5YmDv1dpwF
+=F9YH
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/muffin/files/muffin-1.8.2-maximized-jump.patch b/x11-wm/muffin/files/muffin-1.8.2-maximized-jump.patch
new file mode 100644
index 000000000000..f7874c0b6a96
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-1.8.2-maximized-jump.patch
@@ -0,0 +1,29 @@
+From 00fdf6c3078b3cf34707f7d740bf797d1ca77414 Mon Sep 17 00:00:00 2001
+From: Albert Pool <albertpool@solcon.nl>
+Date: Tue, 9 Jul 2013 16:08:59 +0200
+Subject: [PATCH] Fix maximized windows jumping to a different monitor
+
+Commit e5b46747d67f6f75ef06272d91f7f8cfc36af058 upstream
+---
+ src/core/constraints.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/core/constraints.c b/src/core/constraints.c
+index 4c4dedd..630c41c 100644
+--- a/src/core/constraints.c
++++ b/src/core/constraints.c
+@@ -567,6 +567,11 @@ typedef gboolean (* ConstraintFunc) (MetaWindow         *window,
+                        .083 * info->work_area_monitor.height;
+             }
+ 
++          /* idle_move_resize() uses the user_rect,
++           * so make sure it uses the placed coordinates.
++           */
++          window->user_rect = info->current;
++
+           if (window->maximize_horizontally_after_placement ||
+               window->maximize_vertically_after_placement)
+             meta_window_maximize_internal (window,   
+-- 
+1.8.1.6
+
diff --git a/x11-wm/muffin/muffin-1.8.2.ebuild b/x11-wm/muffin/muffin-1.8.2-r1.ebuild
index eea33ec9cde9..3f89d554ccbc 100644
--- a/x11-wm/muffin/muffin-1.8.2.ebuild
+++ b/x11-wm/muffin/muffin-1.8.2-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-1.8.2.ebuild,v 1.1 2013/07/27 09:52:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-1.8.2-r1.ebuild,v 1.1 2013/07/27 13:11:21 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
-inherit autotools gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
 HOMEPAGE="http://cinnamon.linuxmint.com/"
@@ -62,6 +61,9 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
+	# Fix maximized windows jumping to a different monitor
+	epatch "${FILESDIR}/${PN}-1.8.2-maximized-jump.patch"
+
 	# Regenerate obsolete Makefile.in
 	eautoreconf
 	gnome2_src_prepare