Give up --enable-crypto

[pkgsrc-firefox3.git] / patches / patch-ai

diff --git a/patches/patch-ai b/patches/patch-ai
index a5e4a8e4cb68dc248c03cd5131f2783212d2219a..154148e57a1dcb4c162f796b63b7c4dcf72a83d3 100644 (file)
--- a/patches/patch-ai
+++ b/patches/patch-ai
@@ -1,13 +1,40 @@
 $NetBSD$
 
---- nsprpub/pr/include/md/_darwin.h.orig       2009-02-03 23:16:39.000000000 +0900
-+++ nsprpub/pr/include/md/_darwin.h
-@@ -62,7 +62,7 @@
- 
- #undef  HAVE_STACK_GROWING_UP
- #define HAVE_DLL
--#define USE_MACH_DYLD
-+#define USE_DLFCN
- #define _PR_HAVE_SOCKADDR_LEN  
- #define _PR_STAT_HAS_ST_ATIMESPEC
- #define _PR_HAVE_LARGE_OFF_T
+--- xpcom/base/nsStackWalk.cpp.orig    2009-02-04 01:06:49.000000000 +0900
++++ xpcom/base/nsStackWalk.cpp
+@@ -1107,7 +1107,7 @@ NS_FormatCodeAddressDetails(void *aPC, c
+ 
+ // WIN32 x86 stack walking code
+ // i386 or PPC Linux stackwalking code or Solaris
+-#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))) || (defined(XP_MACOSX) && (defined(__ppc__) || defined(__i386))))
++#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))) || (defined(__APPLE__) && (defined(__ppc__) || defined(__i386))))
+ 
+ #include <stdlib.h>
+ #include <string.h>
+@@ -1124,7 +1124,7 @@ NS_FormatCodeAddressDetails(void *aPC, c
+ #define __USE_GNU
+ #endif
+ 
+-#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
++#if defined(HAVE_LIBDL) || defined(__APPLE__)
+ #include <dlfcn.h>
+ #endif
+ 
+@@ -1394,7 +1394,7 @@ NS_FormatCodeAddressDetails(void *aPC, c
+ 
+ #else // not __sun-specific
+ 
+-#if (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC))) || (defined(XP_MACOSX) && (defined(__i386) || defined(__ppc__))) // i386 or PPC Linux or Mac stackwalking code
++#if (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC))) || (defined(__APPLE__) && (defined(__i386) || defined(__ppc__))) // i386 or PPC Linux or Mac stackwalking code
+ 
+ #if __GLIBC__ > 2 || __GLIBC_MINOR > 1
+ #define HAVE___LIBC_STACK_END 1
+@@ -1437,7 +1437,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
+         (long(next) & 3)) {
+       break;
+     }
+-#if (defined(__ppc__) && defined(XP_MACOSX)) || defined(__powerpc64__)
++#if (defined(__ppc__) && defined(__APPLE__)) || defined(__powerpc64__)
+     // ppc mac or powerpc64 linux
+     void *pc = *(bp+2);
+ #else // i386 or powerpc32 linux