Date: Sat, 23 Jun 2012 13:17:42 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r793 - in branches/experimental: mail/thunderbird mail/thunderbird-beta mail/thunderbird-beta/files mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files www/firefox-beta www/firefox-esr www/libxul www/seamonkey www/seamonkey-beta www/seamonkey-beta/files www/seamonkey/files Message-ID: <201206231317.q5NDHg6H057634@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jun 23 13:17:42 2012
New Revision: 793
Log:
followup to r737: add libc++ fix for the rest gecko >= 2.0 ports
clang fix is based on patch from jkim@
Added:
branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-time_posix.cc
branches/experimental/mail/thunderbird-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
branches/experimental/mail/thunderbird-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp
branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-time_posix.cc
branches/experimental/mail/thunderbird-esr/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
branches/experimental/mail/thunderbird-esr/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp
branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-time_posix.cc
branches/experimental/mail/thunderbird/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
branches/experimental/mail/thunderbird/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp
branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-time_posix.cc
branches/experimental/www/seamonkey-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
branches/experimental/www/seamonkey-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
branches/experimental/www/seamonkey-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp
branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-time_posix.cc
branches/experimental/www/seamonkey/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
branches/experimental/www/seamonkey/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
branches/experimental/www/seamonkey/files/patch-suite-build-Makefile.in
Modified:
branches/experimental/mail/thunderbird-beta/Makefile
branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
branches/experimental/mail/thunderbird-esr/Makefile
branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
branches/experimental/mail/thunderbird/Makefile
branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_linux.cc
branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in
branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
branches/experimental/www/firefox-beta/Makefile
branches/experimental/www/firefox-esr/Makefile
branches/experimental/www/libxul/Makefile
branches/experimental/www/seamonkey-beta/Makefile
branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc
branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in
branches/experimental/www/seamonkey/Makefile
branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc
branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in
Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 23 13:17:42 2012 (r793)
@@ -92,6 +92,16 @@
BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
.endif
+.if !empty(CXX:M*clang++*)
+CFLAGS+= -Wno-return-type-c-linkage
+.endif
+
+.if ${CXXFLAGS:M-stdlib=libc++}
+CXXABI= -lcxxrt
+.else
+CXXABI= # implied
+.endif
+
.if defined(WITH_LIGHTNING)
MOZ_OPTIONS+= --enable-calendar
MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
@@ -113,6 +123,7 @@
-e 's|/proc/self/fd|/dev/fd|' \
-e 's|/proc["/]|/compat/linux&|'
@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+ -e 's|%%CXXABI%%|${CXXABI}|' \
${MOZSRC}/storage/build/Makefile.in \
${MOZSRC}/toolkit/library/Makefile.in \
${MOZSRC}/db/sqlite3/src/Makefile.in
Modified: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:17:42 2012 (r793)
@@ -1,6 +1,6 @@
--- 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) {
+@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) {
#ifdef ANDROID
return GetTempDir(path);
#else
Added: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-time_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-time_posix.cc Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,10 @@
+--- mozilla/ipc/chromium/src/base/time_posix.cc~
++++ mozilla/ipc/chromium/src/base/time_posix.cc
+@@ -8,6 +9,7 @@
+ #include <mach/mach_time.h>
+ #endif
+ #include <sys/time.h>
++#include <unistd.h>
+ #ifdef ANDROID
+ #include <time64.h>
+ #else
Added: branches/experimental/mail/thunderbird-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,20 @@
+--- mailnews/addrbook/src/nsDirPrefs.cpp~
++++ mailnews/addrbook/src/nsDirPrefs.cpp
+@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid
+ DIR_Server *s=nsnull;
+
+ switch (position) {
+- case DIR_POS_APPEND:
++ case (PRInt32)DIR_POS_APPEND:
+ /* Do nothing if the request is to append a server that is already
+ * in the list.
+ */
+@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid
+ wholeList->AppendElement(server);
+ break;
+
+- case DIR_POS_DELETE:
++ case (PRInt32)DIR_POS_DELETE:
+ /* Remove the prefs corresponding to the given server. If the prefName
+ * value is nsnull, the server has never been saved and there are no
+ * prefs to remove.
Added: branches/experimental/mail/thunderbird-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,29 @@
+--- mailnews/compose/src/nsSmtpProtocol.cpp~
++++ mailnews/compose/src/nsSmtpProtocol.cpp
+@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr
+
+ switch (code)
+ {
+- case NS_ERROR_SMTP_SERVER_ERROR:
+- case NS_ERROR_TCP_READ_ERROR:
+- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
+- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
+- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
+- case NS_ERROR_SENDING_FROM_COMMAND:
+- case NS_ERROR_SENDING_RCPT_COMMAND:
+- case NS_ERROR_SENDING_DATA_COMMAND:
+- case NS_ERROR_SENDING_MESSAGE:
+- case NS_ERROR_SMTP_GREETING:
++ case (int)NS_ERROR_SMTP_SERVER_ERROR:
++ case (int)NS_ERROR_TCP_READ_ERROR:
++ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
++ case (int)NS_ERROR_SENDING_FROM_COMMAND:
++ case (int)NS_ERROR_SENDING_RCPT_COMMAND:
++ case (int)NS_ERROR_SENDING_DATA_COMMAND:
++ case (int)NS_ERROR_SENDING_MESSAGE:
++ case (int)NS_ERROR_SMTP_GREETING:
+ bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg));
+ msg = nsTextFormatter::vsmprintf(eMsg.get(), args);
+ break;
Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,11 @@
+--- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp~
++++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp
+@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const
+ i += with.length();
+ }
+
+- return munged;
++ return munged.c_str();
+ }
+ #endif
+
Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:17:42 2012 (r793)
@@ -5,7 +5,7 @@
$(INSTALL) $^ .
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%%
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%%
ifdef MOZ_ENABLE_LIBXUL
include $(srcdir)/libxul-rules.mk
Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -8,3 +8,11 @@
#if defined(_WIN32) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)) && !defined(WINCE) // WIN32 x86 stack walking code
+@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
+
+ #elif defined(HAVE__UNWIND_BACKTRACE)
+
++#define _GNU_SOURCE
+ // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
+ #include <unwind.h>
+
Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 23 13:17:42 2012 (r793)
@@ -93,6 +93,16 @@
BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
.endif
+.if !empty(CXX:M*clang++*)
+CFLAGS+= -Wno-return-type-c-linkage
+.endif
+
+.if ${CXXFLAGS:M-stdlib=libc++}
+CXXABI= -lcxxrt
+.else
+CXXABI= # implied
+.endif
+
.if defined(WITH_LIGHTNING)
MOZ_OPTIONS+= --enable-calendar
MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
@@ -114,6 +124,7 @@
-e 's|/proc/self/fd|/dev/fd|' \
-e 's|/proc["/]|/compat/linux&|'
@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+ -e 's|%%CXXABI%%|${CXXABI}|' \
${MOZSRC}/storage/build/Makefile.in \
${MOZSRC}/toolkit/library/Makefile.in \
${MOZSRC}/db/sqlite3/src/Makefile.in
Modified: branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:17:42 2012 (r793)
@@ -1,6 +1,6 @@
--- 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) {
+@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) {
#ifdef ANDROID
return GetTempDir(path);
#else
Added: branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-time_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-time_posix.cc Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,10 @@
+--- mozilla/ipc/chromium/src/base/time_posix.cc~
++++ mozilla/ipc/chromium/src/base/time_posix.cc
+@@ -8,6 +9,7 @@
+ #include <mach/mach_time.h>
+ #endif
+ #include <sys/time.h>
++#include <unistd.h>
+ #ifdef ANDROID
+ #include <time64.h>
+ #else
Added: branches/experimental/mail/thunderbird-esr/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,20 @@
+--- mailnews/addrbook/src/nsDirPrefs.cpp~
++++ mailnews/addrbook/src/nsDirPrefs.cpp
+@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid
+ DIR_Server *s=nsnull;
+
+ switch (position) {
+- case DIR_POS_APPEND:
++ case (PRInt32)DIR_POS_APPEND:
+ /* Do nothing if the request is to append a server that is already
+ * in the list.
+ */
+@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid
+ wholeList->AppendElement(server);
+ break;
+
+- case DIR_POS_DELETE:
++ case (PRInt32)DIR_POS_DELETE:
+ /* Remove the prefs corresponding to the given server. If the prefName
+ * value is nsnull, the server has never been saved and there are no
+ * prefs to remove.
Added: branches/experimental/mail/thunderbird-esr/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,29 @@
+--- mailnews/compose/src/nsSmtpProtocol.cpp~
++++ mailnews/compose/src/nsSmtpProtocol.cpp
+@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr
+
+ switch (code)
+ {
+- case NS_ERROR_SMTP_SERVER_ERROR:
+- case NS_ERROR_TCP_READ_ERROR:
+- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
+- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
+- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
+- case NS_ERROR_SENDING_FROM_COMMAND:
+- case NS_ERROR_SENDING_RCPT_COMMAND:
+- case NS_ERROR_SENDING_DATA_COMMAND:
+- case NS_ERROR_SENDING_MESSAGE:
+- case NS_ERROR_SMTP_GREETING:
++ case (int)NS_ERROR_SMTP_SERVER_ERROR:
++ case (int)NS_ERROR_TCP_READ_ERROR:
++ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
++ case (int)NS_ERROR_SENDING_FROM_COMMAND:
++ case (int)NS_ERROR_SENDING_RCPT_COMMAND:
++ case (int)NS_ERROR_SENDING_DATA_COMMAND:
++ case (int)NS_ERROR_SENDING_MESSAGE:
++ case (int)NS_ERROR_SMTP_GREETING:
+ bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg));
+ msg = nsTextFormatter::vsmprintf(eMsg.get(), args);
+ break;
Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,11 @@
+--- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp~
++++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp
+@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const
+ i += with.length();
+ }
+
+- return munged;
++ return munged.c_str();
+ }
+ #endif
+
Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:17:42 2012 (r793)
@@ -5,7 +5,7 @@
$(INSTALL) $^ .
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%%
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%%
ifdef MOZ_ENABLE_LIBXUL
include $(srcdir)/libxul-rules.mk
Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -8,3 +8,11 @@
#if defined(_WIN32) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)) && !defined(WINCE) // WIN32 x86 stack walking code
+@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
+
+ #elif defined(HAVE__UNWIND_BACKTRACE)
+
++#define _GNU_SOURCE
+ // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
+ #include <unwind.h>
+
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:17:42 2012 (r793)
@@ -97,6 +97,12 @@
BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
.endif
+.if ${CXXFLAGS:M-stdlib=libc++}
+CXXABI= -lcxxrt
+.else
+CXXABI= # implied
+.endif
+
.if defined(WITH_LIGHTNING)
MOZ_OPTIONS+= --enable-calendar
MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
@@ -118,6 +124,7 @@
-e 's|/proc/self/fd|/dev/fd|' \
-e 's|/proc["/]|/compat/linux&|'
@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+ -e 's|%%CXXABI%%|${CXXABI}|' \
${MOZSRC}/storage/build/Makefile.in \
${MOZSRC}/toolkit/library/Makefile.in \
${MOZSRC}/db/sqlite3/src/Makefile.in
Modified: branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_linux.cc
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:17:42 2012 (r793)
@@ -1,6 +1,6 @@
--- 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) {
+@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) {
#ifdef ANDROID
return GetTempDir(path);
#else
Added: branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-time_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-time_posix.cc Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,10 @@
+--- mozilla/ipc/chromium/src/base/time_posix.cc~
++++ mozilla/ipc/chromium/src/base/time_posix.cc
+@@ -8,6 +9,7 @@
+ #include <mach/mach_time.h>
+ #endif
+ #include <sys/time.h>
++#include <unistd.h>
+ #ifdef ANDROID
+ #include <time64.h>
+ #else
Added: branches/experimental/mail/thunderbird/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,20 @@
+--- mailnews/addrbook/src/nsDirPrefs.cpp~
++++ mailnews/addrbook/src/nsDirPrefs.cpp
+@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid
+ DIR_Server *s=nsnull;
+
+ switch (position) {
+- case DIR_POS_APPEND:
++ case (PRInt32)DIR_POS_APPEND:
+ /* Do nothing if the request is to append a server that is already
+ * in the list.
+ */
+@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid
+ wholeList->AppendElement(server);
+ break;
+
+- case DIR_POS_DELETE:
++ case (PRInt32)DIR_POS_DELETE:
+ /* Remove the prefs corresponding to the given server. If the prefName
+ * value is nsnull, the server has never been saved and there are no
+ * prefs to remove.
Added: branches/experimental/mail/thunderbird/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,29 @@
+--- mailnews/compose/src/nsSmtpProtocol.cpp~
++++ mailnews/compose/src/nsSmtpProtocol.cpp
+@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr
+
+ switch (code)
+ {
+- case NS_ERROR_SMTP_SERVER_ERROR:
+- case NS_ERROR_TCP_READ_ERROR:
+- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
+- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
+- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
+- case NS_ERROR_SENDING_FROM_COMMAND:
+- case NS_ERROR_SENDING_RCPT_COMMAND:
+- case NS_ERROR_SENDING_DATA_COMMAND:
+- case NS_ERROR_SENDING_MESSAGE:
+- case NS_ERROR_SMTP_GREETING:
++ case (int)NS_ERROR_SMTP_SERVER_ERROR:
++ case (int)NS_ERROR_TCP_READ_ERROR:
++ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
++ case (int)NS_ERROR_SENDING_FROM_COMMAND:
++ case (int)NS_ERROR_SENDING_RCPT_COMMAND:
++ case (int)NS_ERROR_SENDING_DATA_COMMAND:
++ case (int)NS_ERROR_SENDING_MESSAGE:
++ case (int)NS_ERROR_SMTP_GREETING:
+ bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg));
+ msg = nsTextFormatter::vsmprintf(eMsg.get(), args);
+ break;
Added: branches/experimental/mail/thunderbird/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,11 @@
+--- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp~
++++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp
+@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const
+ i += with.length();
+ }
+
+- return munged;
++ return munged.c_str();
+ }
+ #endif
+
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:17:42 2012 (r793)
@@ -5,7 +5,7 @@
$(INSTALL) $^ .
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%%
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%%
ifdef MOZ_ENABLE_LIBXUL
include $(srcdir)/libxul-rules.mk
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -8,3 +8,11 @@
#if defined(_WIN32) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)) && !defined(WINCE) // WIN32 x86 stack walking code
+@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
+
+ #elif defined(HAVE__UNWIND_BACKTRACE)
+
++#define _GNU_SOURCE
+ // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
+ #include <unwind.h>
+
Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/www/firefox-beta/Makefile Sat Jun 23 13:17:42 2012 (r793)
@@ -90,7 +90,7 @@
.endif
.if !empty(CXX:M*clang++*)
-CXXFLAGS+= -Wno-error=return-type-c-linkage
+CXXFLAGS+= -Wno-return-type-c-linkage
.endif
.if ${CXXFLAGS:M-stdlib=libc++}
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/www/firefox-esr/Makefile Sat Jun 23 13:17:42 2012 (r793)
@@ -91,7 +91,7 @@
.endif
.if !empty(CXX:M*clang++*)
-CXXFLAGS+= -Wno-error=return-type-c-linkage
+CXXFLAGS+= -Wno-return-type-c-linkage
.endif
.if ${CXXFLAGS:M-stdlib=libc++}
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/www/libxul/Makefile Sat Jun 23 13:17:42 2012 (r793)
@@ -71,7 +71,7 @@
.endif
.if !empty(CXX:M*clang++*)
-CXXFLAGS+= -Wno-error=return-type-c-linkage
+CXXFLAGS+= -Wno-return-type-c-linkage
.endif
.if ${CXXFLAGS:M-stdlib=libc++}
Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/www/seamonkey-beta/Makefile Sat Jun 23 13:17:42 2012 (r793)
@@ -34,7 +34,6 @@
MAKE_JOBS_SAFE= yes
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin
-USE_GCC= 4.2+
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
@@ -105,6 +104,16 @@
BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
.endif
+.if !empty(CXX:M*clang++*)
+CFLAGS+= -Wno-return-type-c-linkage
+.endif
+
+.if ${CXXFLAGS:M-stdlib=libc++}
+CXXABI= -lcxxrt
+.else
+CXXABI= # implied
+.endif
+
.if defined(WITH_LIGHTNING)
MOZ_OPTIONS+= --enable-calendar
MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
@@ -122,6 +131,7 @@
${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \
${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+ -e 's|%%CXXABI%%|${CXXABI}|' \
${MOZSRC}/storage/build/Makefile.in \
${MOZSRC}/toolkit/library/Makefile.in \
${MOZSRC}/db/sqlite3/src/Makefile.in
Modified: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:17:42 2012 (r793)
@@ -1,6 +1,6 @@
--- 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) {
+@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) {
#ifdef ANDROID
return GetTempDir(path);
#else
Added: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-time_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-time_posix.cc Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,10 @@
+--- mozilla/ipc/chromium/src/base/time_posix.cc~
++++ mozilla/ipc/chromium/src/base/time_posix.cc
+@@ -8,6 +9,7 @@
+ #include <mach/mach_time.h>
+ #endif
+ #include <sys/time.h>
++#include <unistd.h>
+ #ifdef ANDROID
+ #include <time64.h>
+ #else
Added: branches/experimental/www/seamonkey-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,20 @@
+--- mailnews/addrbook/src/nsDirPrefs.cpp~
++++ mailnews/addrbook/src/nsDirPrefs.cpp
+@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid
+ DIR_Server *s=nsnull;
+
+ switch (position) {
+- case DIR_POS_APPEND:
++ case (PRInt32)DIR_POS_APPEND:
+ /* Do nothing if the request is to append a server that is already
+ * in the list.
+ */
+@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid
+ wholeList->AppendElement(server);
+ break;
+
+- case DIR_POS_DELETE:
++ case (PRInt32)DIR_POS_DELETE:
+ /* Remove the prefs corresponding to the given server. If the prefName
+ * value is nsnull, the server has never been saved and there are no
+ * prefs to remove.
Added: branches/experimental/www/seamonkey-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,29 @@
+--- mailnews/compose/src/nsSmtpProtocol.cpp~
++++ mailnews/compose/src/nsSmtpProtocol.cpp
+@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr
+
+ switch (code)
+ {
+- case NS_ERROR_SMTP_SERVER_ERROR:
+- case NS_ERROR_TCP_READ_ERROR:
+- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
+- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
+- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
+- case NS_ERROR_SENDING_FROM_COMMAND:
+- case NS_ERROR_SENDING_RCPT_COMMAND:
+- case NS_ERROR_SENDING_DATA_COMMAND:
+- case NS_ERROR_SENDING_MESSAGE:
+- case NS_ERROR_SMTP_GREETING:
++ case (int)NS_ERROR_SMTP_SERVER_ERROR:
++ case (int)NS_ERROR_TCP_READ_ERROR:
++ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
++ case (int)NS_ERROR_SENDING_FROM_COMMAND:
++ case (int)NS_ERROR_SENDING_RCPT_COMMAND:
++ case (int)NS_ERROR_SENDING_DATA_COMMAND:
++ case (int)NS_ERROR_SENDING_MESSAGE:
++ case (int)NS_ERROR_SMTP_GREETING:
+ bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg));
+ msg = nsTextFormatter::vsmprintf(eMsg.get(), args);
+ break;
Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,11 @@
+--- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp~
++++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp
+@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const
+ i += with.length();
+ }
+
+- return munged;
++ return munged.c_str();
+ }
+ #endif
+
Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:17:42 2012 (r793)
@@ -5,7 +5,7 @@
$(INSTALL) $^ .
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%%
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%%
ifdef MOZ_ENABLE_LIBXUL
include $(srcdir)/libxul-rules.mk
Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,10 @@
+--- mozilla/xpcom/base/nsStackWalk.cpp~
++++ mozilla/xpcom/base/nsStackWalk.cpp
+@@ -1638,6 +1638,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
+
+ #elif defined(HAVE__UNWIND_BACKTRACE)
+
++#define _GNU_SOURCE
+ // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
+ #include <unwind.h>
+
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:17:42 2012 (r793)
@@ -35,8 +35,6 @@
MAKE_JOBS_SAFE= yes
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin
-EXTRA_CFLAGS= -O0
-USE_GCC= 4.2+
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
@@ -63,6 +61,10 @@
.include <bsd.port.pre.mk>
+.if empty(CXX:M*clang++*) && ${OSVERSION} > 900000
+USE_GCC= 4.6+
+.endif
+
MOZSRC:= ${WRKDIR}/comm-release/mozilla
WRKSRC= ${WRKDIR}/comm-release
@@ -107,6 +109,16 @@
BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
.endif
+.if !empty(CXX:M*clang++*)
+CFLAGS+= -Wno-return-type-c-linkage
+.endif
+
+.if ${CXXFLAGS:M-stdlib=libc++}
+CXXABI= -lcxxrt
+.else
+CXXABI= # implied
+.endif
+
.if defined(WITH_LIGHTNING)
MOZ_OPTIONS+= --enable-calendar
MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
@@ -124,6 +136,8 @@
${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \
${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+ -e 's|%%CXXABI%%|${CXXABI}|' \
+ ${WRKSRC}/suite/build/Makefile.in \
${MOZSRC}/storage/build/Makefile.in \
${MOZSRC}/toolkit/library/Makefile.in \
${MOZSRC}/db/sqlite3/src/Makefile.in
Modified: branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:17:42 2012 (r793)
@@ -1,6 +1,6 @@
--- 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) {
+@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) {
#ifdef ANDROID
return GetTempDir(path);
#else
Added: branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-time_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-time_posix.cc Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,10 @@
+--- mozilla/ipc/chromium/src/base/time_posix.cc~
++++ mozilla/ipc/chromium/src/base/time_posix.cc
+@@ -8,6 +9,7 @@
+ #include <mach/mach_time.h>
+ #endif
+ #include <sys/time.h>
++#include <unistd.h>
+ #ifdef ANDROID
+ #include <time64.h>
+ #else
Added: branches/experimental/www/seamonkey/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,20 @@
+--- mailnews/addrbook/src/nsDirPrefs.cpp~
++++ mailnews/addrbook/src/nsDirPrefs.cpp
+@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid
+ DIR_Server *s=nsnull;
+
+ switch (position) {
+- case DIR_POS_APPEND:
++ case (PRInt32)DIR_POS_APPEND:
+ /* Do nothing if the request is to append a server that is already
+ * in the list.
+ */
+@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid
+ wholeList->AppendElement(server);
+ break;
+
+- case DIR_POS_DELETE:
++ case (PRInt32)DIR_POS_DELETE:
+ /* Remove the prefs corresponding to the given server. If the prefName
+ * value is nsnull, the server has never been saved and there are no
+ * prefs to remove.
Added: branches/experimental/www/seamonkey/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,29 @@
+--- mailnews/compose/src/nsSmtpProtocol.cpp~
++++ mailnews/compose/src/nsSmtpProtocol.cpp
+@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr
+
+ switch (code)
+ {
+- case NS_ERROR_SMTP_SERVER_ERROR:
+- case NS_ERROR_TCP_READ_ERROR:
+- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
+- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
+- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
+- case NS_ERROR_SENDING_FROM_COMMAND:
+- case NS_ERROR_SENDING_RCPT_COMMAND:
+- case NS_ERROR_SENDING_DATA_COMMAND:
+- case NS_ERROR_SENDING_MESSAGE:
+- case NS_ERROR_SMTP_GREETING:
++ case (int)NS_ERROR_SMTP_SERVER_ERROR:
++ case (int)NS_ERROR_TCP_READ_ERROR:
++ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
++ case (int)NS_ERROR_SENDING_FROM_COMMAND:
++ case (int)NS_ERROR_SENDING_RCPT_COMMAND:
++ case (int)NS_ERROR_SENDING_DATA_COMMAND:
++ case (int)NS_ERROR_SENDING_MESSAGE:
++ case (int)NS_ERROR_SMTP_GREETING:
+ bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg));
+ msg = nsTextFormatter::vsmprintf(eMsg.get(), args);
+ break;
Added: branches/experimental/www/seamonkey/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,11 @@
+--- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp~
++++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp
+@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const
+ i += with.length();
+ }
+
+- return munged;
++ return munged.c_str();
+ }
+ #endif
+
Modified: branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:14:24 2012 (r792)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:17:42 2012 (r793)
@@ -5,7 +5,7 @@
endif
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%%
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%%
DEFINES += -DIMPL_XREAPI
Added: branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,10 @@
+--- mozilla/xpcom/base/nsStackWalk.cpp~
++++ mozilla/xpcom/base/nsStackWalk.cpp
+@@ -1638,6 +1638,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
+
+ #elif defined(HAVE__UNWIND_BACKTRACE)
+
++#define _GNU_SOURCE
+ // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
+ #include <unwind.h>
+
Added: branches/experimental/www/seamonkey/files/patch-suite-build-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-suite-build-Makefile.in Sat Jun 23 13:17:42 2012 (r793)
@@ -0,0 +1,10 @@
+--- suite/build/Makefile.in~
++++ suite/build/Makefile.in
+@@ -76,6 +76,7 @@ SHARED_LIBRARY_LIBS += ../shell/src/$(LI
+ endif
+
+ EXTRA_DSO_LDOPTS += \
++ %%CXXABI%% \
+ $(LIBS_DIR) \
+ $(EXTRA_DSO_LIBS) \
+ $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206231317.q5NDHg6H057634>