[pkgsrc/pkgsrc-2005Q2]: pkgsrc/x11/kdelibs3 Pullup ticket 675 - requested by ...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/69db3c529c15
branches:  pkgsrc-2005Q2
changeset: 495977:69db3c529c15
user:      salo <salo%pkgsrc.org@localhost>
date:      Thu Aug 11 16:36:49 2005 +0000

description:
Pullup ticket 675 - requested by Mark Davies
portability fix for kdelibs3

Revisions pulled up:
- pkgsrc/x11/kdelibs3/Makefile          1.90
- pkgsrc/x11/kdelibs3/distinfo          1.58
- pkgsrc/x11/kdelibs3/patches/patch-ah  1.6

   Module Name:         pkgsrc
   Committed By:        markd
   Date:                Sat Jul 30 10:40:27 UTC 2005

   Modified Files:
        pkgsrc/x11/kdelibs3: Makefile distinfo
   Added Files:
        pkgsrc/x11/kdelibs3/patches: patch-ah

   Log Message:
   Fix SIGBUS core dumps on sparc64. Patch from Michael Lorenz.
   Bump PKGREVISION.

diffstat:

 x11/kdelibs3/Makefile         |   3 ++-
 x11/kdelibs3/distinfo         |   3 ++-
 x11/kdelibs3/patches/patch-ah |  26 ++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r a1fd18c69e00 -r 69db3c529c15 x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile     Thu Aug 11 07:08:46 2005 +0000
+++ b/x11/kdelibs3/Makefile     Thu Aug 11 16:36:49 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2005/05/31 14:13:23 markd Exp $
+# $NetBSD: Makefile,v 1.87.2.1 2005/08/11 16:36:49 salo Exp $
 
 DISTNAME=      kdelibs-${_KDE_VERSION}
+PKGREVISION=   2
 CATEGORIES=    x11
 COMMENT=       Support libraries for the KDE integrated X11 desktop
 
diff -r a1fd18c69e00 -r 69db3c529c15 x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo     Thu Aug 11 07:08:46 2005 +0000
+++ b/x11/kdelibs3/distinfo     Thu Aug 11 16:36:49 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2005/05/31 14:13:23 markd Exp $
+$NetBSD: distinfo,v 1.57.2.1 2005/08/11 16:36:49 salo Exp $
 
 SHA1 (kdelibs-3.4.1.tar.bz2) = 6f448da6f23a1c67b70c13c96aee74f9c870a936
 RMD160 (kdelibs-3.4.1.tar.bz2) = 56396e21d6807965de621f1a9127d69e9108e6fc
@@ -9,6 +9,7 @@
 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 -r a1fd18c69e00 -r 69db3c529c15 x11/kdelibs3/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdelibs3/patches/patch-ah     Thu Aug 11 16:36:49 2005 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-ah,v 1.5.10.1 2005/08/11 16:36:50 salo 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)