diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2004-10-21 00:55:36 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2004-10-21 00:55:36 +0000 |
commit | 238299fff3bc2998b4770845e6ebc3397fc773cd (patch) | |
tree | 79ac2badaab2c716e55e5d0565d8d1a99c204c3b /www/firefox | |
parent | 5bd2e730be5361da43353905045d4c30923ba0e7 (diff) | |
download | pkgsrc-238299fff3bc2998b4770845e6ebc3397fc773cd.tar.gz |
Only include <stdbool.h> if !defined(_cplusplus) in nptypes.h.
Fixes build on NetBSD/macppc and maybe others, tested by Peter Bex
on 2-0/macppc and i386/-current/2-0 by me, closes PR pkg/27033.
Diffstat (limited to 'www/firefox')
-rw-r--r-- | www/firefox/distinfo | 3 | ||||
-rw-r--r-- | www/firefox/patches/patch-cd | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 2718f01c86c..287d3c8655a 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2004/10/04 09:15:29 grant Exp $ +$NetBSD: distinfo,v 1.19 2004/10/21 00:55:36 xtraeme Exp $ SHA1 (firefox-0.10.1/firefox-1.0PR-source.tar.bz2) = e12f861c8e55fe591053f30e9c9259fa8e662c41 Size (firefox-0.10.1/firefox-1.0PR-source.tar.bz2) = 32380173 bytes @@ -35,3 +35,4 @@ SHA1 (patch-bz) = 6f854d74a9d1d1174ce8eff7d65f8024a7da4711 SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b SHA1 (patch-cb) = fd0f033d63be066ce5c47057d72c48a085718908 SHA1 (patch-cc) = cb08d4b7330c9e471d172c11772c840e613ceb76 +SHA1 (patch-cd) = bbe839bce72a1d6816fa0c091172a818fb469981 diff --git a/www/firefox/patches/patch-cd b/www/firefox/patches/patch-cd new file mode 100644 index 00000000000..f27a7569d53 --- /dev/null +++ b/www/firefox/patches/patch-cd @@ -0,0 +1,29 @@ +$NetBSD: patch-cd,v 1.1 2004/10/21 00:55:36 xtraeme Exp $ + +--- modules/plugin/base/public/nptypes.h.orig 2004-10-21 01:07:27.000000000 +0200 ++++ modules/plugin/base/public/nptypes.h 2004-10-21 01:09:38.000000000 +0200 +@@ -78,8 +78,10 @@ + typedef int bool; + #endif + #else /* OPENBSD is defined, so use its bool */ ++ #if !defined(__cplusplus) + #include <stdbool.h> + #endif ++ #endif + #else + /* + * FreeBSD defines uint32_t and bool. +@@ -97,6 +99,7 @@ + */ + #include <stdint.h> + ++ #if !defined(__cplusplus) + #if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 95) + #include <stdbool.h> + #else +@@ -106,4 +109,5 @@ + */ + #define bool int + #endif ++ #endif + #endif |