Update KDE to 3.5.7

ark
* Handle correctly files bigger than 4GB.
* Do not crash with files starting with "/".

klaptopdaemon
* Fix problem filling .xsession-errors with lots of warnings.

kmilo
* Fix number of steps from 0 to 100% beign different than ones from
  100 to 0%.
* Do not assume KDE is on /usr/bin.

SuperKaramba
* Allow themes to receive mouse wheel events on meters.

4 files changed, 36 insertions, 24 deletions

diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index fd24b4d0984..97ac31155f9 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2007/01/26 03:19:22 markd Exp $
+# $NetBSD: Makefile,v 1.59 2007/05/23 13:19:23 markd Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
 COMMENT=	Utilities for the KDE integrated X11 desktop
@@ -36,5 +36,6 @@ CONFIGURE_ENV+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 .include "../../lang/python/application.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index a48954364e7..ce830ae7718 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.45 2007/01/26 03:19:22 markd Exp $
+$NetBSD: distinfo,v 1.46 2007/05/23 13:19:23 markd Exp $
 
-SHA1 (kdeutils-3.5.6.tar.bz2) = 4ac4b1a9ecb5c695eaff22b15e45eb043516f816
-RMD160 (kdeutils-3.5.6.tar.bz2) = ae0430b4647c259bf730fb427325644b0e8da721
-Size (kdeutils-3.5.6.tar.bz2) = 2989659 bytes
+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 (patch-ac) = 9b31039b0e3cc05dc4fb288ee8f66ebf3e440f6e
@@ -10,7 +10,8 @@ SHA1 (patch-ad) = 3504496bf4b0957e74ae999f16bc03ed3499371d
 SHA1 (patch-ae) = 7e46d3a6f2b148b7e85314ed998689fb59b98561
 SHA1 (patch-af) = b327fc5bdf735d38fd6e6771a9fcc301b3685e0b
 SHA1 (patch-ag) = 1ffc79e4fe9ce4af5400e4608e1930011da0d640
+SHA1 (patch-ah) = ca30c6d7579fe945411fb5a53d51c4095e93ecc4
 SHA1 (patch-an) = e13957a9fa0d23aebbe149ecaca7b9dacde5c9fb
-SHA1 (patch-ao) = 0ffece64199b090608feb5457fbdfce576691999
+SHA1 (patch-ao) = ef89fd10177e3164a1b3c0dcaccd104f1079ec6a
 SHA1 (patch-ap) = 7f8a89156f6d419ca708bf5e55a57d30e5f94756
 SHA1 (patch-aq) = a76ff5042c3dec821026f512f6e83f5a3eaa3d91
diff --git a/misc/kdeutils3/patches/patch-ah b/misc/kdeutils3/patches/patch-ah
new file mode 100644
index 00000000000..8521944d8b3
--- /dev/null
+++ b/misc/kdeutils3/patches/patch-ah
@@ -0,0 +1,13 @@
+$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-ao b/misc/kdeutils3/patches/patch-ao
index d79b0fc1877..dc92cf38527 100644
--- a/misc/kdeutils3/patches/patch-ao
+++ b/misc/kdeutils3/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.13 2006/01/08 12:07:52 markd Exp $
+$NetBSD: patch-ao,v 1.14 2007/05/23 13:19:23 markd Exp $
 
---- configure.orig	2005-11-26 20:19:12.000000000 +1300
+--- configure.orig	2007-05-14 23:44:00.000000000 +1200
 +++ configure
-@@ -34076,6 +34076,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -37382,6 +37382,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  
@@ -10,37 +10,34 @@ $NetBSD: patch-ao,v 1.13 2006/01/08 12:07:52 markd Exp $
  #include <sys/mount.h>
  
  
-@@ -34785,19 +34786,18 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -38175,17 +38176,19 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
 +#include <math.h>
 +
- /* Override any gcc2 internal prototype to avoid an error.  */
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char isinf ();
-+
 +double d = 0.0;
  int
  main ()
  {
--isinf ();
--  ;
--  return 0;
-+  return isinf (d);
+-return isinf ();
++return isinf (d);
+   ;
+   return 0;
  }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
-@@ -38008,6 +38008,8 @@ else
-   version=""2.4""
+@@ -42097,6 +42100,8 @@ else
+   version=""2.5""
  fi
  
 +version="$PYVERSSUFFIX"
 +
- echo "$as_me:$LINENO: checking for Python$version" >&5
- echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for Python$version" >&5
+ echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }