From owner-freebsd-gecko@FreeBSD.ORG Wed Aug 3 20:53:23 2011 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A0CBD106564A for ; Wed, 3 Aug 2011 20:53:23 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id D977E8FC15 for ; Wed, 3 Aug 2011 20:53:22 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id p73KrLDx052352 for ; Wed, 3 Aug 2011 20:53:21 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p73KrGe8047191 for freebsd-gecko@freebsd.org; Wed, 3 Aug 2011 20:53:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 3 Aug 2011 20:53:16 GMT Message-Id: <201108032053.p73KrGe8047191@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r604 - in branches/experimental/www/seamonkey-beta: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2011 20:53:23 -0000 Author: flo Date: Wed Aug 3 20:53:16 2011 New Revision: 604 Log: add seamonkey-beta Added: branches/experimental/www/seamonkey-beta/ - copied from r588, branches/experimental/www/seamonkey/ branches/experimental/www/seamonkey-beta/files/patch-calendar-base-src-calDateTime.cpp branches/experimental/www/seamonkey-beta/files/patch-configure.in - copied, changed from r600, branches/experimental/www/seamonkey/files/patch-configure.in branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util.h - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-build-build_config.h - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in - copied unchanged from r600, branches/experimental/www/seamonkey/files/patch-mozilla-configure.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-qcms-Makefile.in - copied unchanged from r600, branches/experimental/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.c - copied unchanged from r600, branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.h - copied unchanged from r600, branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h branches/experimental/www/seamonkey-beta/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in branches/experimental/www/seamonkey-beta/files/pkg-message.in - copied unchanged from r593, branches/experimental/www/seamonkey/files/pkg-message.in Replaced: branches/experimental/www/seamonkey-beta/Makefile - copied, changed from r601, branches/experimental/www/seamonkey/Makefile branches/experimental/www/seamonkey-beta/distinfo - copied, changed from r593, branches/experimental/www/seamonkey/distinfo branches/experimental/www/seamonkey-beta/files/mozconfig-generic.in - copied unchanged from r599, branches/experimental/www/seamonkey/files/mozconfig-generic.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Deleted: branches/experimental/www/seamonkey-beta/files/patch-bugzilla-449453 branches/experimental/www/seamonkey-beta/files/patch-configure branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure branches/experimental/www/seamonkey-beta/files/patch-sysnss branches/experimental/www/seamonkey-beta/files/patch-xptcall-alpha Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in Copied and modified: branches/experimental/www/seamonkey-beta/Makefile (from r601, branches/experimental/www/seamonkey/Makefile) ============================================================================== --- branches/experimental/www/seamonkey/Makefile Fri Jul 29 22:37:55 2011 (r601, copy source) +++ branches/experimental/www/seamonkey-beta/Makefile Wed Aug 3 20:53:16 2011 (r604) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.2 +DISTVERSION= 2.3b2 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -68,8 +68,8 @@ .include -MOZSRC:= ${WRKDIR}/comm-release/mozilla -WRKSRC= ${WRKDIR}/comm-release +MOZSRC:= ${WRKDIR}/comm-beta/mozilla +WRKSRC= ${WRKDIR}/comm-beta GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} Copied and modified: branches/experimental/www/seamonkey-beta/distinfo (from r593, branches/experimental/www/seamonkey/distinfo) ============================================================================== --- branches/experimental/www/seamonkey/distinfo Sat Jul 23 00:58:09 2011 (r593, copy source) +++ branches/experimental/www/seamonkey-beta/distinfo Wed Aug 3 20:53:16 2011 (r604) @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.2.source.tar.bz2) = 0b713e2f78a2c5139bf16736bd12e87017cdbc675948d4a8893a3d834bf8c13a -SIZE (seamonkey-2.2.source.tar.bz2) = 87478968 +SHA256 (seamonkey-2.3b2.source.tar.bz2) = 0fb5d5de891397493e67b48089c6f8e47f4f2c9f5f750c24c7225fabf2e3b450 +SIZE (seamonkey-2.3b2.source.tar.bz2) = 86804711 Copied: branches/experimental/www/seamonkey-beta/files/mozconfig-generic.in (from r599, branches/experimental/www/seamonkey/files/mozconfig-generic.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/mozconfig-generic.in Wed Aug 3 20:53:16 2011 (r604, copy of r599, branches/experimental/www/seamonkey/files/mozconfig-generic.in) @@ -0,0 +1,8 @@ +ac_add_options --prefix=@FAKEDIR@ +export CPPFLAGS="@CPPFLAGS@" +export CFLAGS="@CFLAGS@" +export LIBS="@LIBS@" +export LDFLAGS="@LDFLAGS@" +export CONFIG_SH=/bin/sh +export XP_UNIX=1 +export PERL="@PERL@" Deleted: branches/experimental/www/seamonkey/files/patch-bugzilla-449453 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-bugzilla-449453 Wed Aug 3 20:53:16 2011 (r588) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,99 +0,0 @@ -Index: ldap/sdks/c-sdk/ldap/include/portable.h -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/portable.h,v -retrieving revision 5.15 -diff -u -8 -p -r5.15 portable.h ---- ldap/sdks/c-sdk/ldap/include/portable.h 3 Oct 2006 20:43:40 -0000 5.15 -+++ ldap/sdks/c-sdk/ldap/include/portable.h 6 Oct 2010 19:06:58 -0000 -@@ -117,17 +117,17 @@ - #else - #define OPENLOG_OPTIONS ( LOG_PID | LOG_NOWAIT ) - #endif - - /* - * some systems don't have the BSD re_comp and re_exec routines - */ - #ifndef NEED_BSDREGEX --#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) -+#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) - #define NEED_BSDREGEX - #endif - #endif - - /* - * many systems do not have the setpwfile() library routine... we just - * enable use for those systems we know have it. - */ -Index: ldap/sdks/c-sdk/ldap/include/regex.h -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/regex.h,v -retrieving revision 5.2 -diff -u -8 -p -r5.2 regex.h ---- ldap/sdks/c-sdk/ldap/include/regex.h 15 Oct 2003 17:26:00 -0000 5.2 -+++ ldap/sdks/c-sdk/ldap/include/regex.h 6 Oct 2010 19:06:59 -0000 -@@ -68,18 +68,18 @@ extern "C" { - #define LDAP_CALL - #endif - #endif - - #ifdef NEEDPROTOS - int re_init( void ); - void re_lock( void ); - int re_unlock( void ); --char * LDAP_CALL re_comp( char *pat ); --int LDAP_CALL re_exec( char *lp ); -+char * LDAP_CALL re_comp( const char *pat ); -+int LDAP_CALL re_exec( const char *lp ); - void LDAP_CALL re_modw( char *s ); - int LDAP_CALL re_subs( char *src, char *dst ); - #else /* NEEDPROTOS */ - int re_init(); - void re_lock(); - int re_unlock(); - char * LDAP_CALL re_comp(); - int LDAP_CALL re_exec(); -Index: ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c,v -retrieving revision 5.2 -diff -u -8 -p -r5.2 regex.c ---- ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c 15 Oct 2003 17:26:03 -0000 5.2 -+++ ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c 6 Oct 2010 19:06:59 -0000 -@@ -262,17 +262,17 @@ chset(REGEXCHAR c) - bittab[((c) & (unsigned)BLKIND) >> 3] |= bitarr[(c) & BITIND]; - } - - #define badpat(x) (*nfa = END, x) - #define store(x) *mp++ = x - - char * - LDAP_CALL --re_comp( char *pat ) -+re_comp( const char *pat ) - { - register REGEXCHAR *p; /* pattern pointer */ - register REGEXCHAR *mp=nfa; /* nfa pointer */ - register REGEXCHAR *lp; /* saved pointer.. */ - register REGEXCHAR *sp=nfa; /* another one.. */ - - register int tagi = 0; /* tag stack index */ - register int tagc = 1; /* actual tag count */ -@@ -508,17 +508,17 @@ static REGEXCHAR *pmatch(); - * If a match is found, bopat[0] and eopat[0] are set - * to the beginning and the end of the matched fragment, - * respectively. - * - */ - - int - LDAP_CALL --re_exec( char *lp ) -+re_exec( const char *lp ) - { - register REGEXCHAR c; - register REGEXCHAR *ep = 0; - register REGEXCHAR *ap = nfa; - - bol = (REGEXCHAR*)lp; - - bopat[0] = 0; Added: branches/experimental/www/seamonkey-beta/files/patch-calendar-base-src-calDateTime.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-calendar-base-src-calDateTime.cpp Wed Aug 3 20:53:16 2011 (r604) @@ -0,0 +1,8 @@ +--- calendar/base/src/calDateTime.cpp.orig 2011-08-03 20:08:23.361859978 +0200 ++++ calendar/base/src/calDateTime.cpp 2011-08-03 20:08:32.351860948 +0200 +@@ -1,4 +1,4 @@ +-/* ***** BEGIN LICENSE BLOCK ***** ++/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version Deleted: branches/experimental/www/seamonkey/files/patch-configure ============================================================================== --- branches/experimental/www/seamonkey/files/patch-configure Wed Aug 3 20:53:16 2011 (r588) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,47 +0,0 @@ ---- configure.orig 2010-05-11 17:47:16.000000000 +0000 -+++ configure 2010-05-11 17:51:00.000000000 +0000 -@@ -5956,7 +5956,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -10972,7 +10972,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -11013,7 +11013,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi Copied and modified: branches/experimental/www/seamonkey-beta/files/patch-configure.in (from r600, branches/experimental/www/seamonkey/files/patch-configure.in) ============================================================================== --- branches/experimental/www/seamonkey/files/patch-configure.in Fri Jul 29 22:32:35 2011 (r600, copy source) +++ branches/experimental/www/seamonkey-beta/files/patch-configure.in Wed Aug 3 20:53:16 2011 (r604) @@ -1,5 +1,5 @@ ---- configure.in.orig 2011-07-28 00:58:59.534861026 +0200 -+++ configure.in 2011-07-28 01:00:05.591863508 +0200 +--- configure.in.orig 2011-07-15 07:42:33.000000000 +0200 ++++ configure.in 2011-07-22 13:43:44.000000000 +0200 @@ -1438,7 +1438,7 @@ CPU_ARCH=sparc ;; @@ -18,3 +18,104 @@ INTEL_ARCHITECTURE=1 esac +@@ -1781,7 +1781,7 @@ + esac + + case "${host_cpu}" in +- x86_64) ++ amd64 | x86_64) + HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_" + ;; + esac +@@ -2437,6 +2437,9 @@ + x86_64-*) + AC_DEFINE(_AMD64_) + ;; ++ amd64*) ++ AC_DEFINE(_AMD64_) ++ ;; + *) + AC_DEFINE(_CPU_ARCH_NOT_DEFINED) + ;; +@@ -2508,7 +2511,7 @@ + else + DLL_SUFFIX=".so.1.0" + fi +- MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib' ++ MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/local)/lib' + DSO_CFLAGS='' + DSO_PIC_CFLAGS='-fPIC' + DSO_LDOPTS='-shared -fPIC' +@@ -3326,11 +3329,11 @@ + ;; + *) + MOZ_CHECK_PTHREADS(pthreads, +- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads", ++ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads", + MOZ_CHECK_PTHREADS(pthread, +- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread", ++ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", + MOZ_CHECK_PTHREADS(c_r, +- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r", ++ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", + MOZ_CHECK_PTHREADS(c, + USE_PTHREADS=1 + ) +@@ -3405,18 +3408,18 @@ + *-*-freebsd*) + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) +- dnl -pthread links in -lc_r, so don't specify it explicitly. ++ dnl -pthread links in -pthread, so don't specify it explicitly. + if test "$ac_cv_have_dash_pthread" = "yes"; then + _PTHREAD_LDFLAGS="-pthread" + else +- _PTHREAD_LDFLAGS="-lc_r" ++ _PTHREAD_LDFLAGS="-pthread" + fi + ;; + + *-*-openbsd*|*-*-bsdi*) + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) +- dnl -pthread links in -lc_r, so don't specify it explicitly. ++ dnl -pthread links in -pthread, so don't specify it explicitly. + if test "$ac_cv_have_dash_pthread" = "yes"; then + _PTHREAD_LDFLAGS="-pthread" + fi +@@ -3591,7 +3594,7 @@ + ac_cv_func_iconv, + [AC_TRY_LINK([ + #include +- #include ++ #include "/usr/local/include/iconv.h" + ], + [ + iconv_t h = iconv_open("", ""); +@@ -3612,7 +3615,7 @@ + ac_cv_func_const_iconv, + [AC_TRY_COMPILE([ + #include +- #include ++ #include "/usr/local/include/iconv.h" + ], + [ + const char *input = "testing"; +@@ -4409,7 +4412,7 @@ + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + +-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then ++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then + ZLIB_CFLAGS="-I${ZLIB_DIR}/include" + ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" + fi +@@ -5966,7 +5969,7 @@ + i*86) + MOZ_CRT_CPU_ARCH=intel + ;; +- x86_64) ++ amd64 | x86_64) + MOZ_CRT_CPU_ARCH=amd64 + ;; + *) Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc) @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc~ ++++ mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc +@@ -39,6 +39,7 @@ + * ***** END LICENSE BLOCK ***** */ + + #include "base/atomicops.h" ++#include "base/lock.h" + + namespace base { + namespace subtle { Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util.h (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util.h Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h) @@ -0,0 +1,13 @@ +--- mozilla/ipc/chromium/src/base/file_util.h~ ++++ mozilla/ipc/chromium/src/base/file_util.h +@@ -15,8 +15,9 @@ + #elif defined(ANDROID) + #include + #elif defined(OS_POSIX) ++#include ++#include + #include +-#include + #endif + + #include Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/file_util_linux.cc~ ++++ mozilla/ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) { + #ifdef ANDROID + return GetTempDir(path); + #else +- *path = FilePath("/dev/shm"); ++ *path = FilePath("/tmp"); + return true; + #endif + } Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/file_util_posix.cc~ ++++ mozilla/ipc/chromium/src/base/file_util_posix.cc +@@ -30,6 +30,8 @@ + #include "base/string_util.h" + #include "base/time.h" + ++#define stat64 stat ++ + namespace file_util { + + #if defined(GOOGLE_CHROME_BUILD) Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc) @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/platform_file_posix.cc~ ++++ mozilla/ipc/chromium/src/base/platform_file_posix.cc +@@ -9,6 +9,7 @@ + #ifdef ANDROID + #include + #endif ++#include + + #include "base/logging.h" + #include "base/string_util.h" Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc) @@ -0,0 +1,12 @@ +--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200 ++++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200 +@@ -34,7 +33,8 @@ + #if defined(OS_MACOSX) + return mach_thread_self(); + #elif defined(OS_LINUX) +- return syscall(__NR_gettid); ++ // TODO(BSD): find a better thread ID ++ return reinterpret_cast(pthread_self()); + #endif + } + Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h~ ++++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h +@@ -34,7 +34,7 @@ + #include "base/third_party/nspr/prcpucfg_win.h" + #elif defined(__APPLE__) + #include "base/third_party/nspr/prcpucfg_mac.h" +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__FreeBSD__) || defined(ANDROID) + #include "base/third_party/nspr/prcpucfg_linux.h" + #else + #error Provide a prcpucfg.h appropriate for your platform Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-build-build_config.h (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-build-build_config.h Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/build/build_config.h~ ++++ mozilla/ipc/chromium/src/build/build_config.h +@@ -17,7 +17,7 @@ + // A set of macros to use for platform detection. + #if defined(__APPLE__) + #define OS_MACOSX 1 +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__FreeBSD__) || defined(ANDROID) + #define OS_LINUX 1 + #elif defined(_WIN32) + #define OS_WIN 1 Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-configure ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-configure Wed Aug 3 20:53:16 2011 (r588) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/configure.orig 2010-01-08 09:53:05.000000000 +0100 -+++ mozilla/configure 2010-01-08 09:53:34.000000000 +0100 -@@ -5502,7 +5502,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - esac Copied: branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in (from r600, branches/experimental/www/seamonkey/files/patch-mozilla-configure.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in Wed Aug 3 20:53:16 2011 (r604, copy of r600, branches/experimental/www/seamonkey/files/patch-mozilla-configure.in) @@ -0,0 +1,86 @@ +--- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100 ++++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100 +@@ -1549,7 +1549,7 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + +@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 + esac + +@@ -3803,19 +3803,21 @@ + AC_CHECK_FUNCS(localtime_r strtok_r) + + dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt +-_SAVE_LDFLAGS=$LDFLAGS +-LDFLAGS="$LDFLAGS -lrt" +-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, ++_SAVE_LIBS=$LIBS ++AC_SEARCH_LIBS(clock_gettime, rt) ++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), + ac_cv_have_clock_monotonic, + [AC_TRY_LINK([#include ], + [ struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); ], + ac_cv_have_clock_monotonic=yes, + ac_cv_have_clock_monotonic=no)]) +-LDFLAGS=$_SAVE_LDFLAGS ++LIBS=$_SAVE_LIBS + if test "$ac_cv_have_clock_monotonic" = "yes"; then + HAVE_CLOCK_MONOTONIC=1 +- REALTIME_LIBS=-lrt ++ if test "$ac_cv_search_clock_gettime" != "none required"; then ++ REALTIME_LIBS=$ac_cv_search_clock_gettime ++ fi + AC_DEFINE(HAVE_CLOCK_MONOTONIC) + AC_SUBST(HAVE_CLOCK_MONOTONIC) + AC_SUBST(REALTIME_LIBS) +@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + +-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then ++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then + ZLIB_CFLAGS="-I${ZLIB_DIR}/include" + ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" + fi +@@ -6022,6 +6024,14 @@ + VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 + ;; ++ FreeBSD:i386) ++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" ++ VPX_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" ++ VPX_X86_ASM=1 ++ ;; + SunOS:x86) + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 +@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; ++ FreeBSD:i386) ++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" ++ LIBJPEG_TURBO_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" ++ LIBJPEG_TURBO_X64_ASM=1 ++ ;; + SunOS:i?86) + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 Copied: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-qcms-Makefile.in (from r600, branches/experimental/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-qcms-Makefile.in Wed Aug 3 20:53:16 2011 (r604, copy of r600, branches/experimental/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in) @@ -0,0 +1,11 @@ +--- mozilla/gfx/qcms/Makefile.in.orig 2011-01-22 01:25:38.000000000 +0100 ++++ mozilla/gfx/qcms/Makefile.in 2011-01-27 18:16:39.000000000 +0100 +@@ -15,7 +15,7 @@ + + CSRCS = iccread.c transform.c + +-ifeq (86,$(findstring 86,$(OS_TEST))) ++ifneq (,$(INTEL_ARCHITECTURE)) + CSRCS += transform-sse2.c + ifdef _MSC_VER + ifneq ($(OS_ARCH)_$(OS_TEST),WINNT_x86_64) Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-Makefile.in Mon Jul 11 10:15:50 2011 (r588) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in Wed Aug 3 20:53:16 2011 (r604) @@ -1,10 +1,41 @@ ---- mozilla/js/src/Makefile.in.orig 2009-08-25 18:58:30.000000000 +0200 -+++ mozilla/js/src/Makefile.in 2009-08-25 18:58:47.000000000 +0200 -@@ -428,6 +428,7 @@ +--- mozilla/js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200 ++++ mozilla/js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200 +@@ -416,7 +416,7 @@ + # END enclude sources for V8 dtoa + ############################################# + +-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU))) ++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU))) + + VPATH += $(srcdir)/assembler \ + $(srcdir)/assembler/wtf \ +@@ -469,6 +469,9 @@ + else + #CPPSRCS += only_on_x86.cpp + endif ++ifeq (amd64, $(TARGET_CPU)) ++#CPPSRCS += only_on_x86_64.cpp ++endif + endif + ifeq (arm, $(TARGET_CPU)) + #CPPSRCS += only_on_arm.cpp +@@ -739,7 +742,7 @@ + # to reliably get limit macros defined, we'd always have to define the + # one below before including any header, but that's obscure and + # fragile, so we do it here. +-DEFINES += -D__STDC_LIMIT_MACROS ++DEFINES += -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS + + INCLUDES += -I$(srcdir) + +@@ -793,7 +796,8 @@ + endif # WINNT ifeq ($(OS_ARCH),FreeBSD) - EXTRA_LIBS += -pthread -+LDFLAGS += -lc +-EXTRA_LIBS += -pthread ++DEFINES += -DFREEBSD ++EXTRA_LIBS += -pthread -lc endif ifeq ($(OS_ARCH),IRIX) ifdef USE_N32 + Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure Wed Aug 3 20:53:16 2011 (r588) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,26 +0,0 @@ ---- mozilla/js/src/configure.orig 2010-10-08 21:56:36.000000000 +0200 -+++ mozilla/js/src/configure 2010-10-10 21:48:36.000000000 +0200 -@@ -5373,7 +5373,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -7346,14 +7346,6 @@ - EOF - - ;; --sparc*-*) -- ENABLE_TRACEJIT=1 -- NANOJIT_ARCH=Sparc -- cat >> confdefs.h <<\EOF --#define JS_CPU_SPARC 1 --EOF -- -- ;; - esac - - # Check whether --enable-methodjit or --disable-methodjit was given. Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in Wed Aug 3 20:53:16 2011 (r604) @@ -0,0 +1,72 @@ +--- mozilla/js/src/configure.in.orig 2011-07-06 05:09:22.000000000 +0200 ++++ mozilla/js/src/configure.in 2011-07-06 22:19:17.584233430 +0200 +@@ -1473,7 +1473,7 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + +@@ -1495,7 +1495,7 @@ + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 + esac + +@@ -2713,7 +2713,7 @@ + AC_DEFINE(JS_CPU_X86) + AC_DEFINE(JS_NUNBOX32) + ;; +-x86_64*-*) ++amd64*-*) + ENABLE_TRACEJIT=1 + NANOJIT_ARCH=X64 + ENABLE_METHODJIT=1 +@@ -2723,23 +2723,23 @@ + AC_DEFINE(JS_CPU_X64) + AC_DEFINE(JS_PUNBOX64) + ;; +-arm*-*) ++x86_64*-*) + ENABLE_TRACEJIT=1 +- NANOJIT_ARCH=ARM ++ NANOJIT_ARCH=X64 + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 + ENABLE_POLYIC=1 +- AC_DEFINE(JS_CPU_ARM) +- AC_DEFINE(JS_NUNBOX32) ++ ENABLE_POLYIC_TYPED_ARRAY=1 ++ AC_DEFINE(JS_CPU_X64) ++ AC_DEFINE(JS_PUNBOX64) + ;; +-sparc*-*) ++arm*-*) + ENABLE_TRACEJIT=1 +- NANOJIT_ARCH=Sparc ++ NANOJIT_ARCH=ARM + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 + ENABLE_POLYIC=1 +- ENABLE_POLYIC_TYPED_ARRAY=1 +- AC_DEFINE(JS_CPU_SPARC) ++ AC_DEFINE(JS_CPU_ARM) + AC_DEFINE(JS_NUNBOX32) + ;; + esac +@@ -2796,6 +2796,10 @@ + i?86-*) + AC_DEFINE(AVMPLUS_IA32) + ;; ++amd64*-*) ++ AC_DEFINE(AVMPLUS_AMD64) ++ AC_DEFINE(AVMPLUS_64BIT) ++ ;; + x86_64*-*) + AC_DEFINE(AVMPLUS_AMD64) + AC_DEFINE(AVMPLUS_64BIT) Copied: branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.c (from r600, branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.c Wed Aug 3 20:53:16 2011 (r604, copy of r600, branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c) @@ -0,0 +1,16 @@ +--- mozilla/media/libvpx/vpx_config_c.c~ ++++ mozilla/media/libvpx/vpx_config_c.c +@@ -12,11 +12,11 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.c" + +-#elif defined(__linux__) && defined(__i386__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) + /* 32 bit Linux. */ + #include "vpx_config_x86-linux-gcc.c" + +-#elif defined(__linux__) && defined(__x86_64__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) + /* 64 bit Linux. */ + #include "vpx_config_x86_64-linux-gcc.c" + Copied: branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.h (from r600, branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.h Wed Aug 3 20:53:16 2011 (r604, copy of r600, branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h) @@ -0,0 +1,16 @@ +--- mozilla/media/libvpx/vpx_config.h~ ++++ mozilla/media/libvpx/vpx_config.h +@@ -12,11 +12,11 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.h" + +-#elif defined(__linux__) && defined(__i386__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) + /* 32 bit Linux. */ + #include "vpx_config_x86-linux-gcc.h" + +-#elif defined(__linux__) && defined(__x86_64__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) + /* 64 bit Linux. */ + #include "vpx_config_x86_64-linux-gcc.h" + Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c Wed Aug 3 20:53:16 2011 (r604) @@ -0,0 +1,43 @@ +--- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 ++++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 +@@ -733,6 +733,32 @@ + #endif + + #if defined(__ppc64__) ++#if defined(__FreeBSD__) ++#include ++#include ++ ++#include ++#include ++ ++unsigned long ++s_mpi_getProcessorLineSize() ++{ ++ static int cacheline_size = 0; ++ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; ++ int clen; ++ ++ if (cacheline_size > 0) ++ return cacheline_size; ++ ++ clen = sizeof(cacheline_size); ++ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), ++ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) ++ return 128; /* guess */ ++ ++ return cacheline_size; ++} ++#else /* __FreeBSD__ */ ++ + /* + * Sigh, The PPC has some really nice features to help us determine cache + * size, since it had lots of direct control functions to do so. The POWER +@@ -786,6 +812,7 @@ + return 0; + } + ++#endif /* __FreeBSD__ */ + #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 + #endif + Copied: branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in (from r593, branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in) @@ -0,0 +1,12 @@ +--- mozilla/toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 ++++ mozilla/toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500 +@@ -181,7 +181,7 @@ + export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS) + $(INSTALL) $^ . + +-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% + + ifdef MOZ_ENABLE_LIBXUL + include $(srcdir)/libxul-rules.mk + Copied: branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in (from r593, branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in) @@ -0,0 +1,76 @@ +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-05-28 15:26:21.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-06-03 18:39:42.769434047 +0200 +@@ -74,6 +74,9 @@ + # NOTE: MODULE_OPTIMIZE_FLAGS must be set before including config.mk + MODULE_OPTIMIZE_FLAGS=-O3 + endif ++ifeq (x86_64,$(OS_TEST)) ++CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp ++endif + endif + endif + +@@ -117,7 +120,7 @@ + endif + endif + # IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s +@@ -129,6 +132,12 @@ + ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) + CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp + endif ++# FreeBSD/amd64 ++# ++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) ++CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp ++endif ++# + # + # Neutrino/Intel (uses the same unixish_x86 code) + # +@@ -184,9 +193,15 @@ + ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s + endif + # ++# FreeBSD/Alpha ++# ++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) ++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp ++endif ++# + # Linux/Alpha + # +-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) ++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp + endif + # +@@ -341,7 +356,7 @@ + # + # Linux/PPC + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) ++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp + ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s + AS := $(CC) -c -x assembler-with-cpp +@@ -419,6 +434,15 @@ + ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s + endif + # ++# FreeBSD/SPARC64 ++# ++ifeq ($(OS_ARCH),FreeBSD) ++ifneq (,$(findstring sparc,$(OS_TEST))) ++CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp ++ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s ++endif ++endif ++# + # OpenBSD/SPARC + # + ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) Deleted: branches/experimental/www/seamonkey/files/patch-sysnss ============================================================================== --- branches/experimental/www/seamonkey/files/patch-sysnss Wed Aug 3 20:53:16 2011 (r588) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,196 +0,0 @@ ---- mozilla/security/manager/Makefile.in.orig 2011-02-09 21:07:24.000000000 +0100 -+++ mozilla/security/manager/Makefile.in 2011-02-15 23:30:11.000000000 +0100 -@@ -49,16 +49,8 @@ - MODULE = psm - - ifndef MOZ_NATIVE_NSS --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) - endif - --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - ifndef NSS_DISABLE_DBM - NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX) - NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk -@@ -68,23 +60,6 @@ - endif - - ifndef MOZ_NATIVE_NSS --ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH))) --SDK_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ -- $(NULL) --else --SDK_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \ -- $(NULL) --endif - endif - - # Default -@@ -339,74 +314,8 @@ - - libs:: - ifndef MOZ_NATIVE_NSS --ifndef NSS_DISABLE_DBM -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/dbm $(DEFAULT_GMAKE_FLAGS) --endif -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) --ifdef ENABLE_TESTS --# Need certutil binary for mochitest certificates generation -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS) -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS) -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/modutil $(DEFAULT_GMAKE_FLAGS) --endif --ifndef SKIP_CHK --ifndef ENABLE_TESTS # Just avoid secondary compile -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) --endif -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin --ifndef NSS_DISABLE_DBM --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin --endif --endif --ifndef MOZ_NATIVE_NSS --# NSS installs headers to dist/public and we want them in dist/include -- $(NSINSTALL) -D $(DIST)/include/nss -- (cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \ -- (cd $(DIST)/include && tar -xf -) - endif -+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ -@@ -419,47 +328,6 @@ - - install:: - ifndef MOZ_NATIVE_NSS -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) --endif - endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -476,10 +344,4 @@ - $(MAKE) -C pki $@ - endif - ifndef MOZ_NATIVE_NSS -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - endif ---- mozilla/security/manager/ssl/src/Makefile.in.orig 2009-08-26 19:05:39.000000000 +0200 -+++ mozilla/security/manager/ssl/src/Makefile.in 2009-08-26 19:06:17.000000000 +0200 -@@ -138,13 +138,14 @@ - - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += $(NSS_CFLAGS) -+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NSS_LIBS) \ -+ $(LOCAL_INCLUDES) \ - $(NULL) - - include $(topsrcdir)/config/rules.mk Deleted: branches/experimental/www/seamonkey/files/patch-xptcall-alpha ============================================================================== --- branches/experimental/www/seamonkey/files/patch-xptcall-alpha Wed Aug 3 20:53:16 2011 (r588) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,459 +0,0 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape 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/NPL/ -+ * -+ * 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 mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * 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 -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape 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/NPL/ -+ * -+ * 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 mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * 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 -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura */ -+ -+#include -+#include -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ 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"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; 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; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ Copied: branches/experimental/www/seamonkey-beta/files/pkg-message.in (from r593, branches/experimental/www/seamonkey/files/pkg-message.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/pkg-message.in Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/pkg-message.in) @@ -0,0 +1,10 @@ +***************************************************************************** +In order to activate the Lightning extension, every user should install the +XPI file into his own profile via the menu: + +Tools -> Add-ons -> Extensions -> Icon left of the search field + -> Install From File + +The XPI file was installed as: +%%PREFIX%%/share/lightning/lightning-seamonkey.xpi +*****************************************************************************