patch from cvs stops option being ignored.

4 files changed, 32 insertions, 4 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 8f59ec301149..fd64b8d034c7 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.56 2004/02/16 12:25:22 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.57 2004/02/17 17:26:41 taviso Exp $
+
+  17 Feb 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r5.ebuild,
+  files/fvwm-2.5.8-flickeringmoveworkaround.diff:
+  patch from cvs.
 
 *fvwm-2.5.8-r5 (16 Feb 2004)
 
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 819338cf802c..4f7b66b9a406 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -2,8 +2,8 @@ MD5 b83bf23f1c96084b79765739613430ac fvwm-2.5.7-r5.ebuild 8757
 MD5 76fde55c6ffece27a13fd976d5fb51b6 fvwm-2.5.8-r4.ebuild 10169
 MD5 babbec50812f1dd2af1b76b9afa837af fvwm-2.4.17.ebuild 3961
 MD5 a52e679cbc4958400b382099353e03f7 fvwm-2.5.8-r3.ebuild 10167
-MD5 e5afe06bcaca20a1a373dab74ffc1941 fvwm-2.5.8-r5.ebuild 10273
-MD5 9fa6f7c04c4f6ceee8be6842a80302ff ChangeLog 10823
+MD5 12c50500732e648eb883bb1f9e5b9d5b fvwm-2.5.8-r5.ebuild 10410
+MD5 68fe2c52f5fe8c7b8557f1a290ff8ca7 ChangeLog 10963
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
 MD5 6a0ba650b7f07dc1e6e94ea256a8ec94 fvwm-2.5.8-r2.ebuild 9684
 MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788
@@ -25,3 +25,4 @@ MD5 ebe3c015c02ef069b110e30f3e84cf49 files/digest-fvwm-2.5.8-r3 127
 MD5 c3ea3b9a8c5d7700913a795096e0b51a files/digest-fvwm-2.5.8-r4 127
 MD5 c3ea3b9a8c5d7700913a795096e0b51a files/digest-fvwm-2.5.8-r5 127
 MD5 97373a30210df0b93c59e2aac76d17e0 files/fvwm-2.5.8-undermouse.diff 2534
+MD5 9eb9742b2c0fdc1fa5b29e352e860627 files/fvwm-2.5.8-flickeringmoveworkaround.diff 726
diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-flickeringmoveworkaround.diff b/x11-wm/fvwm/files/fvwm-2.5.8-flickeringmoveworkaround.diff
new file mode 100644
index 000000000000..2154ec31d530
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.5.8-flickeringmoveworkaround.diff
@@ -0,0 +1,20 @@
+--- fvwm/fvwm/move_resize.c	2004-02-17 13:15:30.000000000 +0000
++++ fvwm-2.5.8/fvwm/move_resize.c	2003-09-15 09:31:22.000000000 +0100
+@@ -1159,7 +1159,7 @@
+ 				dpy, None, Scr.Root, 0, 0, 0, 0, pointerX,
+ 				pointerY);
+ 		}
+-		if (fw && !IS_SHADED(fw) && !Scr.bo.DisableConfigureNotify)
++		if (fw && !IS_SHADED(fw))
+ 		{
+ 			/* send configure notify event for windows that care
+ 			 * about their location */
+@@ -2340,7 +2340,7 @@
+ 		xl += x_virtual_offset;
+ 		yt += y_virtual_offset;
+ 		if (do_move_opaque && !IS_ICONIFIED(fw) &&
+-		    !IS_SHADED(fw) && !Scr.bo.DisableConfigureNotify)
++		    !IS_SHADED(fw))
+ 		{
+ 			/* send configure notify event for windows that care
+ 			 * about their location; don't send anything if
diff --git a/x11-wm/fvwm/fvwm-2.5.8-r5.ebuild b/x11-wm/fvwm/fvwm-2.5.8-r5.ebuild
index 56c83eaeb4f7..ee44cff05c3d 100644
--- a/x11-wm/fvwm/fvwm-2.5.8-r5.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.8-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.8-r5.ebuild,v 1.1 2004/02/16 12:25:22 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.8-r5.ebuild,v 1.2 2004/02/17 17:26:41 taviso Exp $
 
 inherit eutils flag-o-matic
 
@@ -99,6 +99,9 @@ src_unpack() {
 	# expand variables $[w.iconfile] and $[w.miniiconfile]
 	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-iconfile.diff
 
+	# FlickeringMoveWorkaround is always ignored, this fix from cvs.
+	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-flickeringmoveworkaround.diff
+
 	# build fails on alpha with certain options without this.
 	use alpha && append-flags -fPIC
 }