diff --git a/www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff b/www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff index 1ed57475c..b5760909e 100644 --- a/www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff +++ b/www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff @@ -5,6 +5,8 @@ ? mozilla/calendar/sunbird/app/apprunner-beos.rdef ? mozilla/calendar/sunbird/app/apprunner-beos.rsrc ? mozilla/mail/app/apprunner-beos.rdef +? mozilla/nsprpub/pr/src/bthreads/btfile.c +? mozilla/nsprpub/pr/src/bthreads/btio.c ? mozilla/xpfe/bootstrap/apprunner-beos.rdef Index: mozilla/configure.in =================================================================== @@ -12,7 +14,7 @@ RCS file: /cvsroot/mozilla/configure.in,v retrieving revision 1.1503.2.112 diff -u -8 -p -w -r1.1503.2.112 configure.in --- mozilla/configure.in 19 Oct 2008 16:14:06 -0000 1.1503.2.112 -+++ mozilla/configure.in 8 Jul 2009 05:09:53 -0000 ++++ mozilla/configure.in 8 Jul 2009 19:18:42 -0000 @@ -1333,17 +1333,17 @@ if test "$HAVE_64BIT_OS"; then fi AC_LANG_RESTORE @@ -163,7 +165,7 @@ RCS file: /cvsroot/mozilla/browser/app/Makefile.in,v retrieving revision 1.85.2.12 diff -u -8 -p -w -r1.85.2.12 Makefile.in --- mozilla/browser/app/Makefile.in 12 May 2008 18:25:50 -0000 1.85.2.12 -+++ mozilla/browser/app/Makefile.in 8 Jul 2009 05:09:55 -0000 ++++ mozilla/browser/app/Makefile.in 8 Jul 2009 19:18:45 -0000 @@ -59,18 +59,22 @@ endif # hardcode en-US for the moment AB_CD = en-US @@ -234,7 +236,7 @@ RCS file: /cvsroot/mozilla/browser/app/firefox-branding.js,v retrieving revision 1.1.2.2 diff -u -8 -p -w -r1.1.2.2 firefox-branding.js --- mozilla/browser/app/firefox-branding.js 12 Sep 2006 15:50:19 -0000 1.1.2.2 -+++ mozilla/browser/app/firefox-branding.js 8 Jul 2009 05:09:55 -0000 ++++ mozilla/browser/app/firefox-branding.js 8 Jul 2009 19:18:45 -0000 @@ -1,16 +1,15 @@ pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/"); -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/"); @@ -259,8 +261,8 @@ RCS file: /cvsroot/mozilla/browser/base/jar.mn,v retrieving revision 1.95.2.13 diff -u -8 -p -w -r1.95.2.13 jar.mn --- mozilla/browser/base/jar.mn 13 Sep 2006 23:10:10 -0000 1.95.2.13 -+++ mozilla/browser/base/jar.mn 8 Jul 2009 05:09:56 -0000 -@@ -11,16 +11,18 @@ browser.jar: ++++ mozilla/browser/base/jar.mn 8 Jul 2009 19:18:46 -0000 +@@ -11,16 +11,22 @@ browser.jar: % overlay chrome://global/content/viewPartialSource.xul chrome://browser/content/viewSourceOverlay.xul * content/browser/aboutDialog.xul (content/aboutDialog.xul) * content/browser/aboutDialog.js (content/aboutDialog.js) @@ -269,8 +271,12 @@ diff -u -8 -p -w -r1.95.2.13 jar.mn * content/browser/browser.js (content/browser.js) * content/browser/browser.xul (content/browser.xul) * content/browser/credits.xhtml (content/credits.xhtml) -+* content/browser/dynamic-welcome-version1.html (content/dynamic-welcome-version1.html) -+* content/browser/dynamic-welcome-version2.html (content/dynamic-welcome-version2.html) ++* content/browser/dynamic-welcome-v1.html (content/dynamic-welcome-v1.html) ++* content/browser/dynamic-welcome-v2.html (content/dynamic-welcome-v2.html) ++* content/browser/dynamic-bebook-v1.html (content/dynamic-bebook-v1.html) ++* content/browser/dynamic-bebook-v2.html (content/dynamic-bebook-v2.html) ++* content/browser/dynamic-userguide-v1.html (content/dynamic-userguide-v1.html) ++* content/browser/dynamic-userguide-v2.html (content/dynamic-userguide-v2.html) * content/browser/EULA.js (content/EULA.js) * content/browser/EULA.xhtml (content/EULA.xhtml) * content/browser/EULA.xul (content/EULA.xul) @@ -285,18 +291,18 @@ RCS file: /cvsroot/mozilla/browser/base/content/browserconfig.properties,v retrieving revision 1.4.4.1 diff -u -8 -p -w -r1.4.4.1 browserconfig.properties --- mozilla/browser/base/content/browserconfig.properties 17 Mar 2006 04:17:56 -0000 1.4.4.1 -+++ mozilla/browser/base/content/browserconfig.properties 8 Jul 2009 05:09:56 -0000 ++++ mozilla/browser/base/content/browserconfig.properties 8 Jul 2009 19:18:46 -0000 @@ -1,2 +1,2 @@ # Do NOT localize or otherwise change these values -browser.startup.homepage=http://www.mozilla.org/projects/bonecho/ -+browser.startup.homepage=chrome://browser/content/dynamic-welcome-version1.html ++browser.startup.homepage=chrome://browser/content/dynamic-welcome-v1.html Index: mozilla/browser/components/migration/src/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/browser/components/migration/src/Makefile.in,v retrieving revision 1.20.2.2 diff -u -8 -p -w -r1.20.2.2 Makefile.in --- mozilla/browser/components/migration/src/Makefile.in 27 Jan 2006 02:19:00 -0000 1.20.2.2 -+++ mozilla/browser/components/migration/src/Makefile.in 8 Jul 2009 05:09:57 -0000 ++++ mozilla/browser/components/migration/src/Makefile.in 8 Jul 2009 19:18:47 -0000 @@ -73,20 +73,23 @@ endif CPPSRCS = nsProfileMigrator.cpp \ @@ -328,7 +334,7 @@ RCS file: /cvsroot/mozilla/browser/installer/Makefile.in,v retrieving revision 1.19.4.4 diff -u -8 -p -w -r1.19.4.4 Makefile.in --- mozilla/browser/installer/Makefile.in 6 Jun 2006 15:35:00 -0000 1.19.4.4 -+++ mozilla/browser/installer/Makefile.in 8 Jul 2009 05:09:58 -0000 ++++ mozilla/browser/installer/Makefile.in 8 Jul 2009 19:18:50 -0000 @@ -57,19 +57,23 @@ include $(topsrcdir)/config/rules.mk MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in @@ -353,13 +359,65 @@ diff -u -8 -p -w -r1.19.4.4 Makefile.in xpcom \ browser \ $(NULL) +Index: mozilla/browser/locales/en-US/profile/bookmarks.html +=================================================================== +RCS file: /cvsroot/mozilla/browser/locales/en-US/profile/bookmarks.html,v +retrieving revision 1.4.8.13 +diff -u -8 -p -w -r1.4.8.13 bookmarks.html +--- mozilla/browser/locales/en-US/profile/bookmarks.html 19 Aug 2006 06:04:11 -0000 1.4.8.13 ++++ mozilla/browser/locales/en-US/profile/bookmarks.html 8 Jul 2009 19:18:51 -0000 +@@ -7,20 +7,37 @@ +
+
+-
+
+-
++
++
++
++
Index: mozilla/build/autoconf/config.guess
===================================================================
RCS file: /cvsroot/mozilla/build/autoconf/config.guess,v
retrieving revision 1.19
diff -u -8 -p -w -r1.19 config.guess
--- mozilla/build/autoconf/config.guess 18 Apr 2003 10:20:15 -0000 1.19
-+++ mozilla/build/autoconf/config.guess 8 Jul 2009 05:10:03 -0000
++++ mozilla/build/autoconf/config.guess 8 Jul 2009 19:18:57 -0000
@@ -1,34 +1,37 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -1926,7 +1984,7 @@ RCS file: /cvsroot/mozilla/build/autoconf/config.sub,v
retrieving revision 1.20
diff -u -8 -p -w -r1.20 config.sub
--- mozilla/build/autoconf/config.sub 18 Apr 2003 10:20:15 -0000 1.20
-+++ mozilla/build/autoconf/config.sub 8 Jul 2009 05:10:05 -0000
++++ mozilla/build/autoconf/config.sub 8 Jul 2009 19:18:59 -0000
@@ -1,14 +1,15 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -3065,7 +3123,7 @@ RCS file: /cvsroot/mozilla/calendar/base/content/preferences/preferences.xul,v
retrieving revision 1.1.2.6
diff -u -8 -p -w -r1.1.2.6 preferences.xul
--- mozilla/calendar/base/content/preferences/preferences.xul 14 Mar 2007 09:08:19 -0000 1.1.2.6
-+++ mozilla/calendar/base/content/preferences/preferences.xul 8 Jul 2009 05:10:07 -0000
++++ mozilla/calendar/base/content/preferences/preferences.xul 8 Jul 2009 19:19:01 -0000
@@ -66,17 +66,22 @@
#ifdef XP_UNIX
#ifdef XP_MACOSX
@@ -3095,7 +3153,7 @@ RCS file: /cvsroot/mozilla/calendar/libical/src/libical/Makefile.in,v
retrieving revision 1.3.6.1
diff -u -8 -p -w -r1.3.6.1 Makefile.in
--- mozilla/calendar/libical/src/libical/Makefile.in 27 Dec 2007 10:03:57 -0000 1.3.6.1
-+++ mozilla/calendar/libical/src/libical/Makefile.in 8 Jul 2009 05:10:08 -0000
++++ mozilla/calendar/libical/src/libical/Makefile.in 8 Jul 2009 19:19:03 -0000
@@ -84,17 +84,17 @@ CSRCS = \
$(NULL)
@@ -3121,7 +3179,7 @@ RCS file: /cvsroot/mozilla/calendar/sunbird/app/Makefile.in,v
retrieving revision 1.21.2.23
diff -u -8 -p -w -r1.21.2.23 Makefile.in
--- mozilla/calendar/sunbird/app/Makefile.in 4 May 2008 01:32:07 -0000 1.21.2.23
-+++ mozilla/calendar/sunbird/app/Makefile.in 8 Jul 2009 05:10:16 -0000
++++ mozilla/calendar/sunbird/app/Makefile.in 8 Jul 2009 19:19:08 -0000
@@ -79,18 +79,22 @@ include $(topsrcdir)/config/rules.mk
else
# Build a binary bootstrapping with XRE_main
@@ -3193,7 +3251,7 @@ RCS file: /cvsroot/mozilla/config/config.mk,v
retrieving revision 3.337.2.12
diff -u -8 -p -w -r3.337.2.12 config.mk
--- mozilla/config/config.mk 23 Nov 2007 21:12:26 -0000 3.337.2.12
-+++ mozilla/config/config.mk 8 Jul 2009 05:10:33 -0000
++++ mozilla/config/config.mk 8 Jul 2009 19:19:19 -0000
@@ -105,19 +105,16 @@ AUTOCONF_TOOLS = $(topsrcdir)/build/auto
ifeq ($(OS_ARCH),QNX)
@@ -3220,7 +3278,7 @@ RCS file: /cvsroot/mozilla/config/rules.mk,v
retrieving revision 3.487.2.9
diff -u -8 -p -w -r3.487.2.9 rules.mk
--- mozilla/config/rules.mk 18 Dec 2007 21:33:08 -0000 3.487.2.9
-+++ mozilla/config/rules.mk 8 Jul 2009 05:10:37 -0000
++++ mozilla/config/rules.mk 8 Jul 2009 19:19:23 -0000
@@ -161,17 +161,17 @@ SHARED_LIBRARY := $(NULL)
DEF_FILE := $(NULL)
IMPORT_LIBRARY := $(NULL)
@@ -3312,7 +3370,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/build.mk,v
retrieving revision 5.0.2.15.4.1
diff -u -8 -p -w -r5.0.2.15.4.1 build.mk
--- mozilla/directory/c-sdk/build.mk 3 Feb 2006 14:44:29 -0000 5.0.2.15.4.1
-+++ mozilla/directory/c-sdk/build.mk 8 Jul 2009 05:10:45 -0000
++++ mozilla/directory/c-sdk/build.mk 8 Jul 2009 19:19:32 -0000
@@ -437,17 +437,17 @@ endif #!os2
ifeq ($(OS_ARCH), OSF1)
@@ -3338,7 +3396,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/configure.in,v
retrieving revision 5.0.2.34.4.3
diff -u -8 -p -w -r5.0.2.34.4.3 configure.in
--- mozilla/directory/c-sdk/configure.in 11 Jul 2007 20:43:19 -0000 5.0.2.34.4.3
-+++ mozilla/directory/c-sdk/configure.in 8 Jul 2009 05:10:50 -0000
++++ mozilla/directory/c-sdk/configure.in 8 Jul 2009 19:19:39 -0000
@@ -355,17 +355,17 @@ fi
if test -z "$SKIP_PATH_CHECKS"; then
AC_PATH_PROG(WHOAMI, $WHOAMI whoami, echo not_whoami)
@@ -3459,7 +3517,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/config/autoconf/config.guess,v
retrieving revision 5.0.2.2
diff -u -8 -p -w -r5.0.2.2 config.guess
--- mozilla/directory/c-sdk/config/autoconf/config.guess 18 Apr 2003 10:20:22 -0000 5.0.2.2
-+++ mozilla/directory/c-sdk/config/autoconf/config.guess 8 Jul 2009 05:10:53 -0000
++++ mozilla/directory/c-sdk/config/autoconf/config.guess 8 Jul 2009 19:19:43 -0000
@@ -1,34 +1,37 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -5026,7 +5084,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/config/autoconf/config.sub,v
retrieving revision 5.0.2.3
diff -u -8 -p -w -r5.0.2.3 config.sub
--- mozilla/directory/c-sdk/config/autoconf/config.sub 18 Apr 2003 10:20:22 -0000 5.0.2.3
-+++ mozilla/directory/c-sdk/config/autoconf/config.sub 8 Jul 2009 05:10:55 -0000
++++ mozilla/directory/c-sdk/config/autoconf/config.sub 8 Jul 2009 19:19:46 -0000
@@ -1,14 +1,15 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -6165,7 +6223,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in,v
retrieving revision 5.0.2.21.4.1
diff -u -8 -p -w -r5.0.2.21.4.1 Makefile.in
--- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 3 Feb 2006 14:44:42 -0000 5.0.2.21.4.1
-+++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 8 Jul 2009 05:10:56 -0000
++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 8 Jul 2009 19:19:48 -0000
@@ -232,17 +232,17 @@ ifeq ($(OS_ARCH), Darwin)
EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
endif
@@ -6230,7 +6288,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in,
retrieving revision 5.0.2.18.4.1
diff -u -8 -p -w -r5.0.2.18.4.1 Makefile.in
--- mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in 3 Feb 2006 14:44:49 -0000 5.0.2.18.4.1
-+++ mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in 8 Jul 2009 05:10:57 -0000
++++ mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in 8 Jul 2009 19:19:49 -0000
@@ -160,17 +160,18 @@ EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_L
EXTRA_LIBS += -L$(dist_libdir) $(DYNAMICNSPR)
endif
@@ -6272,7 +6330,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libssldap/Attic/Makefi
retrieving revision 5.0.2.8
diff -u -8 -p -w -r5.0.2.8 Makefile
--- mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile 25 Aug 2004 23:02:30 -0000 5.0.2.8
-+++ mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile 8 Jul 2009 05:10:57 -0000
++++ mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile 8 Jul 2009 19:19:50 -0000
@@ -162,17 +162,17 @@ EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_L
ifeq ($(NSS_DYNAMIC_SOFTOKN),1)
EXTRA_LIBS += -l$(SOFTOKN_LIBNAME)
@@ -6298,7 +6356,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in,
retrieving revision 5.0.2.9.4.1
diff -u -8 -p -w -r5.0.2.9.4.1 Makefile.in
--- mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in 3 Feb 2006 14:44:49 -0000 5.0.2.9.4.1
-+++ mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in 8 Jul 2009 05:10:58 -0000
++++ mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in 8 Jul 2009 19:19:51 -0000
@@ -177,17 +177,17 @@ EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_L
ifeq ($(NSS_DYNAMIC_SOFTOKN),1)
EXTRA_LIBS += -l$(SOFTOKN_LIBNAME)
@@ -6324,7 +6382,7 @@ RCS file: /cvsroot/mozilla/embedding/componentlib/Makefile.in,v
retrieving revision 1.3
diff -u -8 -p -w -r1.3 Makefile.in
--- mozilla/embedding/componentlib/Makefile.in 18 Apr 2004 22:00:41 -0000 1.3
-+++ mozilla/embedding/componentlib/Makefile.in 8 Jul 2009 05:11:08 -0000
++++ mozilla/embedding/componentlib/Makefile.in 8 Jul 2009 19:20:02 -0000
@@ -147,17 +147,17 @@ OS_LIBS := -lstdc++ $(OS_LIBS)
SHLIB_LDENDFILE = -lgcc
@@ -6350,7 +6408,7 @@ RCS file: /cvsroot/mozilla/gfx/src/beos/nsFontMetricsBeOS.cpp,v
retrieving revision 1.40.12.5
diff -u -8 -p -w -r1.40.12.5 nsFontMetricsBeOS.cpp
--- mozilla/gfx/src/beos/nsFontMetricsBeOS.cpp 27 Sep 2007 21:36:00 -0000 1.40.12.5
-+++ mozilla/gfx/src/beos/nsFontMetricsBeOS.cpp 8 Jul 2009 05:11:30 -0000
++++ mozilla/gfx/src/beos/nsFontMetricsBeOS.cpp 8 Jul 2009 19:20:25 -0000
@@ -123,22 +123,22 @@ NS_IMETHODIMP nsFontMetricsBeOS::Init(co
nsString *fam = param.family.StringAt(i);
PRBool isgeneric = ( param.isgeneric[i] ) ? PR_TRUE: PR_FALSE;
@@ -6425,7 +6483,7 @@ RCS file: /cvsroot/mozilla/gfx/src/beos/nsRenderingContextBeOS.cpp,v
retrieving revision 1.51.12.8
diff -u -8 -p -w -r1.51.12.8 nsRenderingContextBeOS.cpp
--- mozilla/gfx/src/beos/nsRenderingContextBeOS.cpp 18 Dec 2007 07:17:21 -0000 1.51.12.8
-+++ mozilla/gfx/src/beos/nsRenderingContextBeOS.cpp 8 Jul 2009 05:11:33 -0000
++++ mozilla/gfx/src/beos/nsRenderingContextBeOS.cpp 8 Jul 2009 19:20:28 -0000
@@ -346,18 +346,21 @@ bool nsRenderingContextBeOS::LockAndUpda
// Intelligent lock
@@ -6494,7 +6552,7 @@ RCS file: /cvsroot/mozilla/intl/uconv/src/Makefile.in,v
retrieving revision 1.82.4.2
diff -u -8 -p -w -r1.82.4.2 Makefile.in
--- mozilla/intl/uconv/src/Makefile.in 29 Jan 2006 16:51:01 -0000 1.82.4.2
-+++ mozilla/intl/uconv/src/Makefile.in 8 Jul 2009 05:11:38 -0000
++++ mozilla/intl/uconv/src/Makefile.in 8 Jul 2009 19:20:32 -0000
@@ -114,17 +114,17 @@ else
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
CPPSRCS += nsWinCharset.cpp
@@ -6520,7 +6578,7 @@ RCS file: /cvsroot/mozilla/ipc/ipcd/client/src/Makefile.in,v
retrieving revision 1.7
diff -u -8 -p -w -r1.7 Makefile.in
--- mozilla/ipc/ipcd/client/src/Makefile.in 9 Dec 2004 19:28:19 -0000 1.7
-+++ mozilla/ipc/ipcd/client/src/Makefile.in 8 Jul 2009 05:11:42 -0000
++++ mozilla/ipc/ipcd/client/src/Makefile.in 8 Jul 2009 19:20:36 -0000
@@ -59,17 +59,18 @@ CPPSRCS = \
ipcdclient.cpp \
ipcService.cpp \
@@ -6547,7 +6605,7 @@ RCS file: /cvsroot/mozilla/ipc/ipcd/daemon/src/Makefile.in,v
retrieving revision 1.3
diff -u -8 -p -w -r1.3 Makefile.in
--- mozilla/ipc/ipcd/daemon/src/Makefile.in 28 Jan 2004 21:31:46 -0000 1.3
-+++ mozilla/ipc/ipcd/daemon/src/Makefile.in 8 Jul 2009 05:11:42 -0000
++++ mozilla/ipc/ipcd/daemon/src/Makefile.in 8 Jul 2009 19:20:37 -0000
@@ -54,17 +54,18 @@ CPPSRCS = \
ipcd.cpp \
ipcClient.cpp \
@@ -6574,7 +6632,7 @@ RCS file: /cvsroot/mozilla/js/src/Makefile.in,v
retrieving revision 3.95.4.5
diff -u -8 -p -w -r3.95.4.5 Makefile.in
--- mozilla/js/src/Makefile.in 27 Jul 2006 22:56:20 -0000 3.95.4.5
-+++ mozilla/js/src/Makefile.in 8 Jul 2009 05:11:44 -0000
++++ mozilla/js/src/Makefile.in 8 Jul 2009 19:20:39 -0000
@@ -241,17 +241,17 @@ ifneq ($(findstring -L,$(NSPR_LIBS)),)
NSPR_STATIC_PATH = $(subst -L,,$(findstring -L,$(NSPR_LIBS)))
else
@@ -6600,7 +6658,7 @@ RCS file: /cvsroot/mozilla/mail/app/Makefile.in,v
retrieving revision 1.46.2.10
diff -u -8 -p -w -r1.46.2.10 Makefile.in
--- mozilla/mail/app/Makefile.in 22 Oct 2008 21:04:53 -0000 1.46.2.10
-+++ mozilla/mail/app/Makefile.in 8 Jul 2009 05:12:04 -0000
++++ mozilla/mail/app/Makefile.in 8 Jul 2009 19:20:58 -0000
@@ -57,18 +57,22 @@ PREF_JS_EXPORTS = \
ifndef MOZ_BRANDING_DIRECTORY
@@ -6671,7 +6729,7 @@ RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/Makefile.in,v
retrieving revision 1.13.18.2
diff -u -8 -p -w -r1.13.18.2 Makefile.in
--- mozilla/modules/libpr0n/decoders/Makefile.in 17 Feb 2006 19:03:47 -0000 1.13.18.2
-+++ mozilla/modules/libpr0n/decoders/Makefile.in 8 Jul 2009 05:12:21 -0000
++++ mozilla/modules/libpr0n/decoders/Makefile.in 8 Jul 2009 19:21:16 -0000
@@ -47,17 +47,17 @@ ifdef MOZ_ENABLE_GNOMEUI
TOOL_DIRS = icon/gtk icon
endif
@@ -6697,7 +6755,7 @@ RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/icon/Makefile.in,v
retrieving revision 1.17.8.6
diff -u -8 -p -w -r1.17.8.6 Makefile.in
--- mozilla/modules/libpr0n/decoders/icon/Makefile.in 30 May 2006 15:46:21 -0000 1.17.8.6
-+++ mozilla/modules/libpr0n/decoders/icon/Makefile.in 8 Jul 2009 05:12:22 -0000
++++ mozilla/modules/libpr0n/decoders/icon/Makefile.in 8 Jul 2009 19:21:16 -0000
@@ -77,17 +77,17 @@ endif
ifeq ($(OS_ARCH),OS2)
PLATFORM = os2
@@ -6742,7 +6800,7 @@ RCS file: /cvsroot/mozilla/modules/libreg/src/Makefile.in,v
retrieving revision 1.39
diff -u -8 -p -w -r1.39 Makefile.in
--- mozilla/modules/libreg/src/Makefile.in 18 Apr 2004 22:00:45 -0000 1.39
-+++ mozilla/modules/libreg/src/Makefile.in 8 Jul 2009 05:12:23 -0000
++++ mozilla/modules/libreg/src/Makefile.in 8 Jul 2009 19:21:17 -0000
@@ -61,17 +61,17 @@ FORCE_STATIC_LIB = 1
# Force use of PIC
@@ -6768,7 +6826,7 @@ RCS file: /cvsroot/mozilla/modules/plugin/base/src/Makefile.in,v
retrieving revision 1.104
diff -u -8 -p -w -r1.104 Makefile.in
--- mozilla/modules/plugin/base/src/Makefile.in 8 Jun 2005 16:48:43 -0000 1.104
-+++ mozilla/modules/plugin/base/src/Makefile.in 8 Jul 2009 05:12:28 -0000
++++ mozilla/modules/plugin/base/src/Makefile.in 8 Jul 2009 19:21:24 -0000
@@ -91,17 +91,17 @@ CPPSRCS = \
ns4xPluginInstance.cpp \
nsPluginHostImpl.cpp \
@@ -6794,7 +6852,7 @@ RCS file: /cvsroot/mozilla/nsprpub/configure.in,v
retrieving revision 1.199.2.17
diff -u -8 -p -w -r1.199.2.17 configure.in
--- mozilla/nsprpub/configure.in 31 Oct 2007 18:07:38 -0000 1.199.2.17
-+++ mozilla/nsprpub/configure.in 8 Jul 2009 05:12:38 -0000
++++ mozilla/nsprpub/configure.in 8 Jul 2009 19:21:35 -0000
@@ -358,17 +358,17 @@ if test -z "$SKIP_PATH_CHECKS"; then
AC_PATH_PROG(WHOAMI, $WHOAMI whoami, echo not_whoami)
fi
@@ -6933,7 +6991,7 @@ RCS file: /cvsroot/mozilla/nsprpub/build/autoconf/config.guess,v
retrieving revision 1.15
diff -u -8 -p -w -r1.15 config.guess
--- mozilla/nsprpub/build/autoconf/config.guess 18 Apr 2003 19:20:18 -0000 1.15
-+++ mozilla/nsprpub/build/autoconf/config.guess 8 Jul 2009 05:12:41 -0000
++++ mozilla/nsprpub/build/autoconf/config.guess 8 Jul 2009 19:21:38 -0000
@@ -1,34 +1,37 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -8500,7 +8558,7 @@ RCS file: /cvsroot/mozilla/nsprpub/build/autoconf/config.sub,v
retrieving revision 1.16
diff -u -8 -p -w -r1.16 config.sub
--- mozilla/nsprpub/build/autoconf/config.sub 18 Apr 2003 19:20:18 -0000 1.16
-+++ mozilla/nsprpub/build/autoconf/config.sub 8 Jul 2009 05:12:43 -0000
++++ mozilla/nsprpub/build/autoconf/config.sub 8 Jul 2009 19:21:40 -0000
@@ -1,14 +1,15 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -9639,7 +9697,7 @@ RCS file: /cvsroot/mozilla/nsprpub/lib/ds/Makefile.in,v
retrieving revision 1.35.2.1
diff -u -8 -p -w -r1.35.2.1 Makefile.in
--- mozilla/nsprpub/lib/ds/Makefile.in 19 Oct 2006 00:39:28 -0000 1.35.2.1
-+++ mozilla/nsprpub/lib/ds/Makefile.in 8 Jul 2009 05:12:44 -0000
++++ mozilla/nsprpub/lib/ds/Makefile.in 8 Jul 2009 19:21:40 -0000
@@ -180,18 +180,22 @@ endif
export:: $(TARGETS)
$(INSTALL) -m 444 $(HEADERS) $(dist_includedir)
@@ -9669,7 +9727,7 @@ RCS file: /cvsroot/mozilla/nsprpub/lib/libc/src/Makefile.in,v
retrieving revision 1.31.2.1
diff -u -8 -p -w -r1.31.2.1 Makefile.in
--- mozilla/nsprpub/lib/libc/src/Makefile.in 19 Oct 2006 00:39:28 -0000 1.31.2.1
-+++ mozilla/nsprpub/lib/libc/src/Makefile.in 8 Jul 2009 05:12:44 -0000
++++ mozilla/nsprpub/lib/libc/src/Makefile.in 8 Jul 2009 19:21:41 -0000
@@ -182,16 +182,20 @@ endif
export:: $(TARGETS)
@@ -9697,7 +9755,7 @@ RCS file: /cvsroot/mozilla/nsprpub/lib/prstreams/Makefile.in,v
retrieving revision 1.21.2.1
diff -u -8 -p -w -r1.21.2.1 Makefile.in
--- mozilla/nsprpub/lib/prstreams/Makefile.in 19 Oct 2006 00:39:28 -0000 1.21.2.1
-+++ mozilla/nsprpub/lib/prstreams/Makefile.in 8 Jul 2009 05:12:45 -0000
++++ mozilla/nsprpub/lib/prstreams/Makefile.in 8 Jul 2009 19:21:41 -0000
@@ -64,17 +64,17 @@ ifeq ($(OS_ARCH),SunOS)
endif
@@ -9742,7 +9800,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/include/prio.h,v
retrieving revision 3.40
diff -u -8 -p -w -r3.40 prio.h
--- mozilla/nsprpub/pr/include/prio.h 25 Apr 2004 15:00:47 -0000 3.40
-+++ mozilla/nsprpub/pr/include/prio.h 8 Jul 2009 05:12:49 -0000
++++ mozilla/nsprpub/pr/include/prio.h 8 Jul 2009 19:21:46 -0000
@@ -169,38 +169,41 @@ struct PRIPv6Addr {
#define pr_s6_addr32 _S6_un._S6_u32
#define pr_s6_addr64 _S6_un._S6_u64
@@ -9797,7 +9855,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/include/prtypes.h,v
retrieving revision 3.30.2.2
diff -u -8 -p -w -r3.30.2.2 prtypes.h
--- mozilla/nsprpub/pr/include/prtypes.h 5 Apr 2006 21:51:21 -0000 3.30.2.2
-+++ mozilla/nsprpub/pr/include/prtypes.h 8 Jul 2009 05:12:51 -0000
++++ mozilla/nsprpub/pr/include/prtypes.h 8 Jul 2009 19:21:48 -0000
@@ -93,29 +93,48 @@
#define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
@@ -9853,7 +9911,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_beos.cfg,v
retrieving revision 3.5.214.1
diff -u -8 -p -w -r3.5.214.1 _beos.cfg
--- mozilla/nsprpub/pr/include/md/_beos.cfg 5 Apr 2006 22:00:45 -0000 3.5.214.1
-+++ mozilla/nsprpub/pr/include/md/_beos.cfg 8 Jul 2009 05:12:51 -0000
++++ mozilla/nsprpub/pr/include/md/_beos.cfg 8 Jul 2009 19:21:48 -0000
@@ -15,16 +15,17 @@
* The Original Code is the Netscape Portable Runtime (NSPR).
*
@@ -9918,7 +9976,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_beos.h,v
retrieving revision 3.23
diff -u -8 -p -w -r3.23 _beos.h
--- mozilla/nsprpub/pr/include/md/_beos.h 17 Jan 2005 22:00:53 -0000 3.23
-+++ mozilla/nsprpub/pr/include/md/_beos.h 8 Jul 2009 05:12:52 -0000
++++ mozilla/nsprpub/pr/include/md/_beos.h 8 Jul 2009 19:21:48 -0000
@@ -15,16 +15,17 @@
* The Original Code is the Netscape Portable Runtime (NSPR).
*
@@ -10562,7 +10620,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/include/private/primpl.h,v
retrieving revision 3.84.2.2
diff -u -8 -p -w -r3.84.2.2 primpl.h
--- mozilla/nsprpub/pr/include/private/primpl.h 25 Jul 2007 07:08:28 -0000 3.84.2.2
-+++ mozilla/nsprpub/pr/include/private/primpl.h 8 Jul 2009 05:12:56 -0000
++++ mozilla/nsprpub/pr/include/private/primpl.h 8 Jul 2009 19:21:53 -0000
@@ -45,20 +45,16 @@
* This macro causes chaos if signal.h gets included before pthread.h.
* To be safe, we include pthread.h first.
@@ -10773,7 +10831,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/Makefile.in,v
retrieving revision 1.40.2.2
diff -u -8 -p -w -r1.40.2.2 Makefile.in
--- mozilla/nsprpub/pr/src/Makefile.in 19 Oct 2006 00:39:28 -0000 1.40.2.2
-+++ mozilla/nsprpub/pr/src/Makefile.in 8 Jul 2009 05:12:57 -0000
++++ mozilla/nsprpub/pr/src/Makefile.in 8 Jul 2009 19:21:54 -0000
@@ -270,36 +270,33 @@ endif
ifdef USE_PTHREADS
@@ -10843,7 +10901,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/bthreads/bsrcs.mk,v
retrieving revision 3.6
diff -u -8 -p -w -r3.6 bsrcs.mk
--- mozilla/nsprpub/pr/src/bthreads/bsrcs.mk 25 Apr 2004 15:00:57 -0000 3.6
-+++ mozilla/nsprpub/pr/src/bthreads/bsrcs.mk 8 Jul 2009 05:12:57 -0000
++++ mozilla/nsprpub/pr/src/bthreads/bsrcs.mk 8 Jul 2009 19:21:54 -0000
@@ -15,16 +15,17 @@
# The Original Code is the Netscape Portable Runtime (NSPR).
#
@@ -10880,7 +10938,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/bthreads/btcvar.c,v
retrieving revision 3.9
diff -u -8 -p -w -r3.9 btcvar.c
--- mozilla/nsprpub/pr/src/bthreads/btcvar.c 23 Feb 2005 17:43:13 -0000 3.9
-+++ mozilla/nsprpub/pr/src/bthreads/btcvar.c 8 Jul 2009 05:12:58 -0000
++++ mozilla/nsprpub/pr/src/bthreads/btcvar.c 8 Jul 2009 19:21:54 -0000
@@ -15,33 +15,32 @@
* The Original Code is the Netscape Portable Runtime (NSPR).
*
@@ -14518,7 +14576,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/bthreads/btlocks.c,v
retrieving revision 3.7
diff -u -8 -p -w -r3.7 btlocks.c
--- mozilla/nsprpub/pr/src/bthreads/btlocks.c 23 Feb 2005 17:43:13 -0000 3.7
-+++ mozilla/nsprpub/pr/src/bthreads/btlocks.c 8 Jul 2009 05:12:58 -0000
++++ mozilla/nsprpub/pr/src/bthreads/btlocks.c 8 Jul 2009 19:21:55 -0000
@@ -38,44 +38,38 @@
/*
** File: btlocks.c
@@ -14613,7 +14671,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/bthreads/btmisc.c,v
retrieving revision 3.5
diff -u -8 -p -w -r3.5 btmisc.c
--- mozilla/nsprpub/pr/src/bthreads/btmisc.c 25 Apr 2004 15:00:57 -0000 3.5
-+++ mozilla/nsprpub/pr/src/bthreads/btmisc.c 8 Jul 2009 05:12:58 -0000
++++ mozilla/nsprpub/pr/src/bthreads/btmisc.c 8 Jul 2009 19:21:55 -0000
@@ -15,16 +15,17 @@
* The Original Code is the Netscape Portable Runtime (NSPR).
*
@@ -14717,7 +14775,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/bthreads/btsem.c,v
retrieving revision 3.7
diff -u -8 -p -w -r3.7 btsem.c
--- mozilla/nsprpub/pr/src/bthreads/btsem.c 23 Feb 2005 17:43:13 -0000 3.7
-+++ mozilla/nsprpub/pr/src/bthreads/btsem.c 8 Jul 2009 05:12:58 -0000
++++ mozilla/nsprpub/pr/src/bthreads/btsem.c 8 Jul 2009 19:21:55 -0000
@@ -33,16 +33,17 @@
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
@@ -14742,7 +14800,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/bthreads/btthread.c,v
retrieving revision 3.8
diff -u -8 -p -w -r3.8 btthread.c
--- mozilla/nsprpub/pr/src/bthreads/btthread.c 25 Apr 2004 15:00:57 -0000 3.8
-+++ mozilla/nsprpub/pr/src/bthreads/btthread.c 8 Jul 2009 05:12:59 -0000
++++ mozilla/nsprpub/pr/src/bthreads/btthread.c 8 Jul 2009 19:21:56 -0000
@@ -115,22 +115,19 @@ _PR_InitThreads (PRThreadType type, PRTh
primordialThread->md.joinSem = B_ERROR;
@@ -14909,7 +14967,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/io/Makefile.in,v
retrieving revision 1.13
diff -u -8 -p -w -r1.13 Makefile.in
--- mozilla/nsprpub/pr/src/io/Makefile.in 25 Apr 2004 15:00:58 -0000 1.13
-+++ mozilla/nsprpub/pr/src/io/Makefile.in 8 Jul 2009 05:13:00 -0000
++++ mozilla/nsprpub/pr/src/io/Makefile.in 8 Jul 2009 19:21:56 -0000
@@ -64,23 +64,25 @@ CSRCS = \
prmmap.c \
prpolevt.c \
@@ -14942,7 +15000,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/io/prmapopt.c,v
retrieving revision 3.18
diff -u -8 -p -w -r3.18 prmapopt.c
--- mozilla/nsprpub/pr/src/io/prmapopt.c 25 Apr 2004 15:00:58 -0000 3.18
-+++ mozilla/nsprpub/pr/src/io/prmapopt.c 8 Jul 2009 05:13:01 -0000
++++ mozilla/nsprpub/pr/src/io/prmapopt.c 8 Jul 2009 19:21:57 -0000
@@ -69,17 +69,17 @@
/* NEXTSTEP is special: this must come before netinet/tcp.h. */
#include
+-
+-
+-
+-
+-
+-
+-
++
+-
+-
++
++ Bookmarks
+
+ Personal Toolbar Folder
+- Mozilla Project
+- mozilla.org
+- Community & Support
++
++ Bookmarks Toolbar Folder
++Search the Web
++
++ BeZilla Browser
+ Haiku Bookmarks
++
++
+-
Index: mozilla/security/coreconf/BeOS.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/BeOS.mk,v
retrieving revision 1.2
diff -u -8 -p -w -r1.2 BeOS.mk
--- mozilla/security/coreconf/BeOS.mk 25 Apr 2004 15:02:17 -0000 1.2
-+++ mozilla/security/coreconf/BeOS.mk 8 Jul 2009 05:13:23 -0000
++++ mozilla/security/coreconf/BeOS.mk 8 Jul 2009 19:22:16 -0000
@@ -56,17 +56,17 @@ ifeq ($(OS_TEST),ppc)
CPU_ARCH = ppc
else
@@ -15906,7 +16040,7 @@ RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v
retrieving revision 1.19.2.1
diff -u -8 -p -w -r1.19.2.1 arch.mk
--- mozilla/security/coreconf/arch.mk 14 Nov 2007 22:47:33 -0000 1.19.2.1
-+++ mozilla/security/coreconf/arch.mk 8 Jul 2009 05:13:25 -0000
++++ mozilla/security/coreconf/arch.mk 8 Jul 2009 19:22:17 -0000
@@ -57,16 +57,17 @@
ifeq ($(USE_64), 1)
64BIT_TAG=_64
@@ -15931,7 +16065,7 @@ RCS file: /cvsroot/mozilla/security/coreconf/config.mk,v
retrieving revision 1.17.28.3
diff -u -8 -p -w -r1.17.28.3 config.mk
--- mozilla/security/coreconf/config.mk 4 May 2007 06:54:05 -0000 1.17.28.3
-+++ mozilla/security/coreconf/config.mk 8 Jul 2009 05:13:25 -0000
++++ mozilla/security/coreconf/config.mk 8 Jul 2009 19:22:18 -0000
@@ -32,16 +32,17 @@
# 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
@@ -15987,7 +16121,7 @@ RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
retrieving revision 1.57.4.6
diff -u -8 -p -w -r1.57.4.6 Makefile.in
--- mozilla/security/manager/Makefile.in 23 May 2008 23:45:26 -0000 1.57.4.6
-+++ mozilla/security/manager/Makefile.in 8 Jul 2009 05:13:27 -0000
++++ mozilla/security/manager/Makefile.in 8 Jul 2009 19:22:19 -0000
@@ -257,30 +257,45 @@ ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) clean
# In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h.
@@ -16040,7 +16174,7 @@ RCS file: /cvsroot/mozilla/security/nss/cmd/lib/secutil.h,v
retrieving revision 1.18.24.1
diff -u -8 -p -w -r1.18.24.1 secutil.h
--- mozilla/security/nss/cmd/lib/secutil.h 19 Jul 2006 00:25:03 -0000 1.18.24.1
-+++ mozilla/security/nss/cmd/lib/secutil.h 8 Jul 2009 05:13:33 -0000
++++ mozilla/security/nss/cmd/lib/secutil.h 8 Jul 2009 19:22:22 -0000
@@ -407,16 +407,16 @@ SECU_GetOptionArg(secuCommand *cmd, int
/* Return informative error string */
char *SECU_ErrorString(int16 err);
@@ -16065,7 +16199,7 @@ RCS file: /cvsroot/mozilla/security/nss/lib/dev/ckhelper.c,v
retrieving revision 1.34.28.2
diff -u -8 -p -w -r1.34.28.2 ckhelper.c
--- mozilla/security/nss/lib/dev/ckhelper.c 3 Dec 2008 04:52:53 -0000 1.34.28.2
-+++ mozilla/security/nss/lib/dev/ckhelper.c 8 Jul 2009 05:13:38 -0000
++++ mozilla/security/nss/lib/dev/ckhelper.c 8 Jul 2009 19:22:26 -0000
@@ -225,33 +225,33 @@ NSS_IMPLEMENT PRBool
nssCKObject_IsAttributeTrue (
CK_OBJECT_HANDLE object,
@@ -16109,7 +16243,7 @@ RCS file: /cvsroot/mozilla/security/nss/lib/freebl/unix_rand.c,v
retrieving revision 1.17.10.7
diff -u -8 -p -w -r1.17.10.7 unix_rand.c
--- mozilla/security/nss/lib/freebl/unix_rand.c 25 Jul 2007 23:18:55 -0000 1.17.10.7
-+++ mozilla/security/nss/lib/freebl/unix_rand.c 8 Jul 2009 05:13:40 -0000
++++ mozilla/security/nss/lib/freebl/unix_rand.c 8 Jul 2009 19:22:27 -0000
@@ -662,17 +662,17 @@ GetHighResClock(void *buf, size_t maxbyt
t = asm("rpcc %v0");
@@ -16135,7 +16269,7 @@ RCS file: /cvsroot/mozilla/security/nss/lib/ssl/config.mk,v
retrieving revision 1.21.2.1
diff -u -8 -p -w -r1.21.2.1 config.mk
--- mozilla/security/nss/lib/ssl/config.mk 1 May 2007 06:09:31 -0000 1.21.2.1
-+++ mozilla/security/nss/lib/ssl/config.mk 8 Jul 2009 05:13:43 -0000
++++ mozilla/security/nss/lib/ssl/config.mk 8 Jul 2009 19:22:30 -0000
@@ -103,17 +103,17 @@ EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
-lnss3 \
@@ -16161,7 +16295,7 @@ RCS file: /cvsroot/mozilla/security/nss/lib/freebl/unix_rand.c,v
retrieving revision 1.17.10.5
diff -u -8 -p -w -r1.17.10.5 unix_rand.c
--- mozilla/security/nss-fips/lib/freebl/unix_rand.c 12 Oct 2006 22:50:48 -0000 1.17.10.5
-+++ mozilla/security/nss-fips/lib/freebl/unix_rand.c 8 Jul 2009 05:13:49 -0000
++++ mozilla/security/nss-fips/lib/freebl/unix_rand.c 8 Jul 2009 19:22:36 -0000
@@ -661,17 +661,17 @@ GetHighResClock(void *buf, size_t maxbyt
t = asm("rpcc %v0");
@@ -16187,7 +16321,7 @@ RCS file: /cvsroot/mozilla/security/nss/lib/ssl/config.mk,v
retrieving revision 1.21
diff -u -8 -p -w -r1.21 config.mk
--- mozilla/security/nss-fips/lib/ssl/config.mk 19 Oct 2005 01:04:16 -0000 1.21
-+++ mozilla/security/nss-fips/lib/ssl/config.mk 8 Jul 2009 05:13:51 -0000
++++ mozilla/security/nss-fips/lib/ssl/config.mk 8 Jul 2009 19:22:38 -0000
@@ -99,17 +99,17 @@ EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
-lnss3 \
@@ -16213,7 +16347,7 @@ RCS file: /cvsroot/mozilla/toolkit/library/Makefile.in,v
retrieving revision 1.16.2.10
diff -u -8 -p -w -r1.16.2.10 Makefile.in
--- mozilla/toolkit/library/Makefile.in 31 Aug 2007 02:40:21 -0000 1.16.2.10
-+++ mozilla/toolkit/library/Makefile.in 8 Jul 2009 05:14:02 -0000
++++ mozilla/toolkit/library/Makefile.in 8 Jul 2009 19:22:48 -0000
@@ -359,17 +359,17 @@ endif
ifdef MOZ_ENABLE_XPRINT
EXTRA_DSO_LDOPTS += $(MOZ_XPRINT_LDFLAGS)
@@ -16239,7 +16373,7 @@ RCS file: /cvsroot/mozilla/toolkit/mozapps/installer/package-name.mk,v
retrieving revision 1.4.8.3
diff -u -8 -p -w -r1.4.8.3 package-name.mk
--- mozilla/toolkit/mozapps/installer/package-name.mk 4 Apr 2008 09:21:26 -0000 1.4.8.3
-+++ mozilla/toolkit/mozapps/installer/package-name.mk 8 Jul 2009 05:14:03 -0000
++++ mozilla/toolkit/mozapps/installer/package-name.mk 8 Jul 2009 19:22:50 -0000
@@ -54,16 +54,19 @@ ifeq ($(OS_ARCH),Darwin)
MOZ_PKG_PLATFORM := mac
endif
@@ -16266,7 +16400,7 @@ RCS file: /cvsroot/mozilla/toolkit/mozapps/installer/packager.mk,v
retrieving revision 1.16.2.18
diff -u -8 -p -w -r1.16.2.18 packager.mk
--- mozilla/toolkit/mozapps/installer/packager.mk 4 Apr 2008 20:31:10 -0000 1.16.2.18
-+++ mozilla/toolkit/mozapps/installer/packager.mk 8 Jul 2009 05:14:04 -0000
++++ mozilla/toolkit/mozapps/installer/packager.mk 8 Jul 2009 19:22:51 -0000
@@ -43,21 +43,24 @@ include $(topsrcdir)/toolkit/mozapps/ins
# This is how we create the Unix binary packages we release to the public.
# Currently the only format is tar.gz (TGZ), but it should be fairly easy
@@ -16321,7 +16455,7 @@ RCS file: /cvsroot/mozilla/toolkit/xre/nsAppRunner.cpp,v
retrieving revision 1.113.2.24
diff -u -8 -p -w -r1.113.2.24 nsAppRunner.cpp
--- mozilla/toolkit/xre/nsAppRunner.cpp 8 Nov 2007 11:56:25 -0000 1.113.2.24
-+++ mozilla/toolkit/xre/nsAppRunner.cpp 8 Jul 2009 05:14:14 -0000
++++ mozilla/toolkit/xre/nsAppRunner.cpp 8 Jul 2009 19:23:00 -0000
@@ -1356,19 +1356,20 @@ XRE_GetBinaryPath(const char* argv0, nsI
rv = NS_NewNativeLocalFile(nsDependentCString(exePath), PR_TRUE,
getter_AddRefs(lf));
@@ -16350,7 +16484,7 @@ RCS file: /cvsroot/mozilla/toolkit/xre/nsXREDirProvider.cpp,v
retrieving revision 1.37.2.11
diff -u -8 -p -w -r1.37.2.11 nsXREDirProvider.cpp
--- mozilla/toolkit/xre/nsXREDirProvider.cpp 8 May 2007 19:25:29 -0000 1.37.2.11
-+++ mozilla/toolkit/xre/nsXREDirProvider.cpp 8 Jul 2009 05:14:16 -0000
++++ mozilla/toolkit/xre/nsXREDirProvider.cpp 8 Jul 2009 19:23:02 -0000
@@ -71,17 +71,17 @@
#ifndef CSIDL_PROGRAM_FILES
#define CSIDL_PROGRAM_FILES 0x0026
@@ -16376,7 +16510,7 @@ RCS file: /cvsroot/mozilla/widget/src/beos/nsAppShell.cpp,v
retrieving revision 1.29.8.2
diff -u -8 -p -w -r1.29.8.2 nsAppShell.cpp
--- mozilla/widget/src/beos/nsAppShell.cpp 3 Jul 2007 09:33:54 -0000 1.29.8.2
-+++ mozilla/widget/src/beos/nsAppShell.cpp 8 Jul 2009 05:14:19 -0000
++++ mozilla/widget/src/beos/nsAppShell.cpp 8 Jul 2009 19:23:05 -0000
@@ -113,20 +113,38 @@ nsAppShell::nsAppShell()
//-------------------------------------------------------------------------
@@ -16458,7 +16592,7 @@ RCS file: /cvsroot/mozilla/widget/src/beos/nsDragService.cpp,v
retrieving revision 1.13.28.5
diff -u -8 -p -w -r1.13.28.5 nsDragService.cpp
--- mozilla/widget/src/beos/nsDragService.cpp 13 Aug 2008 12:41:28 -0000 1.13.28.5
-+++ mozilla/widget/src/beos/nsDragService.cpp 8 Jul 2009 05:14:21 -0000
++++ mozilla/widget/src/beos/nsDragService.cpp 8 Jul 2009 19:23:07 -0000
@@ -250,17 +250,17 @@ nsDragService::InvokeDragSession (nsIDOM
dragRect = view->Frame();
// do we need to offset?
@@ -16484,7 +16618,7 @@ RCS file: /cvsroot/mozilla/widget/src/beos/nsLookAndFeel.cpp,v
retrieving revision 1.27
diff -u -8 -p -w -r1.27 nsLookAndFeel.cpp
--- mozilla/widget/src/beos/nsLookAndFeel.cpp 26 Oct 2004 01:45:26 -0000 1.27
-+++ mozilla/widget/src/beos/nsLookAndFeel.cpp 8 Jul 2009 05:14:22 -0000
++++ mozilla/widget/src/beos/nsLookAndFeel.cpp 8 Jul 2009 19:23:08 -0000
@@ -157,19 +157,17 @@ nsresult nsLookAndFeel::NativeGetColor(c
aColor = NS_RGB(0x00, 0x00, 0x00);
break;
@@ -16512,7 +16646,7 @@ RCS file: /cvsroot/mozilla/widget/src/beos/nsToolkit.cpp,v
retrieving revision 1.23.8.1
diff -u -8 -p -w -r1.23.8.1 nsToolkit.cpp
--- mozilla/widget/src/beos/nsToolkit.cpp 3 Jul 2007 09:33:54 -0000 1.23.8.1
-+++ mozilla/widget/src/beos/nsToolkit.cpp 8 Jul 2009 05:14:22 -0000
++++ mozilla/widget/src/beos/nsToolkit.cpp 8 Jul 2009 19:23:08 -0000
@@ -37,16 +37,17 @@
#include "nsToolkit.h"
@@ -16673,7 +16807,7 @@ RCS file: /cvsroot/mozilla/widget/src/beos/nsToolkit.h,v
retrieving revision 1.5.8.1
diff -u -8 -p -w -r1.5.8.1 nsToolkit.h
--- mozilla/widget/src/beos/nsToolkit.h 3 Jul 2007 09:33:54 -0000 1.5.8.1
-+++ mozilla/widget/src/beos/nsToolkit.h 8 Jul 2009 05:14:22 -0000
++++ mozilla/widget/src/beos/nsToolkit.h 8 Jul 2009 19:23:08 -0000
@@ -66,16 +66,17 @@ public:
void Kill();
private:
@@ -16698,7 +16832,7 @@ RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v
retrieving revision 1.90.2.3
diff -u -8 -p -w -r1.90.2.3 Makefile.in
--- mozilla/xpcom/build/Makefile.in 29 Mar 2008 06:56:29 -0000 1.90.2.3
-+++ mozilla/xpcom/build/Makefile.in 8 Jul 2009 05:14:25 -0000
++++ mozilla/xpcom/build/Makefile.in 8 Jul 2009 19:23:11 -0000
@@ -168,17 +168,17 @@ ifdef GC_LEAK_DETECTOR
DEFINES += -DGC_LEAK_DETECTOR
endif
@@ -16724,7 +16858,7 @@ RCS file: /cvsroot/mozilla/xpcom/obsolete/Makefile.in,v
retrieving revision 1.17
diff -u -8 -p -w -r1.17 Makefile.in
--- mozilla/xpcom/obsolete/Makefile.in 30 Jan 2005 21:33:45 -0000 1.17
-+++ mozilla/xpcom/obsolete/Makefile.in 8 Jul 2009 05:14:27 -0000
++++ mozilla/xpcom/obsolete/Makefile.in 8 Jul 2009 19:23:13 -0000
@@ -115,17 +115,17 @@ DEFINES += -D_IMPL_NS_COM_OBSOLETE
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
@@ -16750,7 +16884,7 @@ RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in,v
retrieving revision 1.80.4.6
diff -u -8 -p -w -r1.80.4.6 Makefile.in
--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 19 Feb 2008 21:11:34 -0000 1.80.4.6
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 8 Jul 2009 05:14:28 -0000
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 8 Jul 2009 19:23:15 -0000
@@ -90,21 +90,23 @@ endif
# IA64 Linux
ifneq (,$(filter Linux,$(OS_ARCH)))
@@ -16783,7 +16917,7 @@ RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unix
retrieving revision 1.18.28.3
diff -u -8 -p -w -r1.18.28.3 xptc_platforms_unixish_x86.h
--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 9 Apr 2007 20:01:13 -0000 1.18.28.3
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 8 Jul 2009 05:14:29 -0000
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 8 Jul 2009 19:23:15 -0000
@@ -133,17 +133,22 @@
/* Old gcc 2.7.x.x. What does gcc 2.8.x do?? */
#define CFRONT_STYLE_THIS_ADJUST
@@ -16813,7 +16947,7 @@ RCS file: /cvsroot/mozilla/xpcom/threads/Attic/plevent.c,v
retrieving revision 1.54.2.1
diff -u -8 -p -w -r1.54.2.1 plevent.c
--- mozilla/xpcom/threads/plevent.c 26 Sep 2005 19:43:34 -0000 1.54.2.1
-+++ mozilla/xpcom/threads/plevent.c 8 Jul 2009 05:14:34 -0000
++++ mozilla/xpcom/threads/plevent.c 8 Jul 2009 19:23:20 -0000
@@ -61,16 +61,18 @@
#if defined(XP_UNIX)
/* for fcntl */
@@ -16939,7 +17073,7 @@ RCS file: /cvsroot/mozilla/xpfe/bootstrap/Attic/Makefile.in,v
retrieving revision 1.283.2.6
diff -u -8 -p -w -r1.283.2.6 Makefile.in
--- mozilla/xpfe/bootstrap/Makefile.in 29 Sep 2007 20:15:11 -0000 1.283.2.6
-+++ mozilla/xpfe/bootstrap/Makefile.in 8 Jul 2009 05:14:35 -0000
++++ mozilla/xpfe/bootstrap/Makefile.in 8 Jul 2009 19:23:21 -0000
@@ -113,18 +113,22 @@ ifdef MOZ_ENABLE_XREMOTE
REQUIRES += xremoteservice
endif
@@ -17008,7 +17142,7 @@ RCS file: /cvsroot/mozilla/xpfe/bootstrap/nsSigHandlers.cpp,v
retrieving revision 1.41.18.1
diff -u -8 -p -w -r1.41.18.1 nsSigHandlers.cpp
--- mozilla/xpfe/bootstrap/nsSigHandlers.cpp 22 Jun 2006 22:31:13 -0000 1.41.18.1
-+++ mozilla/xpfe/bootstrap/nsSigHandlers.cpp 8 Jul 2009 05:14:36 -0000
++++ mozilla/xpfe/bootstrap/nsSigHandlers.cpp 8 Jul 2009 19:23:22 -0000
@@ -55,17 +55,18 @@
#include