Add another fix.

Package-Manager: portage-2.0.54

4 files changed, 126 insertions, 1 deletions

diff --git a/kde-base/ksysguard/ChangeLog b/kde-base/ksysguard/ChangeLog
index 570368ca1b72..75350648e051 100644
--- a/kde-base/ksysguard/ChangeLog
+++ b/kde-base/ksysguard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksysguard
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.47 2006/04/06 02:53:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.48 2006/04/21 18:42:34 carlo Exp $
+
+*ksysguard-3.5.2-r2 (21 Apr 2006)
+
+  21 Apr 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/ksysguard-3.5.2-fixes.diff, +ksysguard-3.5.2-r2.ebuild:
+  Add another fix.
 
   06 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   -ksysguard-3.5.0.ebuild, -ksysguard-3.5.1.ebuild, -ksysguard-3.5.2.ebuild:
diff --git a/kde-base/ksysguard/files/digest-ksysguard-3.5.2-r2 b/kde-base/ksysguard/files/digest-ksysguard-3.5.2-r2
new file mode 100644
index 000000000000..9c5d5e23a110
--- /dev/null
+++ b/kde-base/ksysguard/files/digest-ksysguard-3.5.2-r2
@@ -0,0 +1 @@
+MD5 c5685e1be34e033286aa1f37002a0552 kdebase-3.5.2.tar.bz2 23590820
diff --git a/kde-base/ksysguard/files/ksysguard-3.5.2-fixes.diff b/kde-base/ksysguard/files/ksysguard-3.5.2-fixes.diff
new file mode 100644
index 000000000000..7e14b219a191
--- /dev/null
+++ b/kde-base/ksysguard/files/ksysguard-3.5.2-fixes.diff
@@ -0,0 +1,95 @@
+--- kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.cc	2005/09/29 13:24:25	465343
++++ kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.cc	2006/04/10 09:13:08	528138
+@@ -45,7 +45,8 @@
+   : KSGRD::SensorDisplay( parent, name, title, noFrame_, isApplet )
+ {
+   mBars = 0;
+-  mFlags = 0;
++  mFlags = QBitArray(100);
++  mFlags.fill( false );
+ 
+   if ( noFrame() )
+     mPlotter = new BarGraph( this );
+@@ -245,16 +246,16 @@
+ 	
+   if ( id < 100 ) {
+     mSampleBuffer[ id ] = answer.toDouble();
+-    if ( mFlags & ( 1 << id ) ) {
++    if ( mFlags.testBit( id ) == true ) {
+       kdDebug(1215) << "ERROR: DancingBars lost sample (" << mFlags
+                     << ", " << mBars << ")" << endl;
+       sensorError( id, true );
+     }
+-    mFlags |= 1 << id;
++    mFlags.setBit( id, true );
+ 
+-    if ( mFlags == (uint)( ( 1 << mBars ) - 1 ) ) {
++    if ( mFlags.testBit( ( 1 << mBars ) - 1 ) == true ) {
+       mPlotter->updateSamples( mSampleBuffer );
+-      mFlags = 0;
++      mFlags.fill( false );
+     }
+   } else if ( id >= 100 ) {
+     KSGRD::SensorIntegerInfo info( answer );
+--- kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.h	2005/09/29 13:24:25	465343
++++ kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.h	2006/04/10 09:13:08	528138
+@@ -25,6 +25,7 @@
+ #define KSG_DANCINGBARS_H
+ 
+ #include <SensorDisplay.h>
++#include <qbitarray.h>
+ 
+ class KIntNumInput;
+ 
+@@ -83,7 +84,7 @@
+       been received.
+      */
+     QMemArray<double> mSampleBuffer;
+-    ulong mFlags;
++    QBitArray mFlags;
+ };
+ 
+ #endif
+--- kdebase/ksysguard/gui/ksgrd/SensorShellAgent.cc	2005/09/29 13:24:25	465343
++++ kdebase/ksysguard/gui/ksgrd/SensorShellAgent.cc	2006/03/27 09:04:59	523046
+@@ -41,7 +41,7 @@
+   if ( mDaemon ) {
+     mDaemon->writeStdin( "quit\n", strlen( "quit\n" ) );
+     delete (KShellProcess*)mDaemon;
+-		mDaemon = 0;
++    mDaemon = 0;
+   }
+ }
+ 	
+@@ -50,9 +50,9 @@
+ {
+   mDaemon = new KShellProcess;
+ 
+-	setHostName( host );
+-	mShell = shell;
+-	mCommand = command;
++  setHostName( host );
++  mShell = shell;
++  mCommand = command;
+ 
+   connect( mDaemon, SIGNAL( processExited( KProcess* ) ),
+            SLOT( daemonExited( KProcess* ) ) );
+@@ -84,7 +84,7 @@
+ {
+   shell = mShell;
+   command = mCommand;
+-	port = -1;
++  port = -1;
+ }
+ 
+ void SensorShellAgent::msgSent( KProcess* )
+@@ -122,7 +122,8 @@
+   sensorManager()->hostLost( this );
+   sensorManager()->disengage( this );
+ 
+-  process->deleteLater();
++  if ( mDaemon )
++    mDaemon->deleteLater();
+ }
+ 
+ bool SensorShellAgent::writeMsg( const char *msg, int len )
diff --git a/kde-base/ksysguard/ksysguard-3.5.2-r2.ebuild b/kde-base/ksysguard/ksysguard-3.5.2-r2.ebuild
new file mode 100644
index 000000000000..9a40a213fdfe
--- /dev/null
+++ b/kde-base/ksysguard/ksysguard-3.5.2-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-3.5.2-r2.ebuild,v 1.1 2006/04/21 18:42:34 carlo Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KSysguard is a network enabled task manager and system monitor application, with the additional functionality of top."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="lm_sensors zeroconf"
+DEPEND="lm_sensors? ( sys-apps/lm_sensors )
+	zeroconf? ( net-misc/mDNSResponder )"
+
+src_compile() {
+	local myconf="$(use_with lm_sensors sensors)
+	              $(use_enable zeroconf dnssd)"
+
+	kde-meta_src_compile
+}
+
+PATCHES="${FILESDIR}/ksysguard-3.5.2-fixes.diff"