summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/kdelibs3/Makefile4
-rw-r--r--x11/kdelibs3/distinfo3
-rw-r--r--x11/kdelibs3/patches/patch-ah26
3 files changed, 30 insertions, 3 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 8bc923f6f45..de7ea290034 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2005/07/16 01:19:27 jlam Exp $
+# $NetBSD: Makefile,v 1.90 2005/07/30 10:40:26 markd Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 45e95fd7cd7..46705363318 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2005/05/31 14:13:23 markd Exp $
+$NetBSD: distinfo,v 1.58 2005/07/30 10:40:26 markd Exp $
SHA1 (kdelibs-3.4.1.tar.bz2) = 6f448da6f23a1c67b70c13c96aee74f9c870a936
RMD160 (kdelibs-3.4.1.tar.bz2) = 56396e21d6807965de621f1a9127d69e9108e6fc
@@ -9,6 +9,7 @@ SHA1 (patch-ad) = fc3a7b173dc93bad196fff3ddd9aef65c92dda64
SHA1 (patch-ae) = 8395dd9f24fb9cad91c1c04951dfc982cc8068f4
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
new file mode 100644
index 00000000000..5e98fdf3ff6
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-ah
@@ -0,0 +1,26 @@
+$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)