summaryrefslogtreecommitdiff
path: root/www/firefox
diff options
context:
space:
mode:
authortnn <tnn>2009-09-10 07:53:45 +0000
committertnn <tnn>2009-09-10 07:53:45 +0000
commit5ae33120af12190fb207000f37486c076b07c3e9 (patch)
treeca4ea773ae8eb9099936c97e43e6b8195568b3d8 /www/firefox
parent5caa7b657245db691920c8a83fb24ec2973b45b8 (diff)
downloadpkgsrc-5ae33120af12190fb207000f37486c076b07c3e9.tar.gz
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 (limited to 'www/firefox')
-rw-r--r--www/firefox/distinfo4
-rw-r--r--www/firefox/patches/patch-at16
2 files changed, 15 insertions, 5 deletions
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index c1117e6a4b7..34916d46657 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -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-ap) = 2044c8f0b293984755864b2ca5d45e4bb0407646
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 --git a/www/firefox/patches/patch-at b/www/firefox/patches/patch-at
index 545352b9225..8fa747d7104 100644
--- a/www/firefox/patches/patch-at
+++ b/www/firefox/patches/patch-at
@@ -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>