Add patch to fix systray icons appearing in the top-left corner of the screen at login. Thanks to Raymond Lewis Rebbeck in bug #124306.

(Portage version: 2.1_pre5-r1)

5 files changed, 93 insertions, 1 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index ec9763df5705..0cd5e75a4a55 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.40 2006/01/22 22:53:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.41 2006/02/28 22:27:10 flameeyes Exp $
+
+*kwin-3.5.1-r1 (28 Feb 2006)
+
+  28 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kwin-3.5.1-systray.patch, +kwin-3.5.1-r1.ebuild:
+  Add patch to fix systray icons appearing in the top-left corner of the
+  screen at login. Thanks to Raymond Lewis Rebbeck in bug #124306.
 
 *kwin-3.5.1 (23 Jan 2006)
 
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 069c59d88bb6..9b26a07cbb6f 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,12 +1,45 @@
 MD5 c916b254f5dd3648faab2be9fcf14596 ChangeLog 4877
+RMD160 87f137279dcc1d13fce0955d4b9cc0afc1ec728f ChangeLog 4877
+SHA256 5d02b104a35ad30205120cf86a4e2b27b35fcec843675a828694fe248e9aa45a ChangeLog 4877
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kwin-3.4.1 212
+RMD160 507b5780112807385327a808ffffb5c897cbf1f4 files/digest-kwin-3.4.1 212
+SHA256 a64c99717e47d1f6143f531b9767e3e022d6c789e8d5a14aaf174814cb51a21d files/digest-kwin-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kwin-3.4.2 287
+RMD160 db88376c4259165535f83f3529f0834fb2209612 files/digest-kwin-3.4.2 287
+SHA256 3f1b77c90587a110ffb3a1402c6f10a87ef93bfdbc1345bb2138188a52c9cb8b files/digest-kwin-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kwin-3.4.3 68
+RMD160 fe4b253b0a7c2e30a2aa1d0d796dfcb11e30590a files/digest-kwin-3.4.3 68
+SHA256 2c163305cf238b4283a2263d089f3a5cdacfe053018c1fa5d8a5879593baf1a8 files/digest-kwin-3.4.3 68
 MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kwin-3.5.0 142
+RMD160 5a25b9d5e731ecbb0238d4016eec7d640fd809ca files/digest-kwin-3.5.0 142
+SHA256 2aa9daeb1aa26a4ddbc37c210bcd1cde8dbaa15d45bfd5f58d45ac26f7d36aea files/digest-kwin-3.5.0 142
 MD5 358c22d072b322d89bd54d98403c5eb6 files/digest-kwin-3.5.1 68
+RMD160 e8de4cf825e2775377e7f125b1429912ad1e826e files/digest-kwin-3.5.1 68
+SHA256 10f133d38f99c77b6ed8c236ac66bdcfb0451b0e213dc5ec626d6adff17382b5 files/digest-kwin-3.5.1 68
+MD5 6d6e32602b3d2fa7a1eae33592cdec5c files/digest-kwin-3.5.1-r1 250
+RMD160 a98ddea8c9ba3e7b2548bd9a71b09755241f79be files/digest-kwin-3.5.1-r1 250
+SHA256 2403848f28e03a9df899b0ef4d01bcb0d231a3647931bdb54ce44b67b249e429 files/digest-kwin-3.5.1-r1 250
+MD5 eda269a8bc07c3484024540b83dba9ff files/kwin-3.5.1-systray.patch 819
+RMD160 2528e57a17fe4eddd9cdf94da308059c799ca0ab files/kwin-3.5.1-systray.patch 819
+SHA256 e2c29c5abfd7f744b290553a341eac5975cb4dd84db1f9a3bb9844a86037b2d4 files/kwin-3.5.1-systray.patch 819
 MD5 2809511699650a8a076be8791e4d1567 kwin-3.4.1.ebuild 384
+RMD160 9a05f5adc449a45161e31c56572035a16fbe3242 kwin-3.4.1.ebuild 384
+SHA256 2df5424cc7c9de3f78cf0970a1ec4a5d7ae9a4b0101c8227d60aa542bc014f3d kwin-3.4.1.ebuild 384
 MD5 83701c6ee016cca9476c28a71b8b6f8d kwin-3.4.2.ebuild 388
+RMD160 7ce7c0b74db6fa7a3c76018c309cd3398da9d9f5 kwin-3.4.2.ebuild 388
+SHA256 aafcc1381c3fe9bf479f3f01ecabd448c97e42cd7dac30009826c0edb44a25a7 kwin-3.4.2.ebuild 388
 MD5 5767108ce048c3bc1caa8f5749250b9c kwin-3.4.3.ebuild 382
+RMD160 77d30cb7a75bb5325a05d3bb1de19203e3070938 kwin-3.4.3.ebuild 382
+SHA256 27e42082e72b108e6d5bb5a3ed61ccb1533fa8973e85103c55f1427bf711049c kwin-3.4.3.ebuild 382
 MD5 c53af4d59d7392cd66fb3d5063c49bc2 kwin-3.5.0.ebuild 999
+RMD160 23a281ef1aa06ae32239fc6924cdc535ead04cc3 kwin-3.5.0.ebuild 999
+SHA256 7fb365b96245a4e7f1b9b53ccdc6e385f5ea2d9cbebddb818e6b37956e433a43 kwin-3.5.0.ebuild 999
+MD5 2130c211f604b87fef089e83b38e0c85 kwin-3.5.1-r1.ebuild 778
+RMD160 af0641df1fdddb601b3aaedda2e16250a8fd90af kwin-3.5.1-r1.ebuild 778
+SHA256 90fe22deff7f06f12d71b0c3a636a7d45992cc14ee73295606c4fb92b32877f2 kwin-3.5.1-r1.ebuild 778
 MD5 27f88846117c6776af33c30786e1ee0b kwin-3.5.1.ebuild 736
+RMD160 e40afdd39a2e63f788820c037c6193da8a55f540 kwin-3.5.1.ebuild 736
+SHA256 8012c99db3bc75f670602510809a26731e5947ab1428c62215042093383b76b7 kwin-3.5.1.ebuild 736
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
diff --git a/kde-base/kwin/files/digest-kwin-3.5.1-r1 b/kde-base/kwin/files/digest-kwin-3.5.1-r1
new file mode 100644
index 000000000000..4f3350ad4e6d
--- /dev/null
+++ b/kde-base/kwin/files/digest-kwin-3.5.1-r1
@@ -0,0 +1,3 @@
+MD5 484c7b3895ce4f95173f4789571eb1cc kdebase-3.5.1.tar.bz2 23587827
+RMD160 5308bfe188f49815e68392b2f3a48e7def34dee0 kdebase-3.5.1.tar.bz2 23587827
+SHA256 f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434 kdebase-3.5.1.tar.bz2 23587827
diff --git a/kde-base/kwin/files/kwin-3.5.1-systray.patch b/kde-base/kwin/files/kwin-3.5.1-systray.patch
new file mode 100644
index 000000000000..76f623945870
--- /dev/null
+++ b/kde-base/kwin/files/kwin-3.5.1-systray.patch
@@ -0,0 +1,19 @@
+*** kdebase-3.5.1.orig/kwin/events.cpp	2006-01-20 03:31:07.000000000 +1030
+--- kdebase-3.5.1/kwin/events.cpp	2006-02-28 08:48:32.000000000 +1030
+***************
+*** 324,337 ****
+              }
+          case MapNotify:
+              {
+- #if KDE_IS_VERSION( 3, 9, 90 )
+- #warning Consider dumping this workaround.
+- #endif
+-             // See bug #100177, especially comments #6 and #14. This workaround shouldn't be
+-             // necessary when X.org with that fix becomes available and it's an unnecessary
+-             // X roundtrip for an experimental unstable feature.
+-             if( addSystemTrayWin( e->xmap.window ))
+-                 return true;
+              return ( e->xmap.event != e->xmap.window ); // hide wm typical event from Qt
+              }
+          case ReparentNotify:
+--- 324,329 ----
diff --git a/kde-base/kwin/kwin-3.5.1-r1.ebuild b/kde-base/kwin/kwin-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..659a3e0432e4
--- /dev/null
+++ b/kde-base/kwin/kwin-3.5.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.1-r1.ebuild,v 1.1 2006/02/28 22:27:10 flameeyes Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE window manager"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="xcomposite"
+RDEPEND="xcomposite? ( || ( (
+			x11-libs/libXcomposite
+			x11-libs/libXdamage
+			) <=x11-base/xorg-x11-6.9 )
+		)"
+DEPEND="${RDEPEND}
+	xcomposite? ( || ( (
+			x11-proto/compositeproto
+			x11-proto/damageproto
+			) <=x11-base/xorg-x11-6.9 )
+		)"
+
+PATCHES="${FILESDIR}/${P}-systray.patch"
+
+src_compile() {
+	myconf="$myconf $(use_with xcomposite composite)"
+	kde-meta_src_compile
+}