Reinstate erroneously removed patch thanks to toomore_such (bug #302566).

Package-Manager: portage-2.2_rc61/cvs/Linux i686

3 files changed, 45 insertions, 2 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index e9b55ff36f03..76df99a06c8d 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.154 2010/01/27 07:05:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.155 2010/01/29 04:48:10 jer Exp $
+
+  29 Jan 2010; Jeroen Roovers <jer@gentoo.org>
+  +files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch:
+  Reinstate erroneously removed patch thanks to toomore_such (bug #302566).
 
   27 Jan 2010; Jeroen Roovers <jer@gentoo.org> -rxvt-unicode-9.05-r3.ebuild,
   -files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch,
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 73d127106feb..df460816460d 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,3 +1,4 @@
+AUX rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch 1411 RMD160 ee947f7243cc5969079f2799e7f93edccc7b699c SHA1 319016954c2c6a1b9d4a847c5c88debf3533da0b SHA256 b5c428d3a1150eca95aa4b2c67756ad12fefb7bbc6aa69e308ad011c4f8ad440
 AUX rxvt-unicode-9.06-glibc-2.10.patch 1380 RMD160 b333caf5b3a6441499051461bbbfa353ac8d3cf0 SHA1 0d6a3c382db068e17a25480eaf67e1a1392a90f3 SHA256 750ec3a79e5d56717cedebd6ab9aa8df9d7785c806c5d54dcf02d2c62a7798b0
 AUX rxvt-unicode-9.06-no-urgency-if-focused.diff 482 RMD160 7d0a0257209beb58751e996e822a10d372a01d7e SHA1 7da560653290f6fd653be2dda396b19961f31c06 SHA256 f518571ae6c63110cc8b49f423c1cb864399335017ca17469df5e78a2f2aabc4
 AUX rxvt-unicode-9.06-popups-hangs.patch 643 RMD160 f35a7c7044602a855c59f80919eb24723bd6f015 SHA1 c3cb2cc796243cba4916d3bfa8bf3e6ee2ef0831 SHA256 ed232e0cca9ea642ba061c1008e724fd61d3821eb1a464ba42aa404d778c5e60
@@ -5,5 +6,5 @@ DIST rxvt-unicode-9.06.tar.bz2 869076 RMD160 ae737ed07e943303318bd81b566146d5426
 DIST rxvt-unicode-9.07.tar.bz2 858616 RMD160 e20d30eac61bc56deac9da11b4d049fbac3f3b66 SHA1 0e623daa15c45ba3add622277d32493a97059619 SHA256 c5a0638ca8249968065076a6f17e6e499f31fdc9050f71aae4ea85cac6aac5a3
 EBUILD rxvt-unicode-9.06-r3.ebuild 3380 RMD160 a5f747286e3702ff9c18af6a460975498b61c813 SHA1 3f8b617ffe5521c21c2f8e13a535c7e9f182a01f SHA256 9d270d9d6ca78611f68771119857b08ffeae4ad929c732df222ee24f5f9204c1
 EBUILD rxvt-unicode-9.07.ebuild 3341 RMD160 c50e04a394eccaf3094ea2735d80fea8882ea0aa SHA1 6829861519f3124e4890209a75132382b7c70725 SHA256 78a12a4d7f032c86dc57ecfb63fdfe017c1e952b64d5a1672bc7b039ca044890
-MISC ChangeLog 23399 RMD160 ad1ed60e30d6ad765bacbd40bb2c8c5c2b1ddb13 SHA1 844c1525630bd81e9afd223f8408cece6e203c0c SHA256 16241af905ea299b7ed65ad9dd85c7b82887820eb64af1078932a96eb67eb9f4
+MISC ChangeLog 23574 RMD160 56c69a5d930d844b4f552c1e56764b8c4de7e6b2 SHA1 726a4e8939ad7981cb68170ca02cd76e0a981372 SHA256 7ce992fdbf69a2dbd5c36ce21be386b551ab67b43756397e1b05b8e104b37484
 MISC metadata.xml 747 RMD160 636ab1ca576fb13f2fdcf64ee5286a352ca3d714 SHA1 a85e0e39956201d64ece8ab1daa1d5eb2051fb2d SHA256 ef6564b10f56ddc26ec60d7f67490ade8a67462f428c7ea83ab6749870f4e7b9
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch
new file mode 100644
index 000000000000..972adbe06836
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch
@@ -0,0 +1,38 @@
+While setting MWM_HINTS_DECORATIONS to disable window decorations
+seems to work with most window managers, using _MOTIF_WM_INFO seems
+not to, and in some cases can lead to severe problems with focus
+management. Therefore this patch here disables the _MOTIF_WM_INFO
+check and always attempts to have the window manager honour the
+decorations hint.
+
+If your window manager does not honour MWM_HINTS_DECORATIONS, and you
+are determined that you want to have borderless windows nevertheless,
+you are still free to enable override-redirect manually, using the
+corresponding command line option or X resource.
+
+See also: http://bugs.gentoo.org/show_bug.cgi?id=237271
+2008-09-10 Martin von Gagern
+
+Index: src/init.C
+===================================================================
+RCS file: /schmorpforge/rxvt-unicode/src/init.C,v
+retrieving revision 1.253
+diff -u -r1.253 init.C
+--- src/init.C	15 Jul 2008 16:41:22 -0000	1.253
++++ src/init.C	10 Sep 2008 08:07:09 -0000
+@@ -1078,15 +1078,7 @@
+ #if ENABLE_FRILLS
+   if (option (Opt_borderLess))
+     {
+-      if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
+-        {
+-          // rxvt_warn("Window Manager does not support MWM hints.  Bypassing window manager control for borderless window.\n");
+-          attributes.override_redirect = true;
+-        }
+-      else
+-        {
+           mwmhints.flags = MWM_HINTS_DECORATIONS;
+-        }
+     }
+ #endif
+