diff options
author | Aron Griffis <agriffis@gentoo.org> | 2005-04-25 21:14:10 +0000 |
---|---|---|
committer | Aron Griffis <agriffis@gentoo.org> | 2005-04-25 21:14:10 +0000 |
commit | f7c9c898a9c0ff410108027ff5bcfd21e7a2847e (patch) | |
tree | f839b614250cd0144f3b2876fd21b7ddb6acce6c /www-client | |
parent | unmasking x86 (diff) | |
download | gentoo-2-f7c9c898a9c0ff410108027ff5bcfd21e7a2847e.tar.gz gentoo-2-f7c9c898a9c0ff410108027ff5bcfd21e7a2847e.tar.bz2 gentoo-2-f7c9c898a9c0ff410108027ff5bcfd21e7a2847e.zip |
Mark 1.0.3 as non-working on ia64; add 1.0.3-r1 with ia64 patch, plus a patch
to set a few default preferences as Debian does: disable application updating
by default since we want to control it with portage, inherit LANG from env,
etc. Did not add ~arches to 1.0.3-r1 since the rebuild is unnecessary for the
installed base. Instead just plan to use 1.0.3-r1 as the basis for the next
~arches-marked ebuild. Remove some dead wood from files dir.
(Portage version: 2.0.51.19)
Diffstat (limited to 'www-client')
10 files changed, 1237 insertions, 1637 deletions
diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog index 7364232e58a6..b03b2e194cff 100644 --- a/www-client/mozilla-firefox/ChangeLog +++ b/www-client/mozilla-firefox/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for www-client/mozilla-firefox # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.22 2005/04/18 22:03:53 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.23 2005/04/25 21:14:10 agriffis Exp $ + +*mozilla-firefox-1.0.3-r1 (25 Apr 2005) + + 25 Apr 2005; Aron Griffis <agriffis@gentoo.org> + -files/mozilla-firebird-amd64.patch, + +files/mozilla-firefox-1.0.3-ia64.patch, + +files/mozilla-firefox-1.0.3-prefs.patch, -files/firefox, + -files/mozilla-firefox-mousebuttons.patch, mozilla-firefox-1.0.3.ebuild, + +mozilla-firefox-1.0.3-r1.ebuild: + Mark 1.0.3 as non-working on ia64; add 1.0.3-r1 with ia64 patch, plus a patch + to set a few default preferences as Debian does: disable application updating + by default since we want to control it with portage, inherit LANG from env, + etc. Did not add ~arches to 1.0.3-r1 since the rebuild is unnecessary for the + installed base. Instead just plan to use 1.0.3-r1 as the basis for the next + ~arches-marked ebuild. Remove some dead wood from files dir. 18 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> mozilla-firefox-1.0.3.ebuild: diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest index 42ca195705ac..ea153083edf0 100644 --- a/www-client/mozilla-firefox/Manifest +++ b/www-client/mozilla-firefox/Manifest @@ -1,30 +1,21 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 d4d822d41fe5f23af5995ed9300ac9c3 ChangeLog 20225 -MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 -MD5 ebdb84ca864e6a0fc32f3e130bf524e7 mozilla-firefox-1.0.2.ebuild 6614 -MD5 01e6d57e1988a143e419d77031225089 mozilla-firefox-1.0.3.ebuild 7797 +MD5 fb3ee8699f5e16f4490c9dacf69b2c7f mozilla-firefox-1.0.3-r1.ebuild 8127 +MD5 a4ca52b356de35da0ec7adda9d7f9d3b mozilla-firefox-1.0.3.ebuild 7798 MD5 a5d2651cec78aa8dd7883ff06d730187 mozilla-firefox-1.0.2-r1.ebuild 7805 +MD5 ebdb84ca864e6a0fc32f3e130bf524e7 mozilla-firefox-1.0.2.ebuild 6614 +MD5 66e13a89fce2047436036cdb4e9a3290 ChangeLog 21034 +MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 +MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444 +MD5 b16efe0e4066720b718d67348aeee757 files/mozilla-firefox-1.0-4ft2.patch 22294 MD5 7870df97e6382caede680d440af594c1 files/digest-mozilla-firefox-1.0.2 75 -MD5 606e82226379fd5ae6cd1d0d1faff7ff files/10MozillaFirefox 31 MD5 c1b444abfc62f5c642c44f44e2436308 files/digest-mozilla-firefox-1.0.3 75 MD5 7870df97e6382caede680d440af594c1 files/digest-mozilla-firefox-1.0.2-r1 75 -MD5 b16efe0e4066720b718d67348aeee757 files/mozilla-firefox-1.0-4ft2.patch 22294 +MD5 c1b444abfc62f5c642c44f44e2436308 files/digest-mozilla-firefox-1.0.3-r1 75 MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863 -MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322 -MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052 -MD5 58b96b2730ee9e78eccfb2cb7e79ba2d files/firefox 4220 -MD5 88371b8f812caf799a1ede2b1b07c079 files/mozilla-firefox-mousebuttons.patch 17099 -MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646 +MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322 +MD5 606e82226379fd5ae6cd1d0d1faff7ff files/10MozillaFirefox 31 +MD5 0aa74349ef4f69637967343f43540733 files/mozilla-firefox-1.0.3-prefs.patch 3406 MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063 -MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979 +MD5 dce8fede237f3d1f8e33bdc0b435d007 files/mozilla-firefox-1.0.3-ia64.patch 44055 MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCZC7QKf2g/qXtneoRAmGsAJ9gvGi1se6j5LYBirhgcirgNS+3GQCguFGL -HPIXAtS28mOGsQBbQ7kIsM0= -=XtMs ------END PGP SIGNATURE----- +MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979 diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.3-r1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.3-r1 new file mode 100644 index 000000000000..207e32c81b1f --- /dev/null +++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.3-r1 @@ -0,0 +1 @@ +MD5 f1a9a8da0547564a0f8a249f9d56bdf4 firefox-1.0.3-source.tar.bz2 32784300 diff --git a/www-client/mozilla-firefox/files/firefox b/www-client/mozilla-firefox/files/firefox deleted file mode 100644 index 2994493a4c8d..000000000000 --- a/www-client/mozilla-firefox/files/firefox +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/bash -# -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/files/firefox,v 1.1 2005/03/18 19:47:25 seemant Exp $ - -# Set MOZILLA_NEWTYPE to "window" in your environment if you prefer -# new Firefox windows instead of new tabs -newtype=${MOZILLA_NEWTYPE:-"window"} - -# Make sure necessary progs are in the PATH -PATH=/usr/bin:/bin:/usr/X11R6/bin:$PATH - -# Support both firefox and mozilla -case "$0" in - *fox*) - export MOZILLA_FIVE_HOME="/usr/lib/MozillaFirefox" - remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client - mozbin=$MOZILLA_FIVE_HOME/firefox - grepfor=firefox-bin - ;; - - *mozilla*) - export MOZILLA_FIVE_HOME="/usr/lib/mozilla" - remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client - # This is the old mozilla.sh which used to be installed as /usr/bin/mozilla. - # I have no idea what parts of it should be kept/dropped so I'm just calling - # it for now. - mozbin=$MOZILLA_FIVE_HOME/mozilla.sh - grepfor=mozilla-bin - ;; -esac - -# Validate the args and extract the urls -args=() -urls=() -while [[ $# -ne 0 ]] ; do - if [[ $1 == -* ]] ; then - case "${1#-}" in - height|width|CreateProfile|P|UILocale|contentLocale|remote|edit|chrome) - args=("${args[@]}" "$1" "$2") - shift 2 ;; - *) - args=("${args[@]}" "$1") - shift 1 ;; - esac - else - # check for relative path to a file, transform to absolute path - if [[ $1 != *://* && $1 != /* && -e $1 ]]; then - urls=("${urls[@]}" "file://$PWD/$1") - else - urls=("${urls[@]}" $1) - fi - shift - fi -done - -# Try to start in an existing session; check all screens -declare -a screens=( - $(xdpyinfo | awk ' - /^name of display:/ { - disp = substr($NF, 0, match($NF, /\.[^.]*$/)-1) - } - /^number of screens:/ { - for (i = 0; i < $NF; i++) printf("%s.%d\n", disp, i) - }') - ) - -# Attempt to fix bug 39797 by making sure MozillaFirefox is running -# on the DISPLAY prior to calling mozilla-xremote-client. The -# problem here is that mozilla-xremote-client will return a zero -# exit status if it contacts a Thunderbird-0.3 instance, even though -# Thunderbird can't handle the openURL request. :-( -# -# Note: This seems to be fixed with Thunderbird-0.4, which rejects the -# openURL request appropriately. -declare -a candidates=() -for s in $DISPLAY "${screens[@]}"; do - if DISPLAY=$s xwininfo -root -tree | grep -q "$grepfor"; then - candidates=("${candidates[@]}" $s) - fi -done - -# Make sure we'll get at least an empty window/tab -[[ ${#urls[@]} == 0 ]] && urls=('') - -# Handle multiple URLs by looping over the xremote call -for u in "${urls[@]}"; do - - # Try mozilla-xremote-client on each candidate screen. - # Only use mozilla-xremote-client if we have no other args (which - # must be passed to the browser binary). - if [[ ${#candidates[@]} > 0 && ${#args[*]} == 0 ]]; then - for s in "${candidates[@]}"; do - DISPLAY=$s $remote "openURL($u, new-$newtype)" && break - done - retval=$? - else - # simulate mozilla-xremote-client's response when it can't find an instance - retval=2 - fi - - # 2 = No running windows found, so start a new instance - # 3 = Browser is running, but doesn't handle openURL command - # (or it might be unresponsive) - if [[ $retval -eq 2 || $retval -eq 3 ]] ; then - - # Handle case of multiple URLs - if [[ ${#urls[@]} > 1 ]]; then - $mozbin "${args[@]}" "$u" & - if [[ -x /usr/bin/xtoolwait ]]; then - xtoolwait sleep 10 - else - sleep 10 # totally arbitrary without xtoolwait! :-( - fi - candidates=$DISPLAY # next time through, use $remote - args=() # and drop the args - continue - fi - - # Handle case of single URL - $mozbin "${args[@]}" "$u" & - break - - elif [[ $retval -eq 1 ]]; then - echo "Unable to connect to X server" >&2 - elif [[ $retval -ne 0 ]]; then - echo "Unknown error $retval from mozilla-xremote-client" >&2 - fi - -done - -# Will only wait here if firefox was started by this script -if ! wait; then - retval=$? - echo "${mozbin##*/} exited with non-zero status ($?)" >&2 -fi - -exit $retval - -# vim:expandtab sw=2: diff --git a/www-client/mozilla-firefox/files/mozilla-firebird-amd64.patch b/www-client/mozilla-firefox/files/mozilla-firebird-amd64.patch deleted file mode 100644 index 5dd2cb2503ed..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-firebird-amd64.patch +++ /dev/null @@ -1,1026 +0,0 @@ -diff -ruN mozilla.old/config/mkdepend/imakemdep.h mozilla/config/mkdepend/imakemdep.h ---- mozilla.old/config/mkdepend/imakemdep.h 1998-09-05 00:22:25.000000000 -0400 -+++ mozilla/config/mkdepend/imakemdep.h 2003-09-27 16:20:55.105322104 -0400 -@@ -277,6 +277,9 @@ - # ifdef __i386__ - "-D__i386__", - # endif -+# ifdef __x86_64__ -+ "-D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", - # endif -diff -ruN mozilla.old/directory/c-sdk/ldap/libraries/liblber/lber-int.h mozilla/directory/c-sdk/ldap/libraries/liblber/lber-int.h ---- mozilla.old/directory/c-sdk/ldap/libraries/liblber/lber-int.h 2002-03-26 16:53:23.000000000 -0500 -+++ mozilla/directory/c-sdk/ldap/libraries/liblber/lber-int.h 2003-09-27 16:20:55.104322256 -0400 -@@ -236,23 +236,22 @@ - (((_l)&0xff0000)>>8) + (((_l)&0xff000000)>>24)) - #define LBER_NTOHL(_l) LBER_HTONL(_l) - --#elif !defined(__alpha) || defined(VMS) -+#elif !defined(__x86_64__) && (!defined(__alpha) || defined(VMS)) - - #define LBER_HTONL( l ) htonl( l ) - #define LBER_NTOHL( l ) ntohl( l ) - - #else /* __alpha */ - /* -- * htonl and ntohl on the DEC Alpha under OSF 1 seem to only swap the -- * lower-order 32-bits of a (64-bit) long, so we define correct versions -- * here. -+ * htonl and ntohl on the 64-bit UNIX platforms only swap the lower-order -+ * 32-bits of a (64-bit) long, so we define correct versions here. - */ - #define LBER_HTONL( l ) (((long)htonl( (l) & 0x00000000FFFFFFFF )) << 32 \ - | htonl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 )) - - #define LBER_NTOHL( l ) (((long)ntohl( (l) & 0x00000000FFFFFFFF )) << 32 \ - | ntohl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 )) --#endif /* __alpha */ -+#endif /* __alpha || __x86_64__ */ - - - /* function prototypes */ -diff -ruN mozilla.old/nsprpub/configure mozilla/nsprpub/configure ---- mozilla.old/nsprpub/configure 2003-05-19 15:05:42.000000000 -0400 -+++ mozilla/nsprpub/configure 2003-09-27 16:20:55.085325144 -0400 -@@ -3729,6 +3729,9 @@ - ia64) - PR_MD_ASFILES=os_Linux_ia64.s - ;; -+ x86_64) -+ PR_MD_ASFILES=os_Linux_x86_64.s -+ ;; - m68k) - CFLAGS="$CFLAGS -m68020-60" - CXXFLAGS="$CXXFLAGS -m68020-60" -diff -ruN mozilla.old/nsprpub/configure.in mozilla/nsprpub/configure.in ---- mozilla.old/nsprpub/configure.in 2003-05-19 15:05:48.000000000 -0400 -+++ mozilla/nsprpub/configure.in 2003-09-27 16:20:55.077326360 -0400 -@@ -1218,6 +1218,9 @@ - ia64) - PR_MD_ASFILES=os_Linux_ia64.s - ;; -+ x86_64) -+ PR_MD_ASFILES=os_Linux_x86_64.s -+ ;; - m68k) - CFLAGS="$CFLAGS -m68020-60" - CXXFLAGS="$CXXFLAGS -m68020-60" -diff -ruN mozilla.old/nsprpub/pr/include/md/_linux.cfg mozilla/nsprpub/pr/include/md/_linux.cfg ---- mozilla.old/nsprpub/pr/include/md/_linux.cfg 2003-02-26 18:53:38.000000000 -0500 -+++ mozilla/nsprpub/pr/include/md/_linux.cfg 2003-09-27 16:20:55.053330008 -0400 -@@ -182,6 +182,52 @@ - #define PR_BYTES_PER_WORD_LOG2 3 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__x86_64__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #elif defined(__mc68000__) - - #undef IS_LITTLE_ENDIAN -diff -ruN mozilla.old/nsprpub/pr/include/md/_linux.h mozilla/nsprpub/pr/include/md/_linux.h ---- mozilla.old/nsprpub/pr/include/md/_linux.h 2003-02-26 18:53:39.000000000 -0500 -+++ mozilla/nsprpub/pr/include/md/_linux.h 2003-09-27 16:20:55.053330008 -0400 -@@ -49,6 +49,8 @@ - #define _PR_SI_ARCHITECTURE "alpha" - #elif defined(__ia64__) - #define _PR_SI_ARCHITECTURE "ia64" -+#elif defined(__x86_64__) -+#define _PR_SI_ARCHITECTURE "x86-64" - #elif defined(__mc68000__) - #define _PR_SI_ARCHITECTURE "m68k" - #elif defined(__sparc__) -@@ -107,6 +109,19 @@ - #define _MD_ATOMIC_SET _PR_ia64_AtomicSet - #endif - -+#if defined(__x86_64__) -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val); -+#define _MD_ATOMIC_INCREMENT _PR_x86_64_AtomicIncrement -+extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val); -+#define _MD_ATOMIC_DECREMENT _PR_x86_64_AtomicDecrement -+extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val); -+#define _MD_ATOMIC_ADD _PR_x86_64_AtomicAdd -+extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); -+#define _MD_ATOMIC_SET _PR_x86_64_AtomicSet -+#endif -+ - #define USE_SETJMP - #if defined(__GLIBC__) && __GLIBC__ >= 2 - #define _PR_POLL_AVAILABLE -diff -ruN mozilla.old/nsprpub/pr/src/io/prprf.c mozilla/nsprpub/pr/src/io/prprf.c ---- mozilla.old/nsprpub/pr/src/io/prprf.c 2003-02-26 18:53:42.000000000 -0500 -+++ mozilla/nsprpub/pr/src/io/prprf.c 2003-09-27 16:20:55.068327728 -0400 -@@ -51,7 +51,10 @@ - ** Note: on some platforms va_list is defined as an array, - ** and requires array notation. - */ --#if (defined(LINUX) && defined(__powerpc__)) || \ -+#if (defined(LINUX) && defined(__x86_64__)) -+#include <stdarg.h> -+#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) -+#elif (defined(LINUX) && defined(__powerpc__)) || \ - (defined(LINUX) && defined(__s390__)) || \ - (defined(LINUX) && defined(__s390x__)) || \ - defined(WIN16) || defined(QNX) || \ -diff -ruN mozilla.old/nsprpub/pr/src/md/unix/os_Linux_x86_64.s mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s ---- mozilla.old/nsprpub/pr/src/md/unix/os_Linux_x86_64.s 1969-12-31 19:00:00.000000000 -0500 -+++ mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s 2003-09-27 16:20:55.068327728 -0400 -@@ -0,0 +1,91 @@ -+/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+/ -+/ The contents of this file are subject to the Mozilla Public -+/ License Version 1.1 (the "License"); you may not use this file -+/ except in compliance with the License. You may obtain a copy of -+/ the License at http://www.mozilla.org/MPL/ -+/ -+/ Software distributed under the License is distributed on an "AS -+/ IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+/ implied. See the License for the specific language governing -+/ rights and limitations under the License. -+/ -+/ The Original Code is the Netscape Portable Runtime (NSPR). -+/ -+/ The Initial Developer of the Original Code is Netscape -+/ Communications Corporation. Portions created by Netscape are -+/ Copyright (C) 2000 Netscape Communications Corporation. All -+/ Rights Reserved. -+/ -+/ Contributor(s): -+/ -+/ Alternatively, the contents of this file may be used under the -+/ terms of the GNU General Public License Version 2 or later (the -+/ "GPL"), in which case the provisions of the GPL are applicable -+/ instead of those above. If you wish to allow use of your -+/ version of this file only under the terms of the GPL and not to -+/ allow others to use your version of this file under the MPL, -+/ indicate your decision by deleting the provisions above and -+/ replace them with the notice and other provisions required by -+/ the GPL. If you do not delete the provisions above, a recipient -+/ may use your version of this file under either the MPL or the -+/ GPL. -+/ -+ -+/ PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val) -+/ -+/ Atomically increment the integer pointed to by 'val' and return -+/ the result of the increment. -+/ -+ .text -+ .globl _PR_x86_64_AtomicIncrement -+ .align 4 -+_PR_x86_64_AtomicIncrement: -+ movl $1, %eax -+ lock -+ xaddl %eax, (%rdi) -+ incl %eax -+ ret -+ -+/ PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val) -+/ -+/ Atomically decrement the integer pointed to by 'val' and return -+/ the result of the decrement. -+/ -+ .text -+ .globl _PR_x86_64_AtomicDecrement -+ .align 4 -+_PR_x86_64_AtomicDecrement: -+ movl $-1, %eax -+ lock -+ xaddl %eax, (%rdi) -+ decl %eax -+ ret -+ -+/ PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval) -+/ -+/ Atomically set the integer pointed to by 'val' to the new -+/ value 'newval' and return the old value. -+ .text -+ .globl _PR_x86_64_AtomicSet -+ .align 4 -+_PR_x86_64_AtomicSet: -+ movl %esi, %eax -+ lock -+ xchgl %eax, (%rdi) -+ ret -+ -+/ PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val) -+/ -+/ Atomically add 'val' to the integer pointed to by 'ptr' -+/ and return the result of the addition. -+/ -+ .text -+ .globl _PR_x86_64_AtomicAdd -+ .align 4 -+_PR_x86_64_AtomicAdd: -+ movl %esi, %eax -+ lock -+ xaddl %eax, (%rdi) -+ addl %esi, %eax -+ ret -diff -ruN mozilla.old/security/coreconf/Linux.mk mozilla/security/coreconf/Linux.mk ---- mozilla.old/security/coreconf/Linux.mk 2003-04-30 20:31:20.000000000 -0400 -+++ mozilla/security/coreconf/Linux.mk 2003-09-27 16:20:55.093323928 -0400 -@@ -66,6 +66,10 @@ - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = ia64 - else -+ifeq ($(OS_TEST),x86_64) -+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+ CPU_ARCH = x86_64 -+else - ifeq ($(OS_TEST),sparc) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = sparc -@@ -107,6 +111,7 @@ - endif - endif - endif -+endif - - - LIBC_TAG = _glibc -diff -ruN mozilla.old/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ---- mozilla.old/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2003-06-18 23:02:34.000000000 -0400 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2003-09-27 16:20:55.105322104 -0400 -@@ -55,6 +55,10 @@ - # Migrate other platforms here after testing - # - ifneq (,$(filter Linux,$(OS_ARCH))) -+# Linux/x86-64 -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+else - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp - endif -@@ -66,6 +70,7 @@ - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s - endif - endif -+endif - # - # BeOS/Intel (uses the same unixish_x86 code) - # -diff -ruN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp ---- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp 1969-12-31 19:00:00.000000000 -0500 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp 2003-09-27 16:20:55.105322104 -0400 -@@ -0,0 +1,174 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+// Platform specific code to invoke XPCOM methods on native objects -+ -+#include "xptcprivate.h" -+ -+// 6 integral parameters are passed in registers -+const PRUint32 GPR_COUNT = 6; -+ -+// 8 floating point parameters are passed in SSE registers -+const PRUint32 FPR_COUNT = 8; -+ -+// Remember that these 'words' are 64-bit long -+static inline void -+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack) -+{ -+ nr_gpr = 1; // skip one GP register for 'that' -+ nr_fpr = 0; -+ nr_stack = 0; -+ -+ /* Compute number of eightbytes of class MEMORY. */ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (!s->IsPtrData() -+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) { -+ if (nr_fpr < FPR_COUNT) -+ nr_fpr++; -+ else -+ nr_stack++; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ nr_gpr++; -+ else -+ nr_stack++; -+ } -+ } -+} -+ -+static void -+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint64 * gpregs, double * fpregs) -+{ -+ PRUint32 nr_gpr = 1; // skip one GP register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (s->IsPtrData()) -+ value = (PRUint64) s->ptr; -+ else { -+ switch (s->type) { -+ case nsXPTType::T_FLOAT: break; -+ case nsXPTType::T_DOUBLE: break; -+ case nsXPTType::T_I8: value = s->val.i8; break; -+ case nsXPTType::T_I16: value = s->val.i16; break; -+ case nsXPTType::T_I32: value = s->val.i32; break; -+ case nsXPTType::T_I64: value = s->val.i64; break; -+ case nsXPTType::T_U8: value = s->val.u8; break; -+ case nsXPTType::T_U16: value = s->val.u16; break; -+ case nsXPTType::T_U32: value = s->val.u32; break; -+ case nsXPTType::T_U64: value = s->val.u64; break; -+ case nsXPTType::T_BOOL: value = s->val.b; break; -+ case nsXPTType::T_CHAR: value = s->val.c; break; -+ case nsXPTType::T_WCHAR: value = s->val.wc; break; -+ default: value = (PRUint64) s->val.p; break; -+ } -+ } -+ -+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((double *)d) = s->val.d; -+ d++; -+ } -+ } -+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((float *)d) = s->val.f; -+ d++; -+ } -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ gpregs[nr_gpr++] = value; -+ else -+ *d++ = value; -+ } -+ } -+} -+ -+extern "C" -+XPTC_PUBLIC_API(nsresult) -+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant * params) -+{ -+ PRUint32 nr_gpr, nr_fpr, nr_stack; -+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack); -+ -+ // Stack, if used, must be 16-bytes aligned -+ if (nr_stack) -+ nr_stack = (nr_stack + 1) & ~1; -+ -+ // Load parameters to stack, if necessary -+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8); -+ PRUint64 gpregs[GPR_COUNT]; -+ double fpregs[FPR_COUNT]; -+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs); -+ -+ // Load FPR registers from fpregs[] -+ register double d0 asm("xmm0"); -+ register double d1 asm("xmm1"); -+ register double d2 asm("xmm2"); -+ register double d3 asm("xmm3"); -+ register double d4 asm("xmm4"); -+ register double d5 asm("xmm5"); -+ register double d6 asm("xmm6"); -+ register double d7 asm("xmm7"); -+ -+ switch (nr_fpr) { -+#define ARG_FPR(N) \ -+ case N+1: d##N = fpregs[N]; -+ ARG_FPR(7); -+ ARG_FPR(6); -+ ARG_FPR(5); -+ ARG_FPR(4); -+ ARG_FPR(3); -+ ARG_FPR(2); -+ ARG_FPR(1); -+ ARG_FPR(0); -+ case 0:; -+#undef ARG_FPR -+ } -+ -+ // Load GPR registers from gpregs[] -+ register PRUint64 a0 asm("rdi"); -+ register PRUint64 a1 asm("rsi"); -+ register PRUint64 a2 asm("rdx"); -+ register PRUint64 a3 asm("rcx"); -+ register PRUint64 a4 asm("r8"); -+ register PRUint64 a5 asm("r9"); -+ -+ switch (nr_gpr) { -+#define ARG_GPR(N) \ -+ case N+1: a##N = gpregs[N]; -+ ARG_GPR(5); -+ ARG_GPR(4); -+ ARG_GPR(3); -+ ARG_GPR(2); -+ ARG_GPR(1); -+ case 1: a0 = (PRUint64) that; -+ case 0:; -+#undef ARG_GPR -+ } -+ -+ // Ensure that assignments to SSE registers won't be optimized away -+ asm("" :: -+ "x" (d0), "x" (d1), "x" (d2), "x" (d3), -+ "x" (d4), "x" (d5), "x" (d6), "x" (d7)); -+ -+ // Get pointer to method -+ PRUint64 methodAddress = *((PRUint64 *)that); -+ methodAddress += 8 * methodIndex; -+ methodAddress = *((PRUint64 *)methodAddress); -+ -+ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64); -+ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5); -+ return result; -+} -diff -ruN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp ---- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp 1969-12-31 19:00:00.000000000 -0500 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp 2003-09-27 16:20:55.106321952 -0400 -@@ -0,0 +1,206 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+ -+// Implement shared vtbl methods. -+ -+#include "xptcprivate.h" -+ -+// The Linux/x86-64 ABI passes the first 6 integral parameters and the -+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx, -+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the -+// caller. The rest of the parameters are passed in the callers stack -+// area. -+ -+const PRUint32 PARAM_BUFFER_COUNT = 16; -+const PRUint32 GPR_COUNT = 6; -+const PRUint32 FPR_COUNT = 8; -+ -+// PrepareAndDispatch() is called by SharedStub() and calls the actual method. -+// -+// - 'args[]' contains the arguments passed on stack -+// - 'gpregs[]' contains the arguments passed in integer registers -+// - 'fpregs[]' contains the arguments passed in floating point registers -+// -+// The parameters are mapped into an array of type 'nsXPTCMiniVariant' -+// and then the method gets called. -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex, -+ PRUint64 * args, PRUint64 * gpregs, double *fpregs) -+{ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint32 paramCount; -+ PRUint32 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ if (! iface_info) -+ return NS_ERROR_UNEXPECTED; -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no method info"); -+ if (! info) -+ return NS_ERROR_UNEXPECTED; -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ if (! dispatchParams) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ PRUint64* ap = args; -+ PRUint32 nr_gpr = 1; // skip one GPR register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for(i = 0; i < paramCount; i++) { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ dp->val.d = fpregs[nr_fpr++]; -+ else -+ dp->val.d = *(double*) ap++; -+ continue; -+ } -+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ dp->val.d = *(double*) ap++; -+ else -+ dp->val.f = *(float*) ap++; -+ continue; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ value = gpregs[nr_gpr++]; -+ else -+ value = *ap++; -+ } -+ -+ if (param.IsOut() || !type.IsArithmetic()) { -+ dp->val.p = (void*) value; -+ continue; -+ } -+ -+ switch (type) { -+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break; -+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break; -+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break; -+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break; -+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break; -+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break; -+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break; -+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break; -+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break; -+ case nsXPTType::T_CHAR: dp->val.c = (char) value; break; -+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break; -+ -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if (dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+// Linux/x86-64 uses gcc >= 3.1 -+#define STUB_ENTRY(n) \ -+asm(".section \".text\"\n\t" \ -+ ".align 2\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 1000\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \ -+ ".else\n\t" \ -+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \ -+ ".endif\n\t" \ -+ "movl $" #n ", %eax\n\t" \ -+ "jmp SharedStub\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".else\n\t" \ -+ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".endif"); -+ -+// static nsresult SharedStub(PRUint32 methodIndex) -+asm(".section \".text\"\n\t" -+ ".align 2\n\t" -+ ".type SharedStub,@function\n\t" -+ "SharedStub:\n\t" -+ // make room for gpregs (48), fpregs (64) -+ "pushq %rbp\n\t" -+ "movq %rsp,%rbp\n\t" -+ "subq $112,%rsp\n\t" -+ // save GP registers -+ "movq %rdi,-112(%rbp)\n\t" -+ "movq %rsi,-104(%rbp)\n\t" -+ "movq %rdx, -96(%rbp)\n\t" -+ "movq %rcx, -88(%rbp)\n\t" -+ "movq %r8 , -80(%rbp)\n\t" -+ "movq %r9 , -72(%rbp)\n\t" -+ "leaq -112(%rbp),%rcx\n\t" -+ // save FP registers -+ "movsd %xmm0,-64(%rbp)\n\t" -+ "movsd %xmm1,-56(%rbp)\n\t" -+ "movsd %xmm2,-48(%rbp)\n\t" -+ "movsd %xmm3,-40(%rbp)\n\t" -+ "movsd %xmm4,-32(%rbp)\n\t" -+ "movsd %xmm5,-24(%rbp)\n\t" -+ "movsd %xmm6,-16(%rbp)\n\t" -+ "movsd %xmm7, -8(%rbp)\n\t" -+ "leaq -64(%rbp),%r8\n\t" -+ // rdi has the 'self' pointer already -+ "movl %eax,%esi\n\t" -+ "leaq 16(%rbp),%rdx\n\t" -+ "call PrepareAndDispatch@plt\n\t" -+ "leave\n\t" -+ "ret\n\t" -+ ".size SharedStub,.-SharedStub"); -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#else -+#error "can't find a compiler to use" -+#endif /* __GNUC__ */ -diff -ruN mozilla.old/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp ---- mozilla.old/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp 2003-02-22 23:41:18.000000000 -0500 -+++ mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp 2003-09-27 16:21:05.754703152 -0400 -@@ -87,6 +87,19 @@ - float p17, float p18, float p19, float p20, - float *retval) = 0; - -+ NS_IMETHOD AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, -+ PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8, -+ PRInt64 p9, PRInt32 p10, PRInt64* retval) = 0; -+ -+ NS_IMETHOD AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, -+ PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8, -+ PRInt32 p9, PRInt64 p10, PRInt64* retval) = 0; -+ -+ NS_IMETHOD AddMixedFloats(float p1, float p2, double p3, double p4, -+ float p5, float p6, double p7, double p8, -+ float p9, double p10, float p11, -+ double *retval) = 0; -+ - NS_IMETHOD PassTwoStrings(const char* s1, const char* s2, char** retval) = 0; - - }; -@@ -114,6 +127,19 @@ - float p5, float p6, float p7, float p8, - float p9, float p10, float* retval); - -+ NS_IMETHOD AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, -+ PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8, -+ PRInt64 p9, PRInt32 p10, PRInt64* retval); -+ -+ NS_IMETHOD AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, -+ PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8, -+ PRInt32 p9, PRInt64 p10, PRInt64* retval); -+ -+ NS_IMETHOD AddMixedFloats(float p1, float p2, double p3, double p4, -+ float p5, float p6, double p7, double p8, -+ float p9, double p10, float p11, -+ double *retval); -+ - NS_IMETHOD AddManyManyFloats(float p1, float p2, float p3, float p4, - float p5, float p6, float p7, float p8, - float p9, float p10, float p11, float p12, -@@ -211,6 +237,20 @@ - } - - NS_IMETHODIMP -+InvokeTestTarget::AddMixedFloats(float p1, float p2, double p3, double p4, -+ float p5, float p6, double p7, double p8, -+ float p9, double p10, float p11, -+ double *retval) -+{ -+#ifdef DEBUG_TESTINVOKE -+ printf("%f, %f, %lf, %lf, %f, %f, %lf, %lf, %f, %lf, %f\n", -+ p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); -+#endif -+ *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10 + p11; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP - InvokeTestTarget::AddManyManyFloats(float p1, float p2, float p3, float p4, - float p5, float p6, float p7, float p8, - float p9, float p10, float p11, float p12, -@@ -230,6 +270,24 @@ - } - - NS_IMETHODIMP -+InvokeTestTarget::AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, -+ PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8, -+ PRInt64 p9, PRInt32 p10, PRInt64* retval) -+{ -+ *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+InvokeTestTarget::AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, -+ PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8, -+ PRInt32 p9, PRInt64 p10, PRInt64* retval) -+{ -+ *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP - InvokeTestTarget::PassTwoStrings(const char* s1, const char* s2, char** retval) - { - const char milk[] = "milk"; -@@ -309,14 +367,33 @@ - else - printf("\tFAILED"); - -- if(NS_SUCCEEDED(test->PassTwoStrings("moo","cow",&outS))) { -- printf(" = %s\n", outS); -+ if(NS_SUCCEEDED(test->AddMixedInts(1,2,3,4,5,6,7,8,9,10,&out64))) -+ { -+ LL_L2I(tmp32, out64); -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", (int)tmp32); -+ } -+ else -+ printf("\tFAILED"); -+ -+ if(NS_SUCCEEDED(test->AddMixedInts2(1,2,3,4,5,6,7,8,9,10,&out64))) -+ { -+ LL_L2I(tmp32, out64); -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", (int)tmp32); -+ } -+ else -+ printf("\tFAILED"); -+ -+ if(NS_SUCCEEDED(test->AddMixedFloats(1,2,3,4,5,6,7,8,9,10,11,&outD))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 = %f\n", (double)outD); -+ else -+ printf("\tFAILED"); -+ -+ if (NS_SUCCEEDED(test->PassTwoStrings("moo","cow",&outS))) { -+ printf(" = %s\n", outS); - nsMemory::Free(outS); -- } else -+ } else - printf("\tFAILED"); - -- -- - printf("calling via invoke:\n"); - - nsXPTCVariant var[21]; -@@ -388,8 +465,8 @@ - var[2].flags = nsXPTCVariant::PTR_IS_DATA; - var[2].ptr = &var[2].val.i64; - -- if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 6, 3, var))) -- printf("\t2L * 2L = %d\n", (int)var[2].val.i64); -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 6, 3, var))) -+ printf("\t2L * 2L = %d\n", (int)var[2].val.i64); - else - printf("\tFAILED"); - -@@ -559,6 +636,8 @@ - if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 10, 11, var))) - printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %ff\n", - (double) var[10].val.f); -+ else -+ printf("\tFAILED"); - - var[0].val.f = 1.0f; - var[0].type = nsXPTType::T_FLOAT; -@@ -649,6 +728,163 @@ - printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 = %ff\n", - (double) var[20].val.f); - -+ var[0].val.i64 = 1; -+ var[0].type = nsXPTType::T_I64; -+ var[0].flags = 0; -+ -+ var[1].val.i32 = 2; -+ var[1].type = nsXPTType::T_I32; -+ var[1].flags = 0; -+ -+ var[2].val.i64 = 3; -+ var[2].type = nsXPTType::T_I64; -+ var[2].flags = 0; -+ -+ var[3].val.i32 = 4; -+ var[3].type = nsXPTType::T_I32; -+ var[3].flags = 0; -+ -+ var[4].val.i32 = 5; -+ var[4].type = nsXPTType::T_I32; -+ var[4].flags = 0; -+ -+ var[5].val.i64 = 6; -+ var[5].type = nsXPTType::T_I64; -+ var[5].flags = 0; -+ -+ var[6].val.i32 = 7; -+ var[6].type = nsXPTType::T_I32; -+ var[6].flags = 0; -+ -+ var[7].val.i32 = 8; -+ var[7].type = nsXPTType::T_I32; -+ var[7].flags = 0; -+ -+ var[8].val.i64 = 9; -+ var[8].type = nsXPTType::T_I64; -+ var[8].flags = 0; -+ -+ var[9].val.i32 = 10; -+ var[9].type = nsXPTType::T_I32; -+ var[9].flags = 0; -+ -+ var[10].val.i64 = 0; -+ var[10].type = nsXPTType::T_I64; -+ var[10].flags = nsXPTCVariant::PTR_IS_DATA; -+ var[10].ptr = &var[10].val.i64; -+ -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 12, 11, var))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", -+ (int)var[10].val.i64); -+ else -+ printf("\tFAILED"); -+ -+ var[0].val.i32 = 1; -+ var[0].type = nsXPTType::T_I32; -+ var[0].flags = 0; -+ -+ var[1].val.i64 = 2; -+ var[1].type = nsXPTType::T_I64; -+ var[1].flags = 0; -+ -+ var[2].val.i32 = 3; -+ var[2].type = nsXPTType::T_I32; -+ var[2].flags = 0; -+ -+ var[3].val.i64 = 4; -+ var[3].type = nsXPTType::T_I64; -+ var[3].flags = 0; -+ -+ var[4].val.i64 = 5; -+ var[4].type = nsXPTType::T_I64; -+ var[4].flags = 0; -+ -+ var[5].val.i32 = 6; -+ var[5].type = nsXPTType::T_I32; -+ var[5].flags = 0; -+ -+ var[6].val.i64 = 7; -+ var[6].type = nsXPTType::T_I64; -+ var[6].flags = 0; -+ -+ var[7].val.i64 = 8; -+ var[7].type = nsXPTType::T_I64; -+ var[7].flags = 0; -+ -+ var[8].val.i32 = 9; -+ var[8].type = nsXPTType::T_I32; -+ var[8].flags = 0; -+ -+ var[9].val.i64 = 10; -+ var[9].type = nsXPTType::T_I64; -+ var[9].flags = 0; -+ -+ var[10].val.i64 = 0; -+ var[10].type = nsXPTType::T_I64; -+ var[10].flags = nsXPTCVariant::PTR_IS_DATA; -+ var[10].ptr = &var[10].val.i64; -+ -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 13, 11, var))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", -+ (int)var[10].val.i64); -+ else -+ printf("\tFAILED"); -+ -+ var[0].val.f = 1.0f; -+ var[0].type = nsXPTType::T_FLOAT; -+ var[0].flags = 0; -+ -+ var[1].val.f = 2.0f; -+ var[1].type = nsXPTType::T_FLOAT; -+ var[1].flags = 0; -+ -+ var[2].val.d = 3.0; -+ var[2].type = nsXPTType::T_DOUBLE; -+ var[2].flags = 0; -+ -+ var[3].val.d = 4.0; -+ var[3].type = nsXPTType::T_DOUBLE; -+ var[3].flags = 0; -+ -+ var[4].val.f = 5.0f; -+ var[4].type = nsXPTType::T_FLOAT; -+ var[4].flags = 0; -+ -+ var[5].val.f = 6.0f; -+ var[5].type = nsXPTType::T_FLOAT; -+ var[5].flags = 0; -+ -+ var[6].val.d = 7.0; -+ var[6].type = nsXPTType::T_DOUBLE; -+ var[6].flags = 0; -+ -+ var[7].val.d = 8.0; -+ var[7].type = nsXPTType::T_DOUBLE; -+ var[7].flags = 0; -+ -+ var[8].val.f = 9.0f; -+ var[8].type = nsXPTType::T_FLOAT; -+ var[8].flags = 0; -+ -+ var[9].val.d = 10.0; -+ var[9].type = nsXPTType::T_DOUBLE; -+ var[9].flags = 0; -+ -+ var[10].val.f = 11.0f; -+ var[10].type = nsXPTType::T_FLOAT; -+ var[10].flags = 0; -+ -+ var[11].val.d = 0.0; -+ var[11].type = nsXPTType::T_DOUBLE; -+ var[11].flags = nsXPTCVariant::PTR_IS_DATA; -+ var[11].ptr = &var[11].val.d; -+ -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 14, 12, var))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 = %f\n", -+ var[11].val.d); -+ else -+ printf("\tFAILED"); -+ - var[0].val.p = (void*)"moo"; - var[0].type = nsXPTType::T_CHAR_STR; - var[0].flags = 0; -@@ -662,12 +898,11 @@ - var[2].flags = nsXPTCVariant::PTR_IS_DATA; - var[2].ptr = &var[2].val.p; - -- if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 12, 3, var))) -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 15, 3, var))) - printf(" = %s\n", var[2].val.p); - else - printf("\tFAILED"); - -- - DoMultipleInheritenceTest(); - DoMultipleInheritenceTest2(); - // Disabled by default - takes too much time on slow machines diff --git a/www-client/mozilla-firefox/files/mozilla-firefox-1.0.3-ia64.patch b/www-client/mozilla-firefox/files/mozilla-firefox-1.0.3-ia64.patch new file mode 100644 index 000000000000..411306d45612 --- /dev/null +++ b/www-client/mozilla-firefox/files/mozilla-firefox-1.0.3-ia64.patch @@ -0,0 +1,884 @@ +--- mozilla-firefox-1.0.3.orig/extensions/transformiix/source/base/Double.cpp ++++ mozilla-firefox-1.0.3/extensions/transformiix/source/base/Double.cpp +@@ -74,14 +74,7 @@ + #define CPU_IS_ARM + #endif + +-#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 +-/** +- * This version of the macros is safe for the alias optimizations +- * that gcc does, but uses gcc-specific extensions. +- */ +- + typedef union txdpun { +- PRFloat64 d; + struct { + #if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) + PRUint32 lo, hi; +@@ -89,8 +82,14 @@ + PRUint32 hi, lo; + #endif + } s; ++ PRFloat64 d; + } txdpun; + ++#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 ++/** ++ * This version of the macros is safe for the alias optimizations ++ * that gcc does, but uses gcc-specific extensions. ++ */ + #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; })) + #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; })) + +@@ -116,20 +115,20 @@ + + //-- Initialize Double related constants + #ifdef IS_BIG_ENDIAN +-const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, +- 0xffffffff}; +-const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; +-const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; ++const txdpun nanMask = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, ++ 0xffffffff}; ++const txdpun infMask = {TX_DOUBLE_HI32_EXPMASK, 0}; ++const txdpun negInfMask = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; + #else +-const PRUint32 nanMask[2] = {0xffffffff, +- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; +-const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; +-const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; ++const txdpun nanMask = {0xffffffff, ++ TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; ++const txdpun infMask = {0, TX_DOUBLE_HI32_EXPMASK}; ++const txdpun negInfMask = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; + #endif + +-const double Double::NaN = *((double*)nanMask); +-const double Double::POSITIVE_INFINITY = *((double*)infMask); +-const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); ++const double Double::NaN = nanMask.d; ++const double Double::POSITIVE_INFINITY = infMask.d; ++const double Double::NEGATIVE_INFINITY = negInfMask.d; + + /* + * Determines whether the given double represents positive or negative +--- mozilla-firefox-1.0.3.orig/js/src/fdlibm/fdlibm.h ++++ mozilla-firefox-1.0.3/js/src/fdlibm/fdlibm.h +@@ -61,7 +61,7 @@ + #define __LITTLE_ENDIAN + #endif + +-#if defined(linux) && (defined(__i386__) || defined(__x86_64__)) ++#if defined(linux) && (defined(__i386__) || defined(__x86_64__) || defined(__ia64) || defined(__MIPSEL)) + #define __LITTLE_ENDIAN + #endif + +--- mozilla-firefox-1.0.3.orig/xpcom/reflect/xptcall/public/xptcstubsdecl.inc ++++ mozilla-firefox-1.0.3/xpcom/reflect/xptcall/public/xptcstubsdecl.inc +@@ -258,499 +258,499 @@ + NS_IMETHOD Stub249(); + #else + NS_IMETHOD Stub3(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub4(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub5(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub6(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub7(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub8(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub9(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub10(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub11(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub12(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub13(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub14(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub15(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub16(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub17(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub18(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub19(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub20(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub21(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub22(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub23(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub24(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub25(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub26(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub27(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub28(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub29(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub30(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub31(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub32(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub33(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub34(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub35(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub36(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub37(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub38(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub39(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub40(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub41(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub42(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub43(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub44(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub45(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub46(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub47(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub48(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub49(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub50(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub51(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub52(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub53(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub54(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub55(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub56(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub57(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub58(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub59(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub60(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub61(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub62(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub63(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub64(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub65(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub66(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub67(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub68(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub69(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub70(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub71(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub72(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub73(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub74(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub75(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub76(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub77(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub78(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub79(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub80(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub81(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub82(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub83(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub84(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub85(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub86(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub87(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub88(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub89(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub90(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub91(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub92(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub93(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub94(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub95(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub96(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub97(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub98(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub99(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub100(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub101(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub102(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub103(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub104(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub105(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub106(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub107(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub108(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub109(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub110(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub111(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub112(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub113(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub114(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub115(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub116(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub117(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub118(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub119(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub120(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub121(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub122(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub123(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub124(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub125(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub126(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub127(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub128(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub129(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub130(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub131(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub132(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub133(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub134(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub135(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub136(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub137(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub138(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub139(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub140(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub141(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub142(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub143(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub144(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub145(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub146(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub147(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub148(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub149(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub150(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub151(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub152(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub153(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub154(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub155(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub156(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub157(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub158(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub159(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub160(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub161(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub162(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub163(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub164(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub165(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub166(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub167(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub168(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub169(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub170(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub171(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub172(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub173(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub174(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub175(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub176(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub177(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub178(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub179(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub180(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub181(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub182(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub183(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub184(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub185(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub186(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub187(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub188(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub189(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub190(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub191(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub192(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub193(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub194(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub195(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub196(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub197(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub198(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub199(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub200(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub201(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub202(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub203(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub204(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub205(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub206(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub207(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub208(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub209(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub210(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub211(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub212(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub213(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub214(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub215(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub216(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub217(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub218(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub219(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub220(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub221(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub222(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub223(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub224(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub225(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub226(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub227(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub228(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub229(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub230(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub231(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub232(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub233(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub234(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub235(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub236(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub237(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub238(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub239(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub240(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub241(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub242(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub243(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub244(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub245(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub246(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub247(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub248(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + NS_IMETHOD Stub249(PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); + #endif + + /* declarations of sentinel stubs */ +--- mozilla-firefox-1.0.3.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s ++++ mozilla-firefox-1.0.3/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s +@@ -15,15 +15,17 @@ + .type PrepareAndDispatch,@function + + SharedStub:: +-// 9 arguments, first 8 are the input arguments of previous +-// function call. The last one is methodIndex, and is passed in memory ++// 10 arguments, first 8 are the input arguments of previous ++// function call. The 9th one is methodIndex and the 10th is the ++// pointer to the remaining input arguments. The last two arguments ++// are passed in memory. + .prologue + .save ar.pfs , r41 + // allocate 8 input args, 4 local args, and 5 output args + alloc r41 = ar.pfs, 8, 4, 5, 0 // M + .save rp, r40 + mov r40 = rp // I +- nop.i 0 ;; // I ++ add out4 = 24, sp ;; // I + + .save ar.unat, r42 + mov r42 = ar.unat // M +@@ -46,12 +48,9 @@ + .body + add out0 = 0, in0 // A move self ptr + // 144 bytes = 16 byte stack header + 64 byte int space + 64 byte float space +-// current frame is 144 bytes, previous frame is 112 bytes +-// restarg is at 144 + 112 + 16 bytes away from current sp +-// (current frame + previous frame + previous previous frame header) + // methodIndex is at 144 + 16 bytes away from current sp + // (current frame + previous frame header) +- add out4 = 192, sp // A restarg address ++ ld8 out4 = [out4] // M restarg address + add r11 = 160, sp ;; // A address of methodIndex + + ld8 out1 = [r11] // M load methodIndex +--- mozilla-firefox-1.0.3.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp ++++ mozilla-firefox-1.0.3/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp +@@ -147,16 +147,17 @@ + } + + extern "C" int SharedStub(PRUint64,PRUint64,PRUint64,PRUint64, +- PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); ++ PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64 *); + + /* Variable a0-a7 were put there so we can have access to the 8 input + registers on Stubxyz entry */ + + #define STUB_ENTRY(n) \ + nsresult nsXPTCStubBase::Stub##n(PRUint64 a1, \ +-PRUint64 a2,PRUint64 a3,PRUint64 a4,PRUint64 a5,PRUint64 a6,PRUint64 a7) \ ++PRUint64 a2,PRUint64 a3,PRUint64 a4,PRUint64 a5,PRUint64 a6,PRUint64 a7, \ ++PRUint64 a8) \ + { uint64_t a0 = (uint64_t) this; \ +- return SharedStub(a0,a1,a2,a3,a4,a5,a6,a7,(PRUint64) n); \ ++ return SharedStub(a0,a1,a2,a3,a4,a5,a6,a7,(PRUint64) n, &a8); \ + } + + #define SENTINEL_ENTRY(n) \ diff --git a/www-client/mozilla-firefox/files/mozilla-firefox-1.0.3-prefs.patch b/www-client/mozilla-firefox/files/mozilla-firefox-1.0.3-prefs.patch new file mode 100644 index 000000000000..722f4ab922e2 --- /dev/null +++ b/www-client/mozilla-firefox/files/mozilla-firefox-1.0.3-prefs.patch @@ -0,0 +1,74 @@ +--- mozilla-firefox-1.0.3.orig/browser/app/profile/firefox.js ++++ mozilla-firefox-1.0.3/browser/app/profile/firefox.js +@@ -38,6 +38,9 @@ + // SYNTAX HINTS: dashes are delimiters. Use underscores instead. + // The first character after a period must be alphabetic. + ++// Disable default browser checking. ++pref("browser.shell.checkDefaultBrowser", false); ++ + // pref("startup.homepage_override_url","chrome://browser-region/locale/region.properties"); + pref("general.startup.browser", true); + +@@ -62,8 +65,8 @@ + ); + + // App-specific update preferences +-pref("app.update.enabled", true); // Whether or not app updates are enabled +-pref("app.update.autoUpdateEnabled", true); // Whether or not background app updates ++pref("app.update.enabled", false); // Whether or not app updates are enabled ++pref("app.update.autoUpdateEnabled", false); // Whether or not background app updates + // are enabled + pref("app.update.url", "chrome://mozapps/locale/update/update.properties"); + pref("app.update.updatesAvailable", false); +@@ -81,7 +84,7 @@ + // .. etc .. + // + pref("extensions.update.enabled", true); +-pref("extensions.update.autoUpdateEnabled", true); ++pref("extensions.update.autoUpdateEnabled", false); + pref("extensions.update.url", "chrome://mozapps/locale/extensions/extensions.properties"); + pref("extensions.update.autoUpdate", false); // Automatically download and install + // updates to themes and extensions. +@@ -237,6 +240,9 @@ + pref("network.cookie.cookieBehavior", 0); // cookies enabled + pref("network.cookie.enableForCurrentSessionOnly", false); + ++// Use LANG environment variable to choose locale ++pref("intl.locale.matchOS", true); ++ + // l12n and i18n + pref("intl.accept_languages", "chrome://global/locale/intl.properties"); + // collationOption is only set on linux for japanese. see bug 18338 and 62015 +@@ -327,3 +333,17 @@ + + // plugin finder service + pref("pfs.datasource.url", "chrome://mozapps/locale/plugins/plugins.properties"); ++ ++// enable negotiate extension ++pref("network.negotiate-auth.trusted-uris", "https://"); ++ ++// don't raise windows by default ++pref("mozilla.widget.raise-on-setfocus", false); ++ ++// disable insecure ciphers ++pref("security.enable_ssl2", false); ++ ++pref("security.ssl2.rc2_40", false); ++pref("security.ssl2.rc4_40", false); ++pref("security.ssl3.rsa_rc4_40_md5", false); ++pref("security.ssl3.rsa_rc2_40_md5", false); +--- mozilla-firefox-1.0.3.orig/browser/components/prefwindow/content/pref-advanced.xul ++++ mozilla-firefox-1.0.3/browser/components/prefwindow/content/pref-advanced.xul +@@ -72,9 +72,9 @@ + open="true" persist="open" clearhidden="true" align="left"> + <label>&softwareupdateinfo.label;</label> + <vbox class="indent" align="left"> +- <checkbox id="enableSmartUpdate" ++ <!-- checkbox id="enableSmartUpdate" + label="&enableSmartUpdate.label;" accesskey="&enableSmartUpdate.accesskey;" +- prefstring="app.update.autoUpdateEnabled"/> ++ prefstring="app.update.autoUpdateEnabled"/ --> + <checkbox id="enableExtensionUpdate" + label="&enableExtensionUpdate.label;" accesskey="&enableExtensionUpdate.accesskey;" + prefstring="extensions.update.autoUpdateEnabled"/> diff --git a/www-client/mozilla-firefox/files/mozilla-firefox-mousebuttons.patch b/www-client/mozilla-firefox/files/mozilla-firefox-mousebuttons.patch deleted file mode 100644 index 2050b7d174d8..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-firefox-mousebuttons.patch +++ /dev/null @@ -1,445 +0,0 @@ -Index: browser/app/profile/all.js -=================================================================== -RCS file: /cvsroot/mozilla/browser/app/profile/all.js,v -retrieving revision 1.84 -diff -u -r1.84 all.js ---- browser/app/profile/all.js 18 Dec 2003 08:12:58 -0000 1.84 -+++ browser/app/profile/all.js 20 Dec 2003 16:11:27 -0000 -@@ -527,6 +527,29 @@ - pref("mousewheel.withaltkey.numlines",1); - pref("mousewheel.withaltkey.sysnumlines",false); - -+pref("mousewheel.horizscroll.withnokey.action",2); -+pref("mousewheel.horizscroll.withnokey.numlines",-1); -+pref("mousewheel.horizscroll.withnokey.sysnumlines",true); -+pref("mousewheel.horizscroll.withcontrolkey.action",0); -+pref("mousewheel.horizscroll.withcontrolkey.numlines",1); -+pref("mousewheel.horizscroll.withcontrolkey.sysnumlines",true); -+pref("mousewheel.horizscroll.withshiftkey.action",0); -+pref("mousewheel.horizscroll.withshiftkey.numlines",1); -+pref("mousewheel.horizscroll.withshiftkey.sysnumlines",false); -+pref("mousewheel.horizscroll.withaltkey.action",2); -+pref("mousewheel.horizscroll.withaltkey.numlines",-1); -+pref("mousewheel.horizscroll.withaltkey.sysnumlines",false); -+ -+pref("mousebuttonsextended.buttonlist", "67"); -+pref("mousebuttonsextended.buttons.6.action.up", 2); -+pref("mousebuttonsextended.buttons.6.numlines.up", -1); -+pref("mousebuttonsextended.buttons.6.action.down", 2); -+pref("mousebuttonsextended.buttons.6.numlines.down", 1); -+pref("mousebuttonsextended.buttons.7.action.up", 2); -+pref("mousebuttonsextended.buttons.7.numlines.up", 1); -+pref("mousebuttonsextended.buttons.7.action.down", -1); -+pref("mousebuttonsextended.buttons.7.numlines.down", -1); -+ - pref("profile.confirm_automigration",true); - pref("profile.allow_automigration", false); // setting to false bypasses automigration in the profile code - -Index: modules/libpref/src/init/all.js -=================================================================== -RCS file: /cvsroot/mozilla/modules/libpref/src/init/all.js,v -retrieving revision 3.484 -diff -u -r3.484 all.js ---- modules/libpref/src/init/all.js 16 Dec 2003 13:58:02 -0000 3.484 -+++ modules/libpref/src/init/all.js 20 Dec 2003 16:11:27 -0000 -@@ -755,6 +755,29 @@ - pref("mousewheel.withaltkey.numlines",1); - pref("mousewheel.withaltkey.sysnumlines",false); - -+pref("mousewheel.horizscroll.withnokey.action",2); -+pref("mousewheel.horizscroll.withnokey.numlines",-1); -+pref("mousewheel.horizscroll.withnokey.sysnumlines",true); -+pref("mousewheel.horizscroll.withcontrolkey.action",0); -+pref("mousewheel.horizscroll.withcontrolkey.numlines",1); -+pref("mousewheel.horizscroll.withcontrolkey.sysnumlines",true); -+pref("mousewheel.horizscroll.withshiftkey.action",0); -+pref("mousewheel.horizscroll.withshiftkey.numlines",1); -+pref("mousewheel.horizscroll.withshiftkey.sysnumlines",false); -+pref("mousewheel.horizscroll.withaltkey.action",2); -+pref("mousewheel.horizscroll.withaltkey.numlines",-1); -+pref("mousewheel.horizscroll.withaltkey.sysnumlines",false); -+ -+pref("mousebuttonsextended.buttonlist", "67"); -+pref("mousebuttonsextended.buttons.6.action.up", 2); -+pref("mousebuttonsextended.buttons.6.numlines.up", -1); -+pref("mousebuttonsextended.buttons.6.action.down", 2); -+pref("mousebuttonsextended.buttons.6.numlines.down", 1); -+pref("mousebuttonsextended.buttons.7.action.up", 2); -+pref("mousebuttonsextended.buttons.7.numlines.up", 1); -+pref("mousebuttonsextended.buttons.7.action.down", -1); -+pref("mousebuttonsextended.buttons.7.numlines.down", -1); -+ - pref("profile.confirm_automigration",true); - // profile.migration_behavior determines how the profiles root is set - // 0 - use NS_APP_USER_PROFILES_ROOT_DIR -Index: widget/src/gtk/nsWidget.cpp -=================================================================== -RCS file: /cvsroot/mozilla/widget/src/gtk/nsWidget.cpp,v -retrieving revision 1.288 -diff -u -r1.288 nsWidget.cpp ---- widget/src/gtk/nsWidget.cpp 25 Sep 2003 05:34:25 -0000 1.288 -+++ widget/src/gtk/nsWidget.cpp 20 Dec 2003 16:11:27 -0000 -@@ -20,6 +20,8 @@ - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): -+ * Andrew Wellington <proton@wiretapped.net> -+ * Graham Dennis <u3952328@anu.edu.au> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -1884,9 +1886,17 @@ - Release(); - return; - -- // Single-click default. -+ // Single-click default. <-- Perhaps the default should be -+ // decided elsewhere? - default: -- eventType = NS_MOUSE_LEFT_BUTTON_DOWN; -+ // was: eventType = NS_MOUSE_LEFT_BUTTON_DOWN; -+ { -+ nsExtendedMouseEventStatus *eMEStatus; -+ eMEStatus = (nsExtendedMouseEventStatus*) &event.clickCount; -+ eventType = NS_USER_DEFINED_EVENT; -+ eMEStatus->event = nsExtendedMouseEventStatus_down; -+ eMEStatus->button = aGdkButtonEvent->button; -+ } - break; - } - break; -@@ -1955,8 +1965,17 @@ - // LEFT_BUTTON_UP to happen - return; - -+ // Left-click default. <-- Perhaps the default should be -+ // decided elsewhere? - default: -- eventType = NS_MOUSE_LEFT_BUTTON_UP; -+ // was: eventType = NS_MOUSE_LEFT_BUTTON_UP; -+ { -+ nsExtendedMouseEventStatus *eMEStatus; -+ eMEStatus = (nsExtendedMouseEventStatus*) &event.clickCount; -+ eventType = NS_USER_DEFINED_EVENT; -+ eMEStatus->event = nsExtendedMouseEventStatus_up; -+ eMEStatus->button = aGdkButtonEvent->button; -+ } - break; - } - -@@ -2082,6 +2101,7 @@ - nsMouseEvent &anEvent, - PRUint32 aEventType) - { -+ PRUint16 clickCount; - anEvent.message = aEventType; - anEvent.widget = this; - -@@ -2100,16 +2120,23 @@ - switch(aGdkButtonEvent->type) - { - case GDK_BUTTON_PRESS: -- anEvent.clickCount = 1; -+ clickCount = 1; - break; - case GDK_2BUTTON_PRESS: -- anEvent.clickCount = 2; -+ clickCount = 2; - break; - case GDK_3BUTTON_PRESS: -- anEvent.clickCount = 3; -+ clickCount = 3; - break; - default: -- anEvent.clickCount = 1; -+ clickCount = 1; -+ } -+ if (aEventType!=NS_USER_DEFINED_EVENT) { -+ anEvent.clickCount = clickCount; -+ } else { -+ nsExtendedMouseEventStatus *eMEStatus; -+ eMEStatus = (nsExtendedMouseEventStatus*) &anEvent.clickCount; -+ eMEStatus->realClickCount = clickCount; - } - - } -Index: widget/public/nsGUIEvent.h -=================================================================== -RCS file: /cvsroot/mozilla/widget/public/nsGUIEvent.h,v -retrieving revision 3.98 -diff -u -r3.98 nsGUIEvent.h ---- widget/public/nsGUIEvent.h 1 May 2003 01:01:03 -0000 3.98 -+++ widget/public/nsGUIEvent.h 20 Dec 2003 16:11:27 -0000 -@@ -22,6 +22,8 @@ - * Contributor(s): - * Makoto Kato <m_kato@ga2.so-net.ne.jp> - * Dean Tessman <dean_tessman@hotmail.com> -+ * Andrew Wellington <proton@wiretapped.net> -+ * Graham Dennis <u3952328@anu.edu.au> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -416,6 +418,22 @@ - nsDragDropEventStatus_eDrop - }; - -+/** -+ * Event status for an extended mouse button event -+ * The event (called clickCount) is type PRUint32: -+ * hence this struct will be of the same size -+ */ -+typedef struct { -+ PRUint16 realClickCount; -+ PRUint8 button; -+ PRUint8 event; // eg button went up / down -+} nsExtendedMouseEventStatus; -+ -+enum { -+ /// different types of events -+ nsExtendedMouseEventStatus_up, -+ nsExtendedMouseEventStatus_down -+}; - - /** - * GUI MESSAGES -Index: content/events/src/nsEventStateManager.cpp -=================================================================== -RCS file: /cvsroot/mozilla/content/events/src/nsEventStateManager.cpp,v -retrieving revision 1.466 -diff -u -r1.466 nsEventStateManager.cpp ---- content/events/src/nsEventStateManager.cpp 19 Nov 2003 02:23:25 -0000 1.466 -+++ content/events/src/nsEventStateManager.cpp 20 Dec 2003 16:11:28 -0000 -@@ -22,6 +22,9 @@ - * Contributor(s): - * Makoto Kato <m_kato@ga2.so-net.ne.jp> - * Dean Tessman <dean_tessman@hotmail.com> -+ * Andrew Wellington <proton@wiretapped.net> -+ * Graham Dennis <u3952328@anu.edu.au> -+ * Thomas Kleffel <thomas.kleffel@maintech.de> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -1911,6 +1914,96 @@ - } - } - break; -+ case NS_USER_DEFINED_EVENT: // In reality an extended mouse event -+ { -+ nsExtendedMouseEventStatus *eMEStatus; -+ nsMouseEvent *mEvent = (nsMouseEvent* )aEvent; -+ eMEStatus = (nsExtendedMouseEventStatus *)&mEvent->clickCount; -+ nsresult rv; -+ nsXPIDLCString buttonList; -+ char ourbutton=0; -+ nsCAutoString keyBase, keySuffix; -+ PRInt32 action; -+ PRInt32 numLines; -+ -+ rv = getPrefBranch(); -+ if (NS_FAILED(rv)) return rv; -+ -+ // adding 2 below so the maximum number of mouse buttons we can -+ // support is 99 but to represent the buttons in buttonlist -+ // we're going to map 10->35 onto 'a'->'z' -+ // the storage actually supports 256 -+ if(eMEStatus->button > 35) break; -+ if(eMEStatus->button > 9) -+ ourbutton = 'a' + eMEStatus->button -9; -+ else -+ ourbutton = '0' + eMEStatus->button; -+ rv = mPrefBranch->GetCharPref("mousebuttonsextended.buttonlist", -+ getter_Copies(buttonList)); -+ if(NS_FAILED(rv)) break; -+ if(!PL_strchr(buttonList.get(), ourbutton)) break; -+ keyBase = NS_LITERAL_CSTRING("mouseextended.buttons."); -+ keyBase.Append(ourbutton); -+ keySuffix = (eMEStatus->event == nsExtendedMouseEventStatus_up) -+ ? NS_LITERAL_CSTRING(".up") -+ : NS_LITERAL_CSTRING(".down"); -+ rv = mPrefBranch->GetIntPref(PromiseFlatCString -+ (keyBase + NS_LITERAL_CSTRING(".action") + keySuffix).get(), -+ &action); -+ if(NS_FAILED(rv)) break; -+ rv = mPrefBranch->GetIntPref(PromiseFlatCString -+ (keyBase + NS_LITERAL_CSTRING(".numlines") + keySuffix).get(), -+ &numLines); -+ if(NS_FAILED(rv)) break; -+ -+ switch (action) { -+ -+#if 0 // Because we would have to create a msEvent -+ case MOUSE_SCROLL_N_LINES: -+ case MOUSE_SCROLL_PAGE: -+ { -+ DoWheelScroll(aPresContext, aTargetFrame, msEvent, numLines, -+ (msEvent->scrollFlags & nsMouseScrollEvent::kIsHorizontal), -+ (action == MOUSE_SCROLL_PAGE), PR_FALSE); -+ -+ } -+ break; -+#endif -+ case MOUSE_SCROLL_HISTORY: -+ { -+ nsCOMPtr<nsISupports> pcContainer; -+ mPresContext->GetContainer(getter_AddRefs(pcContainer)); -+ if (pcContainer) { -+ nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(pcContainer)); -+ if (webNav) { -+ // negative numLines to go back one step, nonneg to go forward -+ if (numLines < 0) -+ webNav->GoBack(); -+ else -+ webNav->GoForward(); -+ } -+ } -+ } -+ break; -+ -+ case MOUSE_SCROLL_TEXTSIZE: -+ { -+ // Exclude form controls and XUL content. -+ nsIContent *content = aTargetFrame->GetContent(); -+ if (content && -+ !content->IsContentOfType(nsIContent::eHTML_FORM_CONTROL) && -+ !content->IsContentOfType(nsIContent::eXUL)) -+ { -+ ChangeTextSize((numLines > 0) ? 1 : -1); -+ } -+ } -+ break; -+ -+ default: // Including -1 (do nothing) -+ break; -+ } -+ } -+ break; - case NS_MOUSE_SCROLL: - if (nsEventStatus_eConsumeNoDefault != *aStatus) { - nsresult rv; -@@ -1920,55 +2013,58 @@ - nsMouseScrollEvent *msEvent = (nsMouseScrollEvent*) aEvent; - PRInt32 action = 0; - PRInt32 numLines = 0; -- PRBool aBool; -- if (msEvent->isShift) { -- mPrefBranch->GetIntPref("mousewheel.withshiftkey.action", &action); -- mPrefBranch->GetBoolPref("mousewheel.withshiftkey.sysnumlines", -- &aBool); -- if (aBool) { -- numLines = msEvent->delta; -- if (msEvent->scrollFlags & nsMouseScrollEvent::kIsFullPage) -- action = MOUSE_SCROLL_PAGE; -- } -- else -- mPrefBranch->GetIntPref("mousewheel.withshiftkey.numlines", -- &numLines); -- } else if (msEvent->isControl) { -- mPrefBranch->GetIntPref("mousewheel.withcontrolkey.action", &action); -- mPrefBranch->GetBoolPref("mousewheel.withcontrolkey.sysnumlines", -- &aBool); -- if (aBool) { -- numLines = msEvent->delta; -- if (msEvent->scrollFlags & nsMouseScrollEvent::kIsFullPage) -- action = MOUSE_SCROLL_PAGE; -- } -- else -- mPrefBranch->GetIntPref("mousewheel.withcontrolkey.numlines", -- &numLines); -- } else if (msEvent->isAlt) { -- mPrefBranch->GetIntPref("mousewheel.withaltkey.action", &action); -- mPrefBranch->GetBoolPref("mousewheel.withaltkey.sysnumlines", &aBool); -- if (aBool) { -- numLines = msEvent->delta; -- if (msEvent->scrollFlags & nsMouseScrollEvent::kIsFullPage) -- action = MOUSE_SCROLL_PAGE; -- } -- else -- mPrefBranch->GetIntPref("mousewheel.withaltkey.numlines", -- &numLines); -- } else { -- mPrefBranch->GetIntPref("mousewheel.withnokey.action", &action); -- mPrefBranch->GetBoolPref("mousewheel.withnokey.sysnumlines", &aBool); -- if (aBool) { -- numLines = msEvent->delta; -- if (msEvent->scrollFlags & nsMouseScrollEvent::kIsFullPage) -- action = MOUSE_SCROLL_PAGE; -- } -- else -- mPrefBranch->GetIntPref("mousewheel.withnokey.numlines", &numLines); -- } -+ PRBool useSysNumLines; - -- if ((msEvent->delta < 0) && (numLines > 0)) -+ NS_NAMED_LITERAL_CSTRING(prefmousewheel, "mousewheel"); -+ NS_NAMED_LITERAL_CSTRING(prefhoriz, ".horizscroll"); -+ NS_NAMED_LITERAL_CSTRING(prefvert, ""); -+ NS_NAMED_LITERAL_CSTRING(prefnodir, ""); -+ NS_NAMED_LITERAL_CSTRING(prefnokey, ".withnokey"); -+ NS_NAMED_LITERAL_CSTRING(prefshiftkey, ".withshiftkey"); -+ NS_NAMED_LITERAL_CSTRING(prefctrlkey, ".withcontrolkey"); -+ NS_NAMED_LITERAL_CSTRING(prefaltkey, ".withaltkey"); -+ NS_NAMED_LITERAL_CSTRING(prefaction, ".action"); -+ NS_NAMED_LITERAL_CSTRING(prefsysnumlines, ".sysnumlines"); -+ NS_NAMED_LITERAL_CSTRING(prefnumlines, ".numlines"); -+ -+ nsCString prefDirection; -+ nsCString prefModifier; -+ -+ //if delta==0 we have nothing to do! -+ if(msEvent->delta == 0) break; -+ -+ prefDirection = prefnodir; -+ switch(msEvent->scrollFlags) { -+ case nsMouseScrollEvent::kIsHorizontal: -+ prefDirection = prefhoriz; break; -+ case nsMouseScrollEvent::kIsVertical: -+ prefDirection = prefvert; break; -+ } -+ -+ prefModifier = prefnokey; -+ if(msEvent->isAlt) prefModifier = prefaltkey; -+ if(msEvent->isControl) prefModifier = prefctrlkey; -+ if(msEvent->isShift) prefModifier = prefshiftkey; -+ -+ rv = mPrefBranch->GetIntPref(PromiseFlatCString(prefmousewheel + -+ prefDirection + prefModifier + prefaction).get(), -+ &action); -+ if(NS_FAILED(rv)) break; -+ -+ rv = mPrefBranch->GetIntPref(PromiseFlatCString(prefmousewheel + -+ prefDirection + prefModifier + prefnumlines).get(), -+ &numLines); -+ -+ rv = mPrefBranch->GetBoolPref(PromiseFlatCString(prefmousewheel + -+ prefDirection + prefModifier + prefsysnumlines).get(), -+ &useSysNumLines); -+ if(NS_FAILED(rv)) break; -+ -+ // if numlines == 0 take the system value -+ if(numLines == 0 || useSysNumLines) -+ numLines = msEvent->delta; -+ // invert the given value if the system delta is negative -+ else if(msEvent->delta < 0) - numLines = -numLines; - - switch (action) { -@@ -1990,7 +2086,8 @@ - if (pcContainer) { - nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(pcContainer)); - if (webNav) { -- if (msEvent->delta > 0) -+ // negative numLines to go back one step, nonneg to go forward -+ if (numLines < 0) - webNav->GoBack(); - else - webNav->GoForward(); -@@ -2007,7 +2104,8 @@ - !content->IsContentOfType(nsIContent::eHTML_FORM_CONTROL) && - !content->IsContentOfType(nsIContent::eXUL)) - { -- ChangeTextSize((msEvent->delta > 0) ? 1 : -1); -+ // As before numLines is used to give the sign of the event -+ ChangeTextSize((numLines < 0) ? -1 : 1); - } - } - break; diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.3-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.3-r1.ebuild new file mode 100644 index 000000000000..271c75d5d812 --- /dev/null +++ b/www-client/mozilla-firefox/mozilla-firefox-1.0.3-r1.ebuild @@ -0,0 +1,247 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.3-r1.ebuild,v 1.1 2005/04/25 21:14:10 agriffis Exp $ + +inherit makeedit flag-o-matic gcc nsplugins eutils mozconfig mozilla-launcher multilib + +S=${WORKDIR}/mozilla + +DESCRIPTION="The Mozilla Firefox Web Browser" +HOMEPAGE="http://www.mozilla.org/projects/firefox/" +MY_PV=${PV/_rc/rc} +SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2" + +LICENSE="MPL-1.1 NPL-1.1" +SLOT="0" +KEYWORDS="ia64" +IUSE="java mozsvg" + +# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2 +# and is required to build with support for cairo. #71504 +RDEPEND="java? ( virtual/jre ) + >=media-libs/libmng-1.0.0 + mozsvg? ( + >=x11-base/xorg-x11-6.7.0-r2 + x11-libs/cairo + ) + >=www-client/mozilla-launcher-1.28" + +DEPEND="${RDEPEND} + java? ( >=dev-java/java-config-0.2.0 )" + +# Needed by src_compile() and src_install(). +# Would do in pkg_setup but that loses the export attribute, they +# become pure shell variables. +export MOZ_PHOENIX=1 + +src_unpack() { + unpack firefox-${MY_PV}-source.tar.bz2 || die "unpack failed" + cd ${S} || die "cd failed" + + # alpha stubs patch from lfs project. + # <taviso@gentoo.org> (26 Jun 2003) + use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch + + # hppa patches from Ivar <orskaug@stud.ntnu.no> + # <gmsoft@gentoo.org> (22 Dec 2004) + epatch ${FILESDIR}/mozilla-hppa.patch + + # patch out ft caching code since the API changed between releases of + # freetype; this enables freetype-2.1.8+ compat. + # https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65 + epatch ${FILESDIR}/mozilla-firefox-1.0-4ft2.patch + + # patch to fix separate character on euro keyboards, bug 68995 + epatch ${FILESDIR}/mozilla-firefox-1.0-kp_separator.patch + + # some patches from Debian to set default preferences: + # - inherit LANG from env + # - shut off SSLv2 and 40-bit ciphers by default + # - disable application auto-updating + epatch ${FILESDIR}/mozilla-firefox-1.0.3-prefs.patch + + # patch to solve segfaults on ia64, from Debian, originally from David + # Mosberger + epatch ${FILESDIR}/mozilla-firefox-1.0.3-ia64.patch + + if has_version '>=x11-libs/cairo-0.3.0'; then + epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch + fi +} + +src_compile() { + #################################### + # + # mozconfig, CFLAGS and CXXFLAGS setup + # + #################################### + + mozconfig_init + + # Bug 60668: Galeon doesn't build without oji enabled, so enable it + # regardless of java setting. + mozconfig_annotate '' --enable-oji --enable-mathml + + # Other ff-specific settings + mozconfig_use_enable mozdevelop jsd + mozconfig_use_enable mozdevelop xpctools + mozconfig_use_extension mozdevelop venkman + mozconfig_use_enable gnome gnomevfs + mozconfig_use_extension gnome gnomevfs + mozconfig_use_enable mozsvg svg + mozconfig_use_enable mozsvg svg-renderer-cairo + mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/MozillaFirefox + mozconfig_annotate '' --prefix=/usr/$(get_libdir)/MozillaFirefox + + # Finalize and report settings + mozconfig_final + + # hardened GCC uses -fstack-protector-all by default, and this breaks + # firefox. + has_hardened && append-flags -fno-stack-protector-all + replace-flags -fstack-protector-all -fstack-protector + + #################################### + # + # Configure and build Firefox + # + #################################### + + # ./configure picks up the mozconfig stuff + export LD="$(tc-getLD)" + export CC="$(tc-getCC)" + export CXX="$(tc-getCXX)" + econf + + # This removes extraneous CFLAGS from the Makefiles to reduce RAM + # requirements while compiling + edit_makefiles + + emake MOZ_PHOENIX=1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die +} + +src_install() { + # Plugin path creation + PLUGIN_DIR="/usr/$(get_libdir)/nsbrowser/plugins" + dodir ${PLUGIN_DIR} + + dodir /usr/$(get_libdir)/MozillaFirefox + cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/$(get_libdir)/MozillaFirefox + + einfo "Installing includes and idl files..." + # Copy the include and idl files + dodir /usr/$(get_libdir)/MozillaFirefox/include/idl /usr/include + cd ${S}/dist + cp -LfR include/* ${D}/usr/$(get_libdir)/MozillaFirefox/include + cp -LfR idl/* ${D}/usr/$(get_libdir)/MozillaFirefox/include/idl + dosym /usr/$(get_libdir)/MozillaFirefox/include /usr/include/MozillaFirefox + + # Dirty hack to get some applications using this header running + dosym /usr/$(get_libdir)/MozillaFirefox/include/necko/nsIURI.h /usr/lib/MozillaFirefox/include/nsIURI.h + + cd ${S}/build/unix + # Fix firefox-config and install it + sed -i -e "s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" firefox-config + sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" firefox-config + exeinto /usr/$(get_libdir)/MozillaFirefox + doexe firefox-config + # Fix pkgconfig files and install them + insinto /usr/$(get_libdir)/pkgconfig + for x in *.pc; do + if [[ -f ${x} ]]; then + sed -i -e + "s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" ${x} + sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" ${x} + doins ${x} + fi + done + cd ${S} + + + #fix permissions + chown -R root:root ${D}/usr/$(get_libdir)/MozillaFirefox + + # Plugin path setup (rescuing the existent plugins) + src_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins + + dodir /usr/bin + cat <<EOF >${D}/usr/bin/firefox +#!/bin/sh +# +# Stub script to run mozilla-launcher. We used to use a symlink here but +# OOo brokenness makes it necessary to use a stub instead: +# http://bugs.gentoo.org/show_bug.cgi?id=78890 + +export MOZILLA_LAUNCHER=firefox +exec /usr/libexec/mozilla-launcher "\$@" +EOF +chmod 0755 ${D}/usr/bin/firefox + insinto /etc/env.d + doins ${FILESDIR}/10MozillaFirefox + + # Fix icons to look the same everywhere + insinto /usr/$(get_libdir)/MozillaFirefox/icons + doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm + doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm + + # Install icon and .desktop for menu entry + insinto /usr/share/pixmaps + doins ${FILESDIR}/icon/firefox-icon.png + # Fix bug 54179: Install .desktop file into /usr/share/applications + # instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis) + insinto /usr/share/applications + doins ${FILESDIR}/icon/mozillafirefox.desktop + + # Normally firefox-0.9 must be run as root once before it can be + # run as a normal user. Drop in some initialized files to avoid + # this. + einfo "Extracting firefox-${PV} initialization files" + tar xjpf ${FILESDIR}/firefox-0.9-init.tar.bz2 -C ${D}/usr/$(get_libdir)/MozillaFirefox +} + +pkg_preinst() { + export MOZILLA_FIVE_HOME=${ROOT}/usr/$(get_libdir)/MozillaFirefox + + # Remove the old plugins dir + pkg_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins + + # Remove entire installed instance to prevent all kinds of + # problems... see bug 44772 for example + rm -rf "${MOZILLA_FIVE_HOME}" +} + +pkg_postinst() { + export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/MozillaFirefox" + + # Needed to update the run time bindings for REGXPCOM + # (do not remove next line!) + env-update + + # Register Components and Chrome + # + # Bug 67031: Set HOME=~root in case this is being emerged via sudo. + # Otherwise the following commands will create ~/.mozilla owned by root + # and 700 perms, which makes subsequent execution of firefox by user + # impossible. + einfo "Registering Components and Chrome..." + HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom + HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regchrome + + # Fix permissions of component registry + chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat + + # Fix directory permissions + find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || : + + # Fix permissions on chrome files + find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || : + + # This should be called in the postinst and postrm of all the + # mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and + # thunderbird-bin ebuilds. + update_mozilla_launcher_symlinks +} + +pkg_postrm() { + update_mozilla_launcher_symlinks +} diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.3.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.3.ebuild index 2439c91f5d9a..ed22e314965a 100644 --- a/www-client/mozilla-firefox/mozilla-firefox-1.0.3.ebuild +++ b/www-client/mozilla-firefox/mozilla-firefox-1.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.3.ebuild,v 1.7 2005/04/18 22:03:53 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.3.ebuild,v 1.8 2005/04/25 21:14:10 agriffis Exp $ inherit makeedit flag-o-matic gcc nsplugins eutils mozconfig mozilla-launcher multilib @@ -13,7 +13,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source LICENSE="MPL-1.1 NPL-1.1" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc sparc x86" +KEYWORDS="alpha amd64 ~arm hppa -ia64 ppc sparc x86" IUSE="java mozsvg" # xrender.pc appeared for the first time in xorg-x11-6.7.0-r2 |