From 568b381d79f01b8516321850c38c3bc9a2e0f192 Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Thu, 13 Oct 2005 12:31:59 +0000
Subject: [PATCH] Update to KDE 3.4.3

Changes:
backport of bug fixes.
---
 x11/kdelibs3/Makefile         |  3 +--
 x11/kdelibs3/PLIST            |  3 ++-
 x11/kdelibs3/distinfo         |  9 ++++-----
 x11/kdelibs3/patches/patch-ah | 26 --------------------------
 4 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 x11/kdelibs3/patches/patch-ah

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 1ec21c317f17..0f34d1f35803 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.92 2005/08/20 19:16:22 jlam Exp $
+# $NetBSD: Makefile,v 1.93 2005/10/13 12:31:59 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST
index be4ff881fb28..a86abc42bae7 100644
--- a/x11/kdelibs3/PLIST
+++ b/x11/kdelibs3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2005/07/30 11:04:59 markd Exp $
+@comment $NetBSD: PLIST,v 1.27 2005/10/13 12:31:59 markd Exp $
 bin/artsmessage
 bin/checkXML
 ${CUPS}bin/cupsdconf
@@ -4265,6 +4265,7 @@ share/kde/icons/crystalsvg/64x64/actions/fileprint.png
 share/kde/icons/crystalsvg/64x64/actions/filequickprint.png
 share/kde/icons/crystalsvg/64x64/actions/frameprint.png
 share/kde/icons/crystalsvg/64x64/actions/knewstuff.png
+share/kde/icons/crystalsvg/64x64/actions/player_play.png
 share/kde/icons/crystalsvg/64x64/actions/player_playlist.png
 share/kde/icons/crystalsvg/64x64/actions/share.png
 share/kde/icons/crystalsvg/64x64/apps/password.png
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 8a0923664a8e..90b3115e52af 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.60 2005/10/12 18:50:12 joerg Exp $
+$NetBSD: distinfo,v 1.61 2005/10/13 12:31:59 markd Exp $
 
-SHA1 (kdelibs-3.4.2.tar.bz2) = b7eda5ecf0c33fe533c1cc2c6b5a3f69247b535e
-RMD160 (kdelibs-3.4.2.tar.bz2) = c418d9cd437db9c0f3fd3ef4653fd887c382cb56
-Size (kdelibs-3.4.2.tar.bz2) = 16878510 bytes
+SHA1 (kdelibs-3.4.3.tar.bz2) = ab701b90efc9cfe29e8e9c461d8b8c82357d8ef7
+RMD160 (kdelibs-3.4.3.tar.bz2) = 3bf89c0694f0fbabe46ae75d49f3eaf651fc2a90
+Size (kdelibs-3.4.3.tar.bz2) = 16877867 bytes
 SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779
 SHA1 (patch-ab) = 3a79b3e7fadef1a93a5490b716dace60f3de30a1
 SHA1 (patch-ad) = 540dd7a07448647fde2a8b44e4b4cd44e50a5fb9
 SHA1 (patch-ae) = 338b33e580328a24d3ea2af4c5cf08a8721fa845
 SHA1 (patch-af) = 7fbb3abcbf56020e3827ddf9d056beab9d1f3cd7
 SHA1 (patch-ag) = e471fdf5428e0f515ef3fe5427622854886ef952
-SHA1 (patch-ah) = a96d52fbd9d5f8cdb3cc41e4ee1fef212f730807
 SHA1 (patch-an) = d3141b53409e7a5dfa324bbf8ddabebb18d775a6
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
 SHA1 (patch-bd) = 172e1146d4e1e49a1a61d7ddc415dbfa4e5c4088
diff --git a/x11/kdelibs3/patches/patch-ah b/x11/kdelibs3/patches/patch-ah
deleted file mode 100644
index 5e98fdf3ff6f..000000000000
--- a/x11/kdelibs3/patches/patch-ah
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ah,v 1.6 2005/07/30 10:40:27 markd Exp $
-
---- kwallet/backend/sha1.cc.orig	2005-05-24 00:16:08.000000000 +1200
-+++ kwallet/backend/sha1.cc
-@@ -19,6 +19,12 @@
- */
- 
- #include <config.h>
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_BITYPES_H
-+#include <sys/bitypes.h> /* For uintXX_t on Tru64 */
-+#endif
- 
- #include "sha1.h"
- #include <string.h>
-@@ -307,7 +313,7 @@ const unsigned char *SHA1::hash() {
- 	p = _buf;
- 
- #ifdef WORDS_BIGENDIAN
--#define X(a) do { *(unsigned long *)p = _h##a; p += 4; } while (0)
-+#define X(a) do { *(uint32_t *)p = _h##a; p += 4; } while (0)
- #else
- #define X(a) do { *p++ = _h##a >> 24;  *p++ = _h##a >> 16;             \
- 			*p++ = _h##a >>  8;  *p++ = _h##a;        } while (0)