[pkgsrc/trunk]: pkgsrc In qcmstypes.h, don't redefine standard types line uin...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7b15d56f1f62
branches:  trunk
changeset: 564730:7b15d56f1f62
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Sep 10 07:53:45 2009 +0000

description:
In qcmstypes.h, don't redefine standard types line uintptr_t, uint32_t
and friends. Include <stdint.h> instead. Might fix PR pkg/42033.

diffstat:

 devel/xulrunner/distinfo         |   4 ++--
 devel/xulrunner/patches/patch-at |  16 +++++++++++++---
 www/firefox/distinfo             |   4 ++--
 www/firefox/patches/patch-at     |  16 +++++++++++++---
 4 files changed, 30 insertions(+), 10 deletions(-)

diffs (90 lines):

diff -r cad4e4c1b29b -r 7b15d56f1f62 devel/xulrunner/distinfo
--- a/devel/xulrunner/distinfo  Thu Sep 10 05:14:09 2009 +0000
+++ b/devel/xulrunner/distinfo  Thu Sep 10 07:53:45 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2009/09/09 18:15:37 tnn Exp $
+$NetBSD: distinfo,v 1.6 2009/09/10 07:53:45 tnn Exp $
 
 SHA1 (xulrunner-1.9.1.2-source.tar.bz2) = 6439923ff9d316297926ebe193bac3ac1a41b494
 RMD160 (xulrunner-1.9.1.2-source.tar.bz2) = d5e0b5f0e8b19b216394584ccabf37d776b89a39
@@ -22,7 +22,7 @@
 SHA1 (patch-aq) = ee2f7917fbf102ce6d20f1467702815b062f82e7
 SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b
 SHA1 (patch-as) = aa83f9b834d796982a2b580ed908e188a28c6a41
-SHA1 (patch-at) = 97d407a7c3eae661d194e1c59d7d721843acf8c0
+SHA1 (patch-at) = 2d09714ba426632a5d67b1b100c2ac4d1e673536
 SHA1 (patch-au) = f27b6c8b2c744da388e1d15d0776929e7165ee76
 SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771
 SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
diff -r cad4e4c1b29b -r 7b15d56f1f62 devel/xulrunner/patches/patch-at
--- a/devel/xulrunner/patches/patch-at  Thu Sep 10 05:14:09 2009 +0000
+++ b/devel/xulrunner/patches/patch-at  Thu Sep 10 07:53:45 2009 +0000
@@ -1,10 +1,20 @@
-$NetBSD: patch-at,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $
+$NetBSD: patch-at,v 1.2 2009/09/10 07:53:45 tnn Exp $
 
 Treat DragonFly like FreeBSD.
+Avoid silly redefinitions of standard types on NetBSD.
 
---- gfx/qcms/qcmstypes.h.orig  2009-06-29 18:14:50.000000000 +0200
+--- gfx/qcms/qcmstypes.h.orig  2009-08-24 17:52:41.000000000 +0200
 +++ gfx/qcms/qcmstypes.h
-@@ -23,7 +23,7 @@ typedef PRUint64 uint64_t;
+@@ -10,6 +10,8 @@
+ #if defined (__SVR4) && defined (__sun)
+ /* int_types.h gets included somehow, so avoid redefining the types differently */
+ #include <sys/int_types.h>
++#elif defined(__NetBSD__)
++#include <stdint.h>
+ #else
+ typedef PRInt8 int8_t;
+ typedef PRUint8 uint8_t;
+@@ -23,7 +25,7 @@ typedef PRUint64 uint64_t;
  #ifdef __OS2__
  /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
  #include <stdlib.h>
diff -r cad4e4c1b29b -r 7b15d56f1f62 www/firefox/distinfo
--- a/www/firefox/distinfo      Thu Sep 10 05:14:09 2009 +0000
+++ b/www/firefox/distinfo      Thu Sep 10 07:53:45 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.94 2009/09/10 00:03:37 tnn Exp $
+$NetBSD: distinfo,v 1.95 2009/09/10 07:53:45 tnn Exp $
 
 SHA1 (firefox-3.5.3.source.tar.bz2) = 83b2625eb74e81b473ac40ac52505e5fc9a497eb
 RMD160 (firefox-3.5.3.source.tar.bz2) = c2487c90b4a9490840817c7b00dcccd68a0c4422
@@ -22,7 +22,7 @@
 SHA1 (patch-aq) = ee2f7917fbf102ce6d20f1467702815b062f82e7
 SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b
 SHA1 (patch-as) = aa83f9b834d796982a2b580ed908e188a28c6a41
-SHA1 (patch-at) = 97d407a7c3eae661d194e1c59d7d721843acf8c0
+SHA1 (patch-at) = 2d09714ba426632a5d67b1b100c2ac4d1e673536
 SHA1 (patch-au) = f27b6c8b2c744da388e1d15d0776929e7165ee76
 SHA1 (patch-av) = 6ddcbbd3f0197fb88622fc32d6d0fd602ec4ad34
 SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
diff -r cad4e4c1b29b -r 7b15d56f1f62 www/firefox/patches/patch-at
--- a/www/firefox/patches/patch-at      Thu Sep 10 05:14:09 2009 +0000
+++ b/www/firefox/patches/patch-at      Thu Sep 10 07:53:45 2009 +0000
@@ -1,10 +1,20 @@
-$NetBSD: patch-at,v 1.3 2009/08/05 02:43:47 tnn Exp $
+$NetBSD: patch-at,v 1.4 2009/09/10 07:53:46 tnn Exp $
 
 Treat DragonFly like FreeBSD.
+Avoid silly redefinitions of standard types on NetBSD.
 
---- gfx/qcms/qcmstypes.h.orig  2009-06-29 18:14:50.000000000 +0200
+--- gfx/qcms/qcmstypes.h.orig  2009-08-24 17:52:41.000000000 +0200
 +++ gfx/qcms/qcmstypes.h
-@@ -23,7 +23,7 @@ typedef PRUint64 uint64_t;
+@@ -10,6 +10,8 @@
+ #if defined (__SVR4) && defined (__sun)
+ /* int_types.h gets included somehow, so avoid redefining the types differently */
+ #include <sys/int_types.h>
++#elif defined(__NetBSD__)
++#include <stdint.h>
+ #else
+ typedef PRInt8 int8_t;
+ typedef PRUint8 uint8_t;
+@@ -23,7 +25,7 @@ typedef PRUint64 uint64_t;
  #ifdef __OS2__
  /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
  #include <stdlib.h>