Update to KDE 3.5.8

kfloppy
* Check all available densities instead of a hardcoded list.
klaptopdaemon
* Fix lock & hibernate allowing unauthorised access .

9 files changed, 5 insertions, 298 deletions

diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 580ddd07a0c..c4f60ff1031 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2007/09/21 13:04:02 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2007/10/20 10:47:20 markd Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
-PKGREVISION=	1
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index f925c3b78d4..192ca999ebb 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,18 +1,11 @@
-$NetBSD: distinfo,v 1.47 2007/06/06 11:10:34 markd Exp $
+$NetBSD: distinfo,v 1.48 2007/10/20 10:47:20 markd Exp $
 
-SHA1 (kdeutils-3.5.7.tar.bz2) = 8e5ba582de84851ed153998f93c8a3789e8df6bd
-RMD160 (kdeutils-3.5.7.tar.bz2) = 0382278d69e71ff77178902f06126bda0f771ee8
-Size (kdeutils-3.5.7.tar.bz2) = 3068596 bytes
-SHA1 (patch-aa) = 0e9c35666640bdd17b22c03fb06ad6c3eed3a382
-SHA1 (patch-ab) = c85392afdb34c52d309940d7a485d4d2b7b6faaf
+SHA1 (kdeutils-3.5.8.tar.bz2) = 55aac5ecb90ee8a9854603eb2415adb2da6f249c
+RMD160 (kdeutils-3.5.8.tar.bz2) = 94267b9c08339c7310d65106110c9b9ef133d6f8
+Size (kdeutils-3.5.8.tar.bz2) = 3059172 bytes
 SHA1 (patch-ac) = 9b31039b0e3cc05dc4fb288ee8f66ebf3e440f6e
-SHA1 (patch-ad) = 3504496bf4b0957e74ae999f16bc03ed3499371d
 SHA1 (patch-ae) = 7e46d3a6f2b148b7e85314ed998689fb59b98561
-SHA1 (patch-af) = b327fc5bdf735d38fd6e6771a9fcc301b3685e0b
-SHA1 (patch-ag) = 1ffc79e4fe9ce4af5400e4608e1930011da0d640
-SHA1 (patch-ah) = ca30c6d7579fe945411fb5a53d51c4095e93ecc4
 SHA1 (patch-ai) = 6a4b3d3d77ba2756a7ee71d923d8bfe78c735bce
 SHA1 (patch-an) = e13957a9fa0d23aebbe149ecaca7b9dacde5c9fb
 SHA1 (patch-ao) = ef89fd10177e3164a1b3c0dcaccd104f1079ec6a
-SHA1 (patch-ap) = 7f8a89156f6d419ca708bf5e55a57d30e5f94756
 SHA1 (patch-aq) = a76ff5042c3dec821026f512f6e83f5a3eaa3d91
diff --git a/misc/kdeutils3/patches/patch-aa b/misc/kdeutils3/patches/patch-aa
deleted file mode 100644
index 7dfff30128b..00000000000
--- a/misc/kdeutils3/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2006/01/05 20:25:16 joerg Exp $
-
---- ksim/monitors/disk/ksimdisk.cpp.orig	2005-11-16 20:47:00.000000000 +0000
-+++ ksim/monitors/disk/ksimdisk.cpp
-@@ -41,7 +41,13 @@
- #include <progress.h>
- #include <themetypes.h>
- 
--#ifdef Q_OS_FREEBSD
-+#if defined(__DragonFly__)
-+#include <sys/time.h>
-+#include <sys/param.h>
-+#include <sys/resource.h>
-+#include <devstat.h>
-+#include <stdlib.h>
-+#elif defined(Q_OS_FREEBSD)
- #include <sys/param.h>
- #if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
-@@ -343,7 +349,7 @@ void DiskView::updateData(DiskList &disk
- #endif
- 
- #ifdef Q_OS_FREEBSD
--#if __FreeBSD_version < 500107
-+#if defined(__DragonFly__) || __FreeBSD_version < 500107
- #define	devstat_getdevs(fd, stats)	getdevs(stats)
- #define	devstat_selectdevs		selectdevs
- #define	bytes_read(dev)			(dev).bytes_read
diff --git a/misc/kdeutils3/patches/patch-ab b/misc/kdeutils3/patches/patch-ab
deleted file mode 100644
index b5459ea8df3..00000000000
--- a/misc/kdeutils3/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2006/01/05 20:25:16 joerg Exp $
-
---- superkaramba/src/misc_python.cpp.orig	2005-12-29 17:08:09.000000000 +0000
-+++ superkaramba/src/misc_python.cpp
-@@ -425,7 +425,7 @@ PyObject* py_hide(PyObject *, PyObject *
- #include <sys/ioctl.h>
- #include <net/if.h>
- #include <arpa/inet.h>
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <netinet/in.h>
- #endif
- #if defined(Q_OS_SOLARIS)
diff --git a/misc/kdeutils3/patches/patch-ad b/misc/kdeutils3/patches/patch-ad
deleted file mode 100644
index a0631449d91..00000000000
--- a/misc/kdeutils3/patches/patch-ad
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2006/01/05 20:25:16 joerg Exp $
-
---- ksim/monitors/filesystem/filesystemstats.cpp.orig	2005-10-05 13:26:44.000000000 +0000
-+++ ksim/monitors/filesystem/filesystemstats.cpp
-@@ -30,7 +30,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- 
--#ifdef HAVE_SYS_STATVFS_H
-+#if defined(HAVE_SYS_STATVFS_H) && !defined(__DragonFly__)
- #include <sys/statvfs.h>
- #elif defined( HAVE_SYS_STATFS_H )
- #include <sys/statfs.h>
-@@ -56,10 +56,12 @@
- #include <stdio.h>
- #include <unistd.h>
- 
--#ifdef HAVE_STATVFS
-+#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
- typedef struct statvfs ksim_statfs;
-+#define ksim_getfsstat getvfsstat
- #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
- typedef struct statfs ksim_statfs;
-+#define ksim_getfsstat getfsstat
- #else
- typedef struct // fall back for (possibly) non-supported systems
- {
-@@ -70,7 +72,7 @@ typedef struct // fall back for (possibl
- 
- int fsystemStats( const char * file, ksim_statfs & stats )
- {
--#ifdef HAVE_STATVFS
-+#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
-   return statvfs( file, &stats );
- #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
-   return statfs( file, &stats );
-@@ -159,9 +161,9 @@ FilesystemStats::List FilesystemStats::r
- #endif
- 
- #ifdef USE_FSSTAT
--  struct statfs sfs[32];
-+  ksim_statfs sfs[32];
-   int fs_count;
--  if ( ( fs_count = getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
-+  if ( ( fs_count = ksim_getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
-   {
-     for ( int i = 0; i < fs_count; i++ )
-     {
diff --git a/misc/kdeutils3/patches/patch-af b/misc/kdeutils3/patches/patch-af
deleted file mode 100644
index 481bb275f99..00000000000
--- a/misc/kdeutils3/patches/patch-af
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-af,v 1.8 2006/05/09 12:48:13 joerg Exp $
-
---- superkaramba/src/memsensor.h.orig	2006-05-09 10:22:30.000000000 +0000
-+++ superkaramba/src/memsensor.h
-@@ -44,18 +44,17 @@ public:
- private:
-   QString meminfo;
-   void readValues();
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
-+#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-   int pageshift;           /* log base 2 of the pagesize */
-   QString sensorResult;
-   int swapTotal;
-   int swapUsed;
--# if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
--  KShellProcess ksp;
--  bool MaxSet;
--
--# elif defined __FreeBSD__
-+# if defined(Q_OS_FREEBSD) && defined(__FreeBSD_version) && __FreeBSD_version >= 500018
-   kvm_t *kd;
-   kvm_swap swapinfo;
-+# elif defined(Q_OS_FREEBSD)
-+  KShellProcess ksp;
-+  bool MaxSet;
- # endif
- #endif
- 
diff --git a/misc/kdeutils3/patches/patch-ag b/misc/kdeutils3/patches/patch-ag
deleted file mode 100644
index 717cb4a7d89..00000000000
--- a/misc/kdeutils3/patches/patch-ag
+++ /dev/null
@@ -1,109 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/05/09 12:48:13 joerg Exp $
-
---- superkaramba/src/memsensor.cpp.orig	2006-05-09 10:25:07.000000000 +0000
-+++ superkaramba/src/memsensor.cpp
-@@ -32,6 +32,8 @@
- #include <sys/swap.h>
- #endif
- 
-+#include <kprocio.h>
-+
- #if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
- /* define pagetok in terms of pageshift */
- #define pagetok(size) ((size) << pageshift)
-@@ -51,7 +53,9 @@ MemSensor::MemSensor(int msec) : Sensor(
- 
-     /* we only need the amount of log(2)1024 for our conversion */
-     pageshift -= 10;
--# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-+# if defined(Q_OS_FREEBSD) && defined(__FreeBSD_version) && __FreeBSD_version >= 500018
-+    kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open");
-+# elif defined Q_OS_FREEBSD
-     connect(&ksp, SIGNAL(receivedStdout(KProcess *, char *, int )),
-             this,SLOT(receivedStdout(KProcess *, char *, int )));
-     connect(&ksp, SIGNAL(processExited(KProcess *)),
-@@ -62,8 +66,6 @@ MemSensor::MemSensor(int msec) : Sensor(
-     MaxSet = false;
- 
-     readValues();
--# elif defined Q_OS_FREEBSD
--    kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open");
- # endif
- #else
-     readValues();
-@@ -180,9 +182,7 @@ int MemSensor::getCached()
- int MemSensor::getSwapTotal()
- {
- #ifdef Q_OS_FREEBSD
--# if __FreeBSD_version < 500018
--    return(swapTotal);
--# else
-+# if defined(__FreeBSD_version) && __FreeBSD_version >= 500018
-     int n = -1;
-     int pagesize = getpagesize();
-     int retavail = 0;
-@@ -196,6 +196,8 @@ int MemSensor::getSwapTotal()
-     retavail = swapinfo.ksw_total * pagesize / 1024;
- 
-     return(retavail);
-+#else
-+    return(swapTotal);
- # endif
- #elif defined(Q_OS_NETBSD)
-     struct uvmexp_sysctl uvmexp;
-@@ -222,9 +224,7 @@ int MemSensor::getSwapTotal()
- int MemSensor::getSwapFree()
- {
- #ifdef Q_OS_FREEBSD
--# if __FreeBSD_version < 500018
--    return(swapTotal - swapUsed);
--# else
-+# if defined(__FreeBSD_version) && __FreeBSD_version >= 500018
-     int n = -1;
-     int pagesize = getpagesize();
-     int retfree = 0;
-@@ -237,6 +237,8 @@ int MemSensor::getSwapFree()
-     retfree = (swapinfo.ksw_total - swapinfo.ksw_used) * pagesize / 1024;
- 
-     return(retfree);
-+# else
-+    return(swapTotal - swapUsed);
- # endif
- #elif defined(Q_OS_NETBSD)
-     struct uvmexp_sysctl uvmexp;
-@@ -267,7 +269,7 @@ int MemSensor::getSwapFree()
- void MemSensor::readValues()
- {
- #if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
--# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-+# if defined(Q_OS_FREEBSD) && !(defined(__FreeBSD_version) && __FreeBSD_version >= 500018)
-     ksp.clearArguments();
-     ksp << "swapinfo";
-     ksp.start( KProcess::NotifyOnExit,KProcIO::Stdout);
-@@ -291,7 +293,7 @@ void MemSensor::update()
-     SensorParams *sp;
-     Meter *meter;
-     QObjectListIt it( *objList );
--#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-+#if defined(Q_OS_FREEBSD) && !(defined(__FreeBSD_version) && __FreeBSD_version >= 500018)
-     bool set = false;
- #endif
-     int totalMem = getMemTotal();
-@@ -303,7 +305,7 @@ void MemSensor::update()
-     while (it != 0)
-     {
-         sp = (SensorParams*)(*it);
--#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-+#if defined(Q_OS_FREEBSD) && !(defined(__FreeBSD_version) && __FreeBSD_version >= 500018)
-         if ( (!MaxSet) && (totalSwap > 0) ) {
-            setMaxValue(sp);
-            bool set = true;
-@@ -331,7 +333,7 @@ void MemSensor::update()
-         meter->setValue(format);
-         ++it;
-     }
--#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-+#if defined(Q_OS_FREEBSD) && !(defined(__FreeBSD_version) && __FreeBSD_version >= 500018)
-     if (set)
-         MaxSet = true;
- #endif
diff --git a/misc/kdeutils3/patches/patch-ah b/misc/kdeutils3/patches/patch-ah
deleted file mode 100644
index 8521944d8b3..00000000000
--- a/misc/kdeutils3/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2007/05/23 13:19:23 markd Exp $
-
---- klaptopdaemon/Makefile.in.orig	2007-05-23 00:41:34.000000000 +1200
-+++ klaptopdaemon/Makefile.in
-@@ -489,7 +489,7 @@ MESSAGE_SOURCES = laptop_daemon.cpp kpcm
- #>+ 1
- kded_klaptopdaemon_la_SOURCES=$(MESSAGE_SOURCES)    laptop_daemon_skel.cc
- kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version  -lXtst
--kded_klaptopdaemon_la_LIBADD = $(LIB_KDEUI) libkcmlaptop.la
-+kded_klaptopdaemon_la_LIBADD = $(LIB_KDEUI) libkcmlaptop.la $(LIB_XSS)
- klaptop_acpi_helper_SOURCES = acpi_helper.cpp
- klaptop_check_SOURCES = laptop_check.cpp 
- klaptop_check_LDFLAGS = $(all_libraries) 
diff --git a/misc/kdeutils3/patches/patch-ap b/misc/kdeutils3/patches/patch-ap
deleted file mode 100644
index dde4fe48c01..00000000000
--- a/misc/kdeutils3/patches/patch-ap
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ap,v 1.4 2006/01/05 20:25:16 joerg Exp $
-
---- ksim/monitors/cpu/ksimcpu.cpp.orig	2005-10-05 13:26:45.000000000 +0000
-+++ ksim/monitors/cpu/ksimcpu.cpp
-@@ -44,7 +44,13 @@
- 
- #ifdef Q_OS_BSD4
- #include <sys/param.h>
--#ifdef Q_OS_FREEBSD
-+#if defined(__DragonFly__)
-+#include <kinfo.h>
-+#include <err.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
-+
-+#elif defined Q_OS_FREEBSD
- #if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
- #else
-@@ -235,7 +241,15 @@ void CpuView::updateCpu(CpuData &cpu, in
-   fseek(m_procFile, 0L, SEEK_SET);
- #endif
- 
--#ifdef Q_OS_FREEBSD
-+#ifdef __DragonFly__
-+  struct kinfo_cputime cp_time;
-+  if (kinfo_get_sched_cputime(&cp_time))
-+    err(1, "kinfo_get_sched_cputime");
-+  cpu.user = cp_time.cp_user;
-+  cpu.nice = cp_time.cp_nice;
-+  cpu.sys = cp_time.cp_sys;
-+  cpu.idle = cp_time.cp_idle;
-+#elif defined(Q_OS_FREEBSD)
- #warning "add support for SMP on FreeBSD"
-   Q_UNUSED(cpuNumber);
-   static int name2oid[2] = { 0, 3 };
-@@ -265,6 +279,9 @@ void CpuView::updateCpu(CpuData &cpu, in
-   cpu.idle = cpuTime[CP_IDLE];
- #endif
- 
-+#if defined(Q_OS_NETBSD)
-+#define KERN_CPTIME KERN_CP_TIME
-+#endif
- #if defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD)
- //#warning "add support for SMP on OpenBSD and NetBSD"
-   int name2oid[2] = { CTL_KERN, KERN_CPTIME };