Kicker anti-flicker patch, #121444.

Package-Manager: portage-2.0.54

5 files changed, 91 insertions, 2 deletions

diff --git a/kde-base/kicker/ChangeLog b/kde-base/kicker/ChangeLog
index 2dfe7c33161c..93a2452fd1c2 100644
--- a/kde-base/kicker/ChangeLog
+++ b/kde-base/kicker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kicker
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.38 2006/01/22 22:53:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.39 2006/02/03 17:38:23 carlo Exp $
+
+*kicker-3.5.1-r1 (03 Feb 2006)
+
+  03 Feb 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdebase-3.5.1-kicker.patch, +kicker-3.5.1-r1.ebuild:
+  Kicker anti-flicker patch, #121444.
 
 *kicker-3.5.1 (23 Jan 2006)
 
diff --git a/kde-base/kicker/Manifest b/kde-base/kicker/Manifest
index 40c7e714c727..d15ecac5ca0c 100644
--- a/kde-base/kicker/Manifest
+++ b/kde-base/kicker/Manifest
@@ -1,13 +1,16 @@
-MD5 13394d973a83ca04889587c502df0d82 ChangeLog 4715
+MD5 03abf2c9ac12432012557e888d9df909 ChangeLog 4894
 MD5 07e3f3f7982d29e2317f32f209e06573 files/applets-configure.in.in.diff 606
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kicker-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kicker-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kicker-3.4.3 68
 MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kicker-3.5.0 142
 MD5 358c22d072b322d89bd54d98403c5eb6 files/digest-kicker-3.5.1 68
+MD5 358c22d072b322d89bd54d98403c5eb6 files/digest-kicker-3.5.1-r1 68
+MD5 33f94f4cf8b5b34dd04b50e159d07ae5 files/kdebase-3.5.1-kicker.patch 1322
 MD5 3f169df7532dad28d299bdb3c4683484 kicker-3.4.1.ebuild 680
 MD5 cc9e587f4748ebb5f8aadab99eba7b8f kicker-3.4.2.ebuild 693
 MD5 b20ed87b60ff2dc2058c88eedbe44fec kicker-3.4.3.ebuild 687
 MD5 58a288bde98bcac51adc6a1c355e83a4 kicker-3.5.0.ebuild 1215
+MD5 cfaad68f1a44f1c25a40043b61127676 kicker-3.5.1-r1.ebuild 1002
 MD5 899d2ca57f611a02e71d62cb386a778f kicker-3.5.1.ebuild 952
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kicker/files/digest-kicker-3.5.1-r1 b/kde-base/kicker/files/digest-kicker-3.5.1-r1
new file mode 100644
index 000000000000..a74001cfd2ff
--- /dev/null
+++ b/kde-base/kicker/files/digest-kicker-3.5.1-r1
@@ -0,0 +1 @@
+MD5 484c7b3895ce4f95173f4789571eb1cc kdebase-3.5.1.tar.bz2 23587827
diff --git a/kde-base/kicker/files/kdebase-3.5.1-kicker.patch b/kde-base/kicker/files/kdebase-3.5.1-kicker.patch
new file mode 100644
index 000000000000..6cf272391a96
--- /dev/null
+++ b/kde-base/kicker/files/kdebase-3.5.1-kicker.patch
@@ -0,0 +1,40 @@
+--- branches/KDE/3.5/kdebase/kicker/taskmanager/taskmanager.cpp #505029:505030
+@@ -378,9 +378,8 @@
+     }
+ 
+     // check if any state we are interested in is marked dirty
+-    if (!(dirty & (NET::WMVisibleName | NET::WMVisibleIconName | NET::WMName |
+-                   NET::WMIconName | NET::WMState | NET::WMIcon |
+-                   NET::XAWMState | NET::WMDesktop) ||
++    if (!(dirty & (NET::WMVisibleName | NET::WMName | NET::WMIcon |
++                  NET::WMState | NET::XAWMState | NET::WMDesktop) ||
+           (m_trackGeometry && dirty & NET::WMGeometry)))
+     {
+         return;
+@@ -404,9 +403,12 @@
+     if (dirty & NET::WMIcon)
+     {
+         t->refreshIcon();
++
++        // we're done with the icon processing, don't pass this on anymore
++        dirty ^= NET::WMIcon;
+     }
+ 
+-    if (dirty != NET::WMIcon)
++    if (dirty)
+     {
+         // only refresh this stuff if we have other changes besides icons
+         t->refresh(dirty);
+@@ -725,10 +727,10 @@
+ 
+ void Task::refresh(unsigned int dirty)
+ {
+-    QString name = visibleIconicName();
++    QString name = visibleName();
+     _info = KWin::windowInfo(_win, 0, NET::WM2AllowedActions);
+ 
+-    if (dirty != NET::WMName || name != visibleIconicName())
++    if (dirty != NET::WMName || name != visibleName())
+     {
+         emit changed();
+     } 
\ No newline at end of file
diff --git a/kde-base/kicker/kicker-3.5.1-r1.ebuild b/kde-base/kicker/kicker-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..a6194877b5cb
--- /dev/null
+++ b/kde-base/kicker/kicker-3.5.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.1-r1.ebuild,v 1.1 2006/02/03 17:38:23 carlo Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE panel housing varous applets"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="xcomposite"
+PATCHES="$FILESDIR/applets-configure.in.in.diff"
+
+RDEPEND="
+$(deprange $PV $MAXKDEVER kde-base/libkonq)
+$(deprange $PV $MAXKDEVER kde-base/kdebase-data)
+	xcomposite? ( || ( (
+			x11-libs/libXcomposite
+			) <=x11-base/xorg-x11-6.9 )
+		)"
+
+DEPEND="${RDEPEND}
+	xcomposite? ( || ( (
+			x11-proto/compositeproto
+			) <=x11-base/xorg-x11-6.9 )
+		)"
+
+KMCOPYLIB="libkonq libkonq"
+KMEXTRACTONLY="libkonq
+	kdm/kfrontend/themer/"
+KMCOMPILEONLY="kdmlib/"
+
+PATCHES="${FILESDIR}/kdebase-3.5.1-kicker.patch"
+
+src_compile() {
+	myconf="$myconf $(use_with xcomposite composite)"
+	kde-meta_src_compile
+}