diff options
Diffstat (limited to 'www/mozilla/files')
| -rw-r--r-- | www/mozilla/files/patch-Makefile.in | 16 | ||||
| -rw-r--r-- | www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c | 45 | ||||
| -rw-r--r-- | www/mozilla/files/patch-qt | 10 |
3 files changed, 39 insertions, 32 deletions
diff --git a/www/mozilla/files/patch-Makefile.in b/www/mozilla/files/patch-Makefile.in index 43fa34684782..5480cb799b3d 100644 --- a/www/mozilla/files/patch-Makefile.in +++ b/www/mozilla/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Thu May 30 20:39:07 2002 -+++ Makefile.in Wed Aug 28 13:55:32 2002 -@@ -70,8 +70,7 @@ - $(tier_0_dirs) \ - $(tier_1_dirs) \ +--- Makefile.in.orig Fri Aug 29 20:20:58 2003 ++++ Makefile.in Sat Oct 18 15:34:15 2003 +@@ -67,8 +67,7 @@ $(tier_2_dirs) \ -- $(tier_9_dirs) \ + $(tier_9_dirs) \ + $(tier_40_dirs) \ +- $(tier_50_dirs) \ - $(NULL) -+ $(tier_9_dirs) ++ $(tier_50_dirs) ifdef GC_LEAK_DETECTOR DIRS += gc/boehm -@@ -90,7 +89,8 @@ +@@ -87,7 +86,8 @@ DIRS += $(tier_98_dirs) endif diff --git a/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c b/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c index 4a965d4c7440..08346f235416 100644 --- a/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c +++ b/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c @@ -1,22 +1,29 @@ -Index: nsprpub/pr/src/pthreads/ptio.c -diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c ---- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002 -+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002 -@@ -3414,6 +3414,17 @@ +--- nsprpub/pr/src/pthreads/ptio.c.orig Mon Jul 14 17:59:47 2003 ++++ nsprpub/pr/src/pthreads/ptio.c Fri Aug 29 15:39:46 2003 +@@ -189,7 +189,7 @@ + #endif + #endif + +-#ifdef DARWIN ++#if defined(DARWIN) || defined(FREEBSD) + static PRBool _pr_ipv6_v6only_on_by_default; + /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */ + #ifndef IPV6_V6ONLY +@@ -1154,7 +1154,7 @@ + _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE); + PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr); + +-#ifdef DARWIN ++#if defined(DARWIN) || defined(FREEBSD) + /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option + * is turned on by default, contrary to what RFC 3493, Section + * 5.3 says. So we have to turn it off. Find out whether we +@@ -3462,7 +3462,7 @@ if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); else { -+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \ -+ defined(__FreeBSD__) && defined(IPV6_V6ONLY) -+ if (domain == PR_AF_INET6) { -+ int opt = 0; -+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, -+ &opt, sizeof(opt))) { -+ close(osfd); -+ return NULL; -+ } -+ } -+#endif - fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE); - if (fd == NULL) close(osfd); - } +-#ifdef DARWIN ++#if defined(DARWIN) || defined(FREEBSD) + if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default) + { + int on = 0; diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt index c72d0a591c4c..895814c6add7 100644 --- a/www/mozilla/files/patch-qt +++ b/www/mozilla/files/patch-qt @@ -1,14 +1,14 @@ ---- configure.orig Wed Aug 27 11:00:21 2003 -+++ configure Sat Oct 11 12:22:54 2003 -@@ -11896,9 +11896,9 @@ +--- configure.orig Fri Aug 29 13:19:05 2003 ++++ configure Sat Oct 18 15:43:27 2003 +@@ -11957,9 +11957,9 @@ -MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck" +MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck" --MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm access-builtin datetime finger cview" -+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin datetime finger cview" +-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug" ++MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug" # Check whether --enable-extensions or --disable-extensions was given. if test "${enable_extensions+set}" = set; then |