Date: Tue, 28 Aug 2012 15:25:15 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r956 - in branches/experimental: mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/firefox36/files www/libxul/files www/libxul19/files www/seamonkey/files Message-ID: <201208281525.q7SFPFlR092239@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Aug 28 15:25:15 2012
New Revision: 956
Log:
rename patches, mostly for gecko >= 10
Added:
branches/experimental/mail/thunderbird-esr/files/patch-bug714312
branches/experimental/mail/thunderbird-esr/files/patch-bug725655
branches/experimental/mail/thunderbird-esr/files/patch-bug729155
branches/experimental/mail/thunderbird-esr/files/patch-bug761077
branches/experimental/mail/thunderbird-esr/files/patch-bug778056
- copied, changed from r955, branches/experimental/mail/thunderbird-esr/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
branches/experimental/mail/thunderbird-esr/files/patch-bug778078
- copied, changed from r955, branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
branches/experimental/mail/thunderbird-esr/files/patch-bug779847
branches/experimental/mail/thunderbird-esr/files/patch-bug781457
- copied, changed from r955, branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
branches/experimental/mail/thunderbird-esr/files/patch-bug781474
- copied, changed from r955, branches/experimental/mail/thunderbird-esr/files/patch-mozilla__content__base__public__nsContentUtils.h
branches/experimental/mail/thunderbird-esr/files/patch-bug783463
branches/experimental/mail/thunderbird-esr/files/patch-bug785638
branches/experimental/mail/thunderbird/files/patch-bug722975
- copied, changed from r955, branches/experimental/mail/thunderbird/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp
branches/experimental/mail/thunderbird/files/patch-bug759459
branches/experimental/mail/thunderbird/files/patch-bug760899
- copied, changed from r955, branches/experimental/www/seamonkey/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp
branches/experimental/mail/thunderbird/files/patch-bug761077
branches/experimental/mail/thunderbird/files/patch-bug761419
branches/experimental/mail/thunderbird/files/patch-bug778056
- copied, changed from r955, branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
branches/experimental/mail/thunderbird/files/patch-bug778078
- copied, changed from r955, branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
branches/experimental/mail/thunderbird/files/patch-bug779847
branches/experimental/mail/thunderbird/files/patch-bug781457
- copied, changed from r955, branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
branches/experimental/mail/thunderbird/files/patch-bug781474
- copied, changed from r955, branches/experimental/mail/thunderbird/files/patch-mozilla__content__base__public__nsContentUtils.h
branches/experimental/mail/thunderbird/files/patch-bug783463
branches/experimental/mail/thunderbird/files/patch-bug783571
- copied, changed from r955, branches/experimental/mail/thunderbird/files/patch-mail-components-Makefile.in
branches/experimental/mail/thunderbird/files/patch-bug785638
branches/experimental/mail/thunderbird3/files/patch-bug761077
branches/experimental/mail/thunderbird3/files/patch-bug778078
- copied, changed from r955, branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
branches/experimental/mail/thunderbird3/files/patch-bug781457
- copied, changed from r955, branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
branches/experimental/www/firefox-esr/files/patch-bug714312
branches/experimental/www/firefox-esr/files/patch-bug725655
branches/experimental/www/firefox-esr/files/patch-bug729155
branches/experimental/www/firefox-esr/files/patch-bug761077
branches/experimental/www/firefox-esr/files/patch-bug778056
- copied, changed from r955, branches/experimental/www/firefox-esr/files/patch-memory-mozalloc-mozalloc.cpp
branches/experimental/www/firefox-esr/files/patch-bug778078
- copied, changed from r955, branches/experimental/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/firefox-esr/files/patch-bug779847
branches/experimental/www/firefox-esr/files/patch-bug781457
- copied, changed from r955, branches/experimental/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp
branches/experimental/www/firefox-esr/files/patch-bug781474
- copied, changed from r955, branches/experimental/www/firefox-esr/files/patch-content__base__public__nsContentUtils.h
branches/experimental/www/firefox-esr/files/patch-bug783463
branches/experimental/www/firefox-esr/files/patch-bug785638
branches/experimental/www/firefox-nightly/files/patch-bug722975
- copied, changed from r955, branches/experimental/www/firefox-nightly/files/patch-gfx-thebes-gfxPlatform.cpp
branches/experimental/www/firefox-nightly/files/patch-bug778078
- copied, changed from r955, branches/experimental/www/firefox-nightly/files/patch-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/firefox-nightly/files/patch-bug783463
branches/experimental/www/firefox-nightly/files/patch-bug785638
branches/experimental/www/firefox/files/patch-bug722975
- copied, changed from r955, branches/experimental/www/firefox/files/patch-gfx-thebes-gfxPlatform.cpp
branches/experimental/www/firefox/files/patch-bug759459
branches/experimental/www/firefox/files/patch-bug760899
- copied, changed from r955, branches/experimental/www/firefox/files/patch-content-media-gstreamer-nsGStreamerReader.cpp
branches/experimental/www/firefox/files/patch-bug761077
branches/experimental/www/firefox/files/patch-bug761419
branches/experimental/www/firefox/files/patch-bug778056
- copied, changed from r955, branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp
branches/experimental/www/firefox/files/patch-bug778078
- copied, changed from r955, branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/firefox/files/patch-bug779847
branches/experimental/www/firefox/files/patch-bug781457
- copied, changed from r955, branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp
branches/experimental/www/firefox/files/patch-bug781474
- copied, changed from r955, branches/experimental/www/firefox/files/patch-content__base__public__nsContentUtils.h
branches/experimental/www/firefox/files/patch-bug783463
branches/experimental/www/firefox/files/patch-bug785638
branches/experimental/www/firefox36/files/patch-bug761077
branches/experimental/www/firefox36/files/patch-bug778078
- copied, changed from r955, branches/experimental/www/libxul19/files/patch-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/firefox36/files/patch-bug781457
- copied, changed from r955, branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp
branches/experimental/www/libxul/files/patch-bug714312
branches/experimental/www/libxul/files/patch-bug725655
branches/experimental/www/libxul/files/patch-bug729155
branches/experimental/www/libxul/files/patch-bug761077
branches/experimental/www/libxul/files/patch-bug778056
- copied, changed from r955, branches/experimental/www/libxul/files/patch-memory-mozalloc-mozalloc.cpp
branches/experimental/www/libxul/files/patch-bug778078
- copied, changed from r955, branches/experimental/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/libxul/files/patch-bug779847
branches/experimental/www/libxul/files/patch-bug781457
- copied, changed from r955, branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp
branches/experimental/www/libxul/files/patch-bug781474
- copied, changed from r955, branches/experimental/www/libxul/files/patch-content__base__public__nsContentUtils.h
branches/experimental/www/libxul/files/patch-bug783463
branches/experimental/www/libxul/files/patch-bug785638
branches/experimental/www/libxul19/files/patch-bug761077
branches/experimental/www/libxul19/files/patch-bug778078
- copied, changed from r955, branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/libxul19/files/patch-bug781457
- copied, changed from r955, branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp
branches/experimental/www/seamonkey/files/patch-bug722975
- copied, changed from r955, branches/experimental/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp
branches/experimental/www/seamonkey/files/patch-bug759459
branches/experimental/www/seamonkey/files/patch-bug760899
- copied, changed from r955, branches/experimental/mail/thunderbird/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp
branches/experimental/www/seamonkey/files/patch-bug761077
branches/experimental/www/seamonkey/files/patch-bug761419
branches/experimental/www/seamonkey/files/patch-bug778056
- copied, changed from r955, branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
branches/experimental/www/seamonkey/files/patch-bug778078
- copied, changed from r955, branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/seamonkey/files/patch-bug779847
branches/experimental/www/seamonkey/files/patch-bug781457
- copied, changed from r955, branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
branches/experimental/www/seamonkey/files/patch-bug781474
- copied, changed from r955, branches/experimental/www/seamonkey/files/patch-mozilla__content__base__public__nsContentUtils.h
branches/experimental/www/seamonkey/files/patch-bug783463
branches/experimental/www/seamonkey/files/patch-bug785638
Deleted:
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-time_posix.cc
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-gfx-ycbcr-Makefile.in
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-jscpucfg.h
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.c
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.h
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-widget-src-qt-nsNativeThemeQt.cpp
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-widget-src-qt-nsSound.cpp
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
branches/experimental/mail/thunderbird-esr/files/patch-mozilla__content__base__public__nsContentUtils.h
branches/experimental/mail/thunderbird/files/patch-gfx-skia-Makefile.in
branches/experimental/mail/thunderbird/files/patch-mail-components-Makefile.in
branches/experimental/mail/thunderbird/files/patch-mail-components-build-Makefile.in
branches/experimental/mail/thunderbird/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-gfx-ycbcr-Makefile.in
branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-gc-Memory.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-media-libvpx-vpx_config.c
branches/experimental/mail/thunderbird/files/patch-mozilla-media-libvpx-vpx_config.h
branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsSound.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
branches/experimental/mail/thunderbird/files/patch-mozilla__content__base__public__nsContentUtils.h
branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
branches/experimental/www/firefox-esr/files/patch-content__base__public__nsContentUtils.h
branches/experimental/www/firefox-esr/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp
branches/experimental/www/firefox-esr/files/patch-gfx-ycbcr-Makefile.in
branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc
branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-time_posix.cc
branches/experimental/www/firefox-esr/files/patch-js-src-jscpucfg.h
branches/experimental/www/firefox-esr/files/patch-media-libvpx-vpx_config.c
branches/experimental/www/firefox-esr/files/patch-media-libvpx-vpx_config.h
branches/experimental/www/firefox-esr/files/patch-memory-mozalloc-mozalloc.cpp
branches/experimental/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsNativeThemeQt.cpp
branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsSound.cpp
branches/experimental/www/firefox-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
branches/experimental/www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
branches/experimental/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp
branches/experimental/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
branches/experimental/www/firefox-nightly/files/patch-gfx-skia-Makefile.in
branches/experimental/www/firefox-nightly/files/patch-gfx-thebes-gfxPlatform.cpp
branches/experimental/www/firefox-nightly/files/patch-media-libvpx-vpx_config.c
branches/experimental/www/firefox-nightly/files/patch-media-libvpx-vpx_config.h
branches/experimental/www/firefox-nightly/files/patch-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsNativeThemeQt.cpp
branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsSound.cpp
branches/experimental/www/firefox/files/patch-content-media-gstreamer-nsGStreamerReader.cpp
branches/experimental/www/firefox/files/patch-content__base__public__nsContentUtils.h
branches/experimental/www/firefox/files/patch-gfx-skia-Makefile.in
branches/experimental/www/firefox/files/patch-gfx-thebes-gfxPlatform.cpp
branches/experimental/www/firefox/files/patch-gfx-ycbcr-Makefile.in
branches/experimental/www/firefox/files/patch-js-src-gc-Memory.cpp
branches/experimental/www/firefox/files/patch-media-libvpx-vpx_config.c
branches/experimental/www/firefox/files/patch-media-libvpx-vpx_config.h
branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp
branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/firefox/files/patch-widget-qt-nsNativeThemeQt.cpp
branches/experimental/www/firefox/files/patch-widget-qt-nsSound.cpp
branches/experimental/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
branches/experimental/www/firefox/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp
branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/firefox36/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
branches/experimental/www/firefox36/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
branches/experimental/www/firefox36/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
branches/experimental/www/libxul/files/patch-content__base__public__nsContentUtils.h
branches/experimental/www/libxul/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp
branches/experimental/www/libxul/files/patch-gfx-ycbcr-Makefile.in
branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-file_util_linux.cc
branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-time_posix.cc
branches/experimental/www/libxul/files/patch-js-src-jscpucfg.h
branches/experimental/www/libxul/files/patch-media-libvpx-vpx_config.c
branches/experimental/www/libxul/files/patch-media-libvpx-vpx_config.h
branches/experimental/www/libxul/files/patch-memory-mozalloc-mozalloc.cpp
branches/experimental/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/libxul/files/patch-widget-src-qt-nsNativeThemeQt.cpp
branches/experimental/www/libxul/files/patch-widget-src-qt-nsSound.cpp
branches/experimental/www/libxul/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
branches/experimental/www/libxul/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp
branches/experimental/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
branches/experimental/www/libxul19/files/patch-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/libxul19/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc
branches/experimental/www/libxul19/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
branches/experimental/www/seamonkey/files/patch-gfx-skia-Makefile.in
branches/experimental/www/seamonkey/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-gfx-ycbcr-Makefile.in
branches/experimental/www/seamonkey/files/patch-mozilla-js-src-gc-Memory.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c
branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h
branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsSound.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
branches/experimental/www/seamonkey/files/patch-mozilla__content__base__public__nsContentUtils.h
Modified:
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in
branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
branches/experimental/www/firefox-esr/files/patch-configure.in
branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
branches/experimental/www/firefox-nightly/files/patch-configure.in
branches/experimental/www/firefox/files/patch-configure.in
branches/experimental/www/firefox36/files/patch-xpcom_base_nsStackWalk.cpp
branches/experimental/www/libxul/files/patch-configure.in
branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-configure.in
Added: branches/experimental/mail/thunderbird-esr/files/patch-bug714312
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-bug714312 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,73 @@
+commit c104d9b
+Author: Landry Breuil <landry@openbsd.org>
+Date: Mon Jan 9 17:32:00 2012 -0600
+
+ Bug 714312 - Use <machine/endian.h> to get endianess on BSD systems, fixing the BSD build. r=ted
+
+ --HG--
+ extra : rebase_source : 8b418bdb2d713093d138ffed20bf1630c05f396b
+---
+ js/src/configure.in | 5 +++++
+ js/src/js-config.h.in | 4 ++++
+ js/src/jscpucfg.h | 17 +++++++++++++++++
+ 3 files changed, 26 insertions(+)
+
+diff --git mozilla/js/src/configure.in mozilla/js/src/configure.in
+index 164c896..361b29e 100644
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -2934,6 +2934,11 @@ if test "$ac_cv_header_endian_h" = yes;
+ AC_DEFINE(JS_HAVE_ENDIAN_H)
+ fi
+
++AC_CHECK_HEADERS(machine/endian.h)
++if test "$ac_cv_header_machine_endian_h" = yes; then
++ AC_DEFINE(JS_HAVE_MACHINE_ENDIAN_H)
++fi
++
+ AC_CHECK_HEADERS(sys/isa_defs.h)
+ if test "$ac_cv_header_sys_isa_defs_h" = yes; then
+ AC_DEFINE(JS_HAVE_SYS_ISA_DEFS_H)
+diff --git mozilla/js/src/js-config.h.in mozilla/js/src/js-config.h.in
+index fb009fa..402262e 100644
+--- mozilla/js/src/js-config.h.in
++++ mozilla/js/src/js-config.h.in
+@@ -59,6 +59,10 @@
+ useable. See jscpucfg.h. */
+ #undef JS_HAVE_ENDIAN_H
+
++/* Define to 1 if the <machine/endian.h> header is present and
++ useable. See jscpucfg.h. */
++#undef JS_HAVE_MACHINE_ENDIAN_H
++
+ /* Define to 1 if the <sys/isa_defs.h> header is present and
+ useable. See jscpucfg.h. */
+ #undef JS_HAVE_SYS_ISA_DEFS_H
+diff --git mozilla/js/src/jscpucfg.h mozilla/js/src/jscpucfg.h
+index dd32bce..5fd8415 100644
+--- mozilla/js/src/jscpucfg.h
++++ mozilla/js/src/jscpucfg.h
+@@ -92,6 +92,23 @@
+ # error "endian.h does not define __BYTE_ORDER. Cannot determine endianness."
+ # endif
+
++/* BSDs */
++#elif defined(JS_HAVE_MACHINE_ENDIAN_H)
++# include <sys/types.h>
++# include <machine/endian.h>
++
++# if defined(_BYTE_ORDER)
++# if _BYTE_ORDER == _LITTLE_ENDIAN
++# define IS_LITTLE_ENDIAN 1
++# undef IS_BIG_ENDIAN
++# elif _BYTE_ORDER == _BIG_ENDIAN
++# undef IS_LITTLE_ENDIAN
++# define IS_BIG_ENDIAN 1
++# endif
++# else /* !defined(_BYTE_ORDER) */
++# error "machine/endian.h does not define _BYTE_ORDER. Cannot determine endianness."
++# endif
++
+ #elif defined(JS_HAVE_SYS_ISA_DEFS_H)
+ # include <sys/isa_defs.h>
+
Added: branches/experimental/mail/thunderbird-esr/files/patch-bug725655
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-bug725655 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,53 @@
+commit 18b9c9d
+Author: Martin Stránský <stransky@redhat.com>
+Date: Fri Feb 10 16:07:41 2012 +0100
+
+ Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
+---
+ ipc/chromium/src/base/file_util_linux.cc | 3 +++
+ ipc/chromium/src/base/message_pump_libevent.cc | 3 +++
+ ipc/chromium/src/base/time_posix.cc | 3 +++
+ 3 files changed, 9 insertions(+)
+
+diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc
+index cca706f..171e44f 100644
+--- mozilla/ipc/chromium/src/base/file_util_linux.cc
++++ mozilla/ipc/chromium/src/base/file_util_linux.cc
+@@ -5,6 +5,9 @@
+ #include "base/file_util.h"
+
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include <string>
+ #include <vector>
+diff --git mozilla/ipc/chromium/src/base/message_pump_libevent.cc mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+index 6194f79..9f31dbb 100644
+--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc
++++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+@@ -6,6 +6,9 @@
+
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
+diff --git mozilla/ipc/chromium/src/base/time_posix.cc mozilla/ipc/chromium/src/base/time_posix.cc
+index 8d1a1d5..abf2a56 100644
+--- mozilla/ipc/chromium/src/base/time_posix.cc
++++ mozilla/ipc/chromium/src/base/time_posix.cc
+@@ -13,6 +13,9 @@
+ #else
+ #include <time.h>
+ #endif
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include <limits>
+
Added: branches/experimental/mail/thunderbird-esr/files/patch-bug729155
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-bug729155 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,18 @@
+--- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp
++++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp
+@@ -114,6 +114,7 @@ MediateRace(const RPCChannel::Message& parent,
+ }
+ }
+
++#if defined(OS_LINUX)
+ static string
+ ReplaceAll(const string& haystack, const string& needle, const string& with)
+ {
+@@ -127,6 +128,7 @@ ReplaceAll(const string& haystack, const string& needle, const string& with)
+
+ return munged;
+ }
++#endif
+
+ string
+ MungePluginDsoPath(const string& path)
Added: branches/experimental/mail/thunderbird-esr/files/patch-bug761077
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-bug761077 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,88 @@
+diff --git mozilla/xpcom/reflect/xptcall/public/genstubs.pl mozilla/xpcom/reflect/xptcall/public/genstubs.pl
+index b8a87a5..918c4cf 100644
+--- mozilla/xpcom/reflect/xptcall/public/genstubs.pl
++++ mozilla/xpcom/reflect/xptcall/public/genstubs.pl
+@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n";
+ print OUTFILE "* 1 is AddRef\n";
+ print OUTFILE "* 2 is Release\n";
+ print OUTFILE "*/\n";
+-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
+ for($i = 0; $i < $entry_count; $i++) {
+ print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
+ }
+diff --git mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+index eb66761..807db26 100644
+--- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
++++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+@@ -8,7 +8,7 @@
+ * 1 is AddRef
+ * 2 is Release
+ */
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ NS_IMETHOD Stub3();
+ NS_IMETHOD Stub4();
+ NS_IMETHOD Stub5();
+diff --git mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+index ae6ed66..2783957 100644
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -70,7 +70,7 @@ endif
+ 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
+@@ -269,7 +269,7 @@ endif
+ #
+ # 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
+@@ -278,7 +278,7 @@ endif
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS := $(CC) -c -x assembler-with-cpp
+@@ -350,7 +350,7 @@ endif
+ #
+ # OpenBSD/SPARC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
+ endif
+diff --git mozilla/xpcom/reflect/xptcall/src/xptcprivate.h mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
+index d903ced..e4ec832 100644
+--- mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
++++ mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
+@@ -14,7 +14,7 @@
+
+ class xptiInterfaceEntry;
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
+@@ -31,7 +31,7 @@ public:
+ #undef STUB_ENTRY
+ #undef SENTINEL_ENTRY
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Copied and modified: branches/experimental/mail/thunderbird-esr/files/patch-bug778056 (from r955, branches/experimental/mail/thunderbird-esr/files/patch-mozilla-memory-mozalloc-mozalloc.cpp)
==============================================================================
Copied and modified: branches/experimental/mail/thunderbird-esr/files/patch-bug778078 (from r955, branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp)
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/mail/thunderbird-esr/files/patch-bug778078 Tue Aug 28 15:25:15 2012 (r956)
@@ -5,7 +5,7 @@
#endif
#if defined(MOZ_WIDGET_GTK2)
-#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
// Disable the slice allocator, since jemalloc already uses similar layout
// algorithms, and using a sub-allocator tends to increase fragmentation.
// This must be done before g_thread_init() is called.
Added: branches/experimental/mail/thunderbird-esr/files/patch-bug779847
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-bug779847 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,28 @@
+--- mozilla/gfx/ycbcr/Makefile.in
++++ mozilla/gfx/ycbcr/Makefile.in
+@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \
+ $(NULL)
+ endif
+ else
+-ifeq ($(OS_ARCH),Linux)
+-CPPSRCS += yuv_row_posix.cpp \
+- $(NULL)
+-else
+-ifeq ($(OS_ARCH),SunOS)
+-CPPSRCS += yuv_row_posix.cpp \
+- $(NULL)
+-else
+-ifeq ($(OS_ARCH),Darwin)
++ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH)))
+ CPPSRCS += yuv_row_posix.cpp \
+ $(NULL)
+ else
+ CPPSRCS += yuv_row_other.cpp \
+ $(NULL)
+-endif # Darwin
+-endif # SunOS
+-endif # linux
++endif # posix
+ endif # windows
+
+ ifeq (arm,$(findstring arm,$(OS_TEST)))
Copied and modified: branches/experimental/mail/thunderbird-esr/files/patch-bug781457 (from r955, branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp)
==============================================================================
Copied and modified: branches/experimental/mail/thunderbird-esr/files/patch-bug781474 (from r955, branches/experimental/mail/thunderbird-esr/files/patch-mozilla__content__base__public__nsContentUtils.h)
==============================================================================
Added: branches/experimental/mail/thunderbird-esr/files/patch-bug783463
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-bug783463 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,20 @@
+--- mozilla/widget/src/qt/nsNativeThemeQt.cpp~
++++ mozilla/widget/src/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,6 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
+-#include <malloc.h>
+
+
+ #include "gfxASurface.h"
+--- mozilla/widget/src/qt/nsSound.cpp~
++++ mozilla/widget/src/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Added: branches/experimental/mail/thunderbird-esr/files/patch-bug785638
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-bug785638 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,168 @@
+diff --git configure.in configure.in
+index cef992b..3bd39ca 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -5353,22 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+
+ dnl See if we have assembly on this platform.
+ case "$OS_ARCH:$CPU_ARCH" in
+- Linux:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+ Darwin:x86)
+ VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC"
+ VPX_X86_ASM=1
+@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+ VPX_ASM_SUFFIX="$ASM_SUFFIX"
+ VPX_ARM_ASM=1
+ fi
++ ;;
++ *:x86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
++ VPX_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
++ VPX_X86_ASM=1
++ fi
++ ;;
+ esac
+
+ if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then
+@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+
+ dnl Do we support libjpeg-turbo on this platform?
+ case "$OS_ARCH:$OS_TEST" in
+- Linux:x86|Linux:i?86)
+- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+- LIBJPEG_TURBO_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- 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
+- ;;
+- SunOS:x86_64)
+- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+- LIBJPEG_TURBO_X64_ASM=1
+- ;;
+ Darwin:i?86)
+ LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO"
+ LIBJPEG_TURBO_X86_ASM=1
+@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+ LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon"
+ LIBJPEG_TURBO_ARM_ASM=1
+ ;;
++ *:x86|*:i?86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++ LIBJPEG_TURBO_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++ LIBJPEG_TURBO_X64_ASM=1
++ fi
++ ;;
+ esac
+
+ fi
+diff --git media/libvpx/update.sh media/libvpx/update.sh
+index 79e0fb1..51956af 100755
+--- mozilla/media/libvpx/update.sh
++++ mozilla/media/libvpx/update.sh
+@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h
+ # Should be same for all platforms...
+ cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h
+
+-# Config files for x86-linux-gcc and Solaris x86
++# Config files for x86-linux-gcc and other x86 elf platforms
+ cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c
+ cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm
+ cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h
+
+-# Config files for x86_64-linux-gcc and Solaris x86_64
++# Config files for x86_64-linux-gcc and other x86_64 elf platforms
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h
+diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h
+index 55433f3..36e1780 100644
+--- mozilla/media/libvpx/vpx_config.h
++++ mozilla/media/libvpx/vpx_config.h
+@@ -16,20 +16,12 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.h"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.h"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.h"
+
+ #else
+diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c
+index eedd515..c8b5375 100644
+--- mozilla/media/libvpx/vpx_config_c.c
++++ mozilla/media/libvpx/vpx_config_c.c
+@@ -12,22 +12,14 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.c"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.c"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.c"
+
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+ #elif defined(_MSC_VER) && defined(_M_X64)
+ #include "vpx_config_x86_64-win64-vs8.c"
+
Deleted: 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 Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,8 +0,0 @@
---- mozilla/ipc/chromium/src/base/file_util_linux.cc~
-+++ mozilla/ipc/chromium/src/base/file_util_linux.cc
-@@ -5,6 +5,7 @@
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#include <unistd.h>
-
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-time_posix.cc
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-time_posix.cc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- 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
Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in Tue Aug 28 15:24:27 2012 (r955)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in Tue Aug 28 15:25:15 2012 (r956)
@@ -50,33 +50,3 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -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:x86_64)
-+ 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:x86_64)
-+ 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
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- 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
-
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-gfx-ycbcr-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-gfx-ycbcr-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- mozilla/gfx/ycbcr/Makefile.in~
-+++ mozilla/gfx/ycbcr/Makefile.in
-@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
- else
-+ifeq ($(OS_ARCH),FreeBSD)
-+CPPSRCS += yuv_row_posix.cpp \
-+ $(NULL)
-+else
- ifeq ($(OS_ARCH),SunOS)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
-@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \
- $(NULL)
- endif # Darwin
- endif # SunOS
-+endif # FreeBSD
- endif # linux
- endif # windows
-
\ No newline at end of file
Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Tue Aug 28 15:24:27 2012 (r955)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Tue Aug 28 15:25:15 2012 (r956)
@@ -1,13 +1,5 @@
--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
+++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -6,6 +6,7 @@
-
- #include <errno.h>
- #include <fcntl.h>
-+#include <unistd.h>
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
@@ -15,7 +15,7 @@
#include "base/scoped_nsautorelease_pool.h"
#include "base/scoped_ptr.h"
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-jscpucfg.h
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-jscpucfg.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,22 +0,0 @@
---- mozilla/js/src/jscpucfg.h.orig 2012-01-18 17:38:54.409461514 +0100
-+++ mozilla/js/src/jscpucfg.h 2012-01-18 17:38:59.522462164 +0100
-@@ -77,6 +77,19 @@
- #define IS_BIG_ENDIAN 1
- #endif
-
-+#elif defined(__FreeBSD__)
-+#include <sys/endian.h>
-+
-+#if defined(BYTE_ORDER)
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
-+#elif BYTE_ORDER == BIG_ENDIAN
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#endif
-+#endif
-+
- #elif defined(JS_HAVE_ENDIAN_H)
- #include <endian.h>
-
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.c
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.c Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- 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"
-
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.h
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- 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"
-
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- mozilla/memory/mozalloc/mozalloc.cpp~
-+++ mozilla/memory/mozalloc/mozalloc.cpp
-@@ -52,6 +52,9 @@
- #if defined(XP_UNIX)
- # include <unistd.h> // for valloc on *BSD
- #endif //if defined(XP_UNIX)
-+#ifdef __FreeBSD__
-+# include <malloc_np.h> // for malloc_usable_size
-+#endif
-
- #if defined(MOZ_MEMORY)
- // jemalloc.h doesn't redeclare symbols if they're provided by the OS
-@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
-
- #if defined(XP_MACOSX)
- return malloc_size(ptr);
--#elif defined(MOZ_MEMORY)
-+#elif defined(MOZ_MEMORY) || defined(__FreeBSD__)
- return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
- return _msize(ptr);
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/toolkit/xre/nsAppRunner.cpp~
-+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n
- gQtOnlyArgv[gQtOnlyArgc] = nsnull;
- #endif
- #if defined(MOZ_WIDGET_GTK2)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-widget-src-qt-nsNativeThemeQt.cpp
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-widget-src-qt-nsNativeThemeQt.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- mozilla/widget/src/qt/nsNativeThemeQt.cpp~
-+++ mozilla/widget/src/qt/nsNativeThemeQt.cpp
-@@ -25,7 +25,9 @@
- #include "nsThemeConstants.h"
- #include "nsIServiceManager.h"
- #include "nsIDOMHTMLInputElement.h"
-+#ifdef __GLIBC__
- #include <malloc.h>
-+#endif
-
-
- #include "gfxASurface.h"
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-widget-src-qt-nsSound.cpp
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-widget-src-qt-nsSound.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- mozilla/widget/src/qt/nsSound.cpp~
-+++ mozilla/widget/src/qt/nsSound.cpp
-@@ -40,6 +40,7 @@
- #include <QSound>
-
- #include <string.h>
-+#include <unistd.h>
-
- #include "nscore.h"
- #include "plstr.h"
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- mozilla/xpcom/base/nsStackWalk.cpp.orig 2010-09-12 19:34:04.012503905 +0300
-+++ mozilla/xpcom/base/nsStackWalk.cpp 2010-09-12 19:34:41.294462134 +0300
-@@ -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>
-
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,38 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200
-@@ -70,7 +70,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
-@@ -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
-@@ -350,7 +365,7 @@
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -350,7 +350,7 @@
- #
- # OpenBSD/SPARC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
- ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
- endif
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla__content__base__public__nsContentUtils.h
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla__content__base__public__nsContentUtils.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200
-+++ mozilla/content/base/public/nsContentUtils.h 2011-07-07 10:46:12.000000000 +0200
-@@ -54,7 +54,7 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
-+#if !defined(__amd64__) && !defined(__i386__)
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #else
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Copied and modified: branches/experimental/mail/thunderbird/files/patch-bug722975 (from r955, branches/experimental/mail/thunderbird/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp)
==============================================================================
Added: branches/experimental/mail/thunderbird/files/patch-bug759459
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-bug759459 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,24 @@
+commit 4d0c5b9
+Author: Marco Perez <bugmail@millibyte.net>
+Date: Sat Jun 9 12:24:56 2012 -0400
+
+ Bug 759459 - Build broken on FreeBSD since patch for bug 745034 landed. r=terrence
+---
+ js/src/gc/Memory.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp
+index 815e90b..10c1a91 100644
+--- mozilla/js/src/gc/Memory.cpp
++++ mozilla/js/src/gc/Memory.cpp
+@@ -292,9 +292,9 @@ GetPageFaultCount()
+ #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN)
+
+ #include <sys/mman.h>
+-#include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
++#include <unistd.h>
+
+ void
+ InitMemorySubsystem()
Copied and modified: branches/experimental/mail/thunderbird/files/patch-bug760899 (from r955, branches/experimental/www/seamonkey/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp)
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/mail/thunderbird/files/patch-bug760899 Tue Aug 28 15:25:15 2012 (r956)
@@ -1,25 +1,3 @@
-commit f0a73aa
-Author: Paul Adenot <paul@paul.cx>
-Date: Thu Jun 21 20:44:39 2012 -0400
-
- Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik
----
- content/media/gstreamer/nsGStreamerReader.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 06a09b5..c48f92e 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- * stream but that are otherwise decodeable.
- */
- guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
-- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
-+ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
- guint default_flags, current_flags;
- g_object_get(mPlayBin, "flags", &default_flags, NULL);
-
commit 667daed
Author: Stephen Moehle <stephen.moehle@gmail.com>
Date: Tue Jun 5 11:32:36 2012 +1200
Added: branches/experimental/mail/thunderbird/files/patch-bug761077
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-bug761077 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,88 @@
+diff --git mozilla/xpcom/reflect/xptcall/public/genstubs.pl mozilla/xpcom/reflect/xptcall/public/genstubs.pl
+index b8a87a5..918c4cf 100644
+--- mozilla/xpcom/reflect/xptcall/public/genstubs.pl
++++ mozilla/xpcom/reflect/xptcall/public/genstubs.pl
+@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n";
+ print OUTFILE "* 1 is AddRef\n";
+ print OUTFILE "* 2 is Release\n";
+ print OUTFILE "*/\n";
+-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
+ for($i = 0; $i < $entry_count; $i++) {
+ print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
+ }
+diff --git mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+index eb66761..807db26 100644
+--- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
++++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+@@ -8,7 +8,7 @@
+ * 1 is AddRef
+ * 2 is Release
+ */
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ NS_IMETHOD Stub3();
+ NS_IMETHOD Stub4();
+ NS_IMETHOD Stub5();
+diff --git mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+index ae6ed66..2783957 100644
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -70,7 +70,7 @@ endif
+ 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
+@@ -269,7 +269,7 @@ endif
+ #
+ # 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
+@@ -278,7 +278,7 @@ endif
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS := $(CC) -c -x assembler-with-cpp
+@@ -350,7 +350,7 @@ endif
+ #
+ # OpenBSD/SPARC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
+ endif
+diff --git mozilla/xpcom/reflect/xptcall/src/xptcprivate.h mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
+index d903ced..e4ec832 100644
+--- mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
++++ mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
+@@ -14,7 +14,7 @@
+
+ class xptiInterfaceEntry;
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
+@@ -31,7 +31,7 @@ public:
+ #undef STUB_ENTRY
+ #undef SENTINEL_ENTRY
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Added: branches/experimental/mail/thunderbird/files/patch-bug761419
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-bug761419 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,22 @@
+commit f0a73aa
+Author: Paul Adenot <paul@paul.cx>
+Date: Thu Jun 21 20:44:39 2012 -0400
+
+ Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik
+---
+ content/media/gstreamer/nsGStreamerReader.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
+index 06a09b5..c48f92e 100644
+--- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
++++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
+@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
+ * stream but that are otherwise decodeable.
+ */
+ guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
+- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
++ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
+ guint default_flags, current_flags;
+ g_object_get(mPlayBin, "flags", &default_flags, NULL);
+
Copied and modified: branches/experimental/mail/thunderbird/files/patch-bug778056 (from r955, branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp)
==============================================================================
Copied and modified: branches/experimental/mail/thunderbird/files/patch-bug778078 (from r955, branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp)
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/mail/thunderbird/files/patch-bug778078 Tue Aug 28 15:25:15 2012 (r956)
@@ -5,7 +5,7 @@
#if defined(MOZ_WIDGET_GTK2)
-#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
// Disable the slice allocator, since jemalloc already uses similar layout
// algorithms, and using a sub-allocator tends to increase fragmentation.
// This must be done before g_thread_init() is called.
Added: branches/experimental/mail/thunderbird/files/patch-bug779847
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-bug779847 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,28 @@
+--- mozilla/gfx/ycbcr/Makefile.in
++++ mozilla/gfx/ycbcr/Makefile.in
+@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \
+ $(NULL)
+ endif
+ else
+-ifeq ($(OS_ARCH),Linux)
+-CPPSRCS += yuv_row_posix.cpp \
+- $(NULL)
+-else
+-ifeq ($(OS_ARCH),SunOS)
+-CPPSRCS += yuv_row_posix.cpp \
+- $(NULL)
+-else
+-ifeq ($(OS_ARCH),Darwin)
++ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH)))
+ CPPSRCS += yuv_row_posix.cpp \
+ $(NULL)
+ else
+ CPPSRCS += yuv_row_other.cpp \
+ $(NULL)
+-endif # Darwin
+-endif # SunOS
+-endif # linux
++endif # posix
+ endif # windows
+
+ ifeq (arm,$(findstring arm,$(OS_TEST)))
Copied and modified: branches/experimental/mail/thunderbird/files/patch-bug781457 (from r955, branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp)
==============================================================================
Copied and modified: branches/experimental/mail/thunderbird/files/patch-bug781474 (from r955, branches/experimental/mail/thunderbird/files/patch-mozilla__content__base__public__nsContentUtils.h)
==============================================================================
Added: branches/experimental/mail/thunderbird/files/patch-bug783463
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-bug783463 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,34 @@
+--- mozilla/gfx/skia/Makefile.in~
++++ mozilla/gfx/skia/Makefile.in
+@@ -339,10 +339,9 @@ CPPSRCS += \
+ SkMMapStream.cpp \
+ SkOSFile.cpp \
+ $(NULL)
+-ifeq (Linux,$(OS_TARGET))
++ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET))))
+ CPPSRCS += \
+ SkFontHost_linux.cpp \
+- SkFontHost_tables.cpp \
+ SkTime_Unix.cpp \
+ $(NULL)
+ endif
+--- mozilla/widget/qt/nsNativeThemeQt.cpp~
++++ mozilla/widget/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,6 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
+-#include <malloc.h>
+
+
+ #include "gfxASurface.h"
+--- mozilla/widget/qt/nsSound.cpp~
++++ mozilla/widget/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Copied and modified: branches/experimental/mail/thunderbird/files/patch-bug783571 (from r955, branches/experimental/mail/thunderbird/files/patch-mail-components-Makefile.in)
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mail-components-Makefile.in Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/mail/thunderbird/files/patch-bug783571 Tue Aug 28 15:25:15 2012 (r956)
@@ -9,3 +9,14 @@
DIRS += shell
endif
+--- mail/components/build/Makefile.in~
++++ mail/components/build/Makefile.in
+@@ -78,7 +78,7 @@ SHARED_LIBRARY_LIBS = \
+ ../migration/src/$(LIB_PREFIX)profilemigration_s.$(LIB_SUFFIX) \
+ $(NULL)
+
+-ifneq (,$(filter windows cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
++ifneq (,$(filter windows cocoa gtk2 qt, $(MOZ_WIDGET_TOOLKIT)))
+ SHARED_LIBRARY_LIBS += ../shell/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
+ endif
+
Added: branches/experimental/mail/thunderbird/files/patch-bug785638
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-bug785638 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,168 @@
+diff --git configure.in configure.in
+index cef992b..3bd39ca 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -5353,22 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+
+ dnl See if we have assembly on this platform.
+ case "$OS_ARCH:$CPU_ARCH" in
+- Linux:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+ Darwin:x86)
+ VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC"
+ VPX_X86_ASM=1
+@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+ VPX_ASM_SUFFIX="$ASM_SUFFIX"
+ VPX_ARM_ASM=1
+ fi
++ ;;
++ *:x86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
++ VPX_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
++ VPX_X86_ASM=1
++ fi
++ ;;
+ esac
+
+ if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then
+@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+
+ dnl Do we support libjpeg-turbo on this platform?
+ case "$OS_ARCH:$OS_TEST" in
+- Linux:x86|Linux:i?86)
+- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+- LIBJPEG_TURBO_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- 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
+- ;;
+- SunOS:x86_64)
+- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+- LIBJPEG_TURBO_X64_ASM=1
+- ;;
+ Darwin:i?86)
+ LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO"
+ LIBJPEG_TURBO_X86_ASM=1
+@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+ LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon"
+ LIBJPEG_TURBO_ARM_ASM=1
+ ;;
++ *:x86|*:i?86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++ LIBJPEG_TURBO_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++ LIBJPEG_TURBO_X64_ASM=1
++ fi
++ ;;
+ esac
+
+ fi
+diff --git media/libvpx/update.sh media/libvpx/update.sh
+index 79e0fb1..51956af 100755
+--- mozilla/media/libvpx/update.sh
++++ mozilla/media/libvpx/update.sh
+@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h
+ # Should be same for all platforms...
+ cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h
+
+-# Config files for x86-linux-gcc and Solaris x86
++# Config files for x86-linux-gcc and other x86 elf platforms
+ cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c
+ cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm
+ cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h
+
+-# Config files for x86_64-linux-gcc and Solaris x86_64
++# Config files for x86_64-linux-gcc and other x86_64 elf platforms
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h
+diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h
+index 55433f3..36e1780 100644
+--- mozilla/media/libvpx/vpx_config.h
++++ mozilla/media/libvpx/vpx_config.h
+@@ -16,20 +16,12 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.h"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.h"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.h"
+
+ #else
+diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c
+index eedd515..c8b5375 100644
+--- mozilla/media/libvpx/vpx_config_c.c
++++ mozilla/media/libvpx/vpx_config_c.c
+@@ -15,22 +15,14 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.c"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.c"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.c"
+
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+ #else
+ #error VPX_X86_ASM is defined, but assembly not supported on this platform!
+ #endif
Deleted: branches/experimental/mail/thunderbird/files/patch-gfx-skia-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-gfx-skia-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/gfx/skia/Makefile.in~
-+++ mozilla/gfx/skia/Makefile.in
-@@ -339,7 +339,7 @@ CPPSRCS += \
- SkMMapStream.cpp \
- SkOSFile.cpp \
- $(NULL)
--ifeq (Linux,$(OS_TARGET))
-+ifneq (,$(MOZ_X11))
- CPPSRCS += \
- SkFontHost_linux.cpp \
- SkFontHost_tables.cpp \
Deleted: branches/experimental/mail/thunderbird/files/patch-mail-components-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mail-components-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mail/components/Makefile.in~
-+++ mail/components/Makefile.in
-@@ -46,7 +46,7 @@ include $(DEPTH)/config/autoconf.mk
- # least one module from search/ on all platforms
- DIRS = compose cloudfile preferences addrbook migration activity search about-support wintaskbar newmailaccount im
-
--ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
-+ifneq (,$(filter windows gtk2 cocoa qt, $(MOZ_WIDGET_TOOLKIT)))
- DIRS += shell
- endif
-
Deleted: branches/experimental/mail/thunderbird/files/patch-mail-components-build-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mail-components-build-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mail/components/build/Makefile.in~
-+++ mail/components/build/Makefile.in
-@@ -78,7 +78,7 @@ SHARED_LIBRARY_LIBS = \
- ../migration/src/$(LIB_PREFIX)profilemigration_s.$(LIB_SUFFIX) \
- $(NULL)
-
--ifneq (,$(filter windows cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
-+ifneq (,$(filter windows cocoa gtk2 qt, $(MOZ_WIDGET_TOOLKIT)))
- SHARED_LIBRARY_LIBS += ../shell/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
- endif
-
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Tue Aug 28 15:24:27 2012 (r955)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Tue Aug 28 15:25:15 2012 (r956)
@@ -23,33 +23,3 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -5903,6 +5903,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:x86_64)
-+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
-+ VPX_X86_ASM=1
-+ ;;
- SunOS:x86)
- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
- VPX_X86_ASM=1
-@@ -6297,6 +6305,14 @@
- 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:x86_64)
-+ 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
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,76 +0,0 @@
-commit f0a73aa
-Author: Paul Adenot <paul@paul.cx>
-Date: Thu Jun 21 20:44:39 2012 -0400
-
- Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik
----
- content/media/gstreamer/nsGStreamerReader.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 06a09b5..c48f92e 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- * stream but that are otherwise decodeable.
- */
- guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
-- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
-+ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
- guint default_flags, current_flags;
- g_object_get(mPlayBin, "flags", &default_flags, NULL);
-
-commit 667daed
-Author: Stephen Moehle <stephen.moehle@gmail.com>
-Date: Tue Jun 5 11:32:36 2012 +1200
-
- Bug 760899 - Fix debug builds with gstreamer enabled - r=kinetik
-
- --HG--
- extra : rebase_source : 22598bc470d35d94991ea9f1b14df11ba19a461a
----
- content/media/gstreamer/nsGStreamerReader.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 6a50e09..164fb2e 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -278,7 +278,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
- &format, &duration) && format == GST_FORMAT_TIME) {
- ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-- LOG(PR_LOG_DEBUG, ("returning duration %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("returning duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration)));
- duration = GST_TIME_AS_USECONDS (duration);
- mDecoder->GetStateMachine()->SetDuration(duration);
-@@ -422,8 +422,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
- nextTimestamp += gst_util_uint64_scale(GST_USECOND, fpsNum, fpsDen);
-
- if (timestamp < aTimeThreshold) {
-- LOG(PR_LOG_DEBUG, ("skipping frame %"GST_TIME_FORMAT
-- " threshold %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("skipping frame %" GST_TIME_FORMAT
-+ " threshold %" GST_TIME_FORMAT,
- GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold)));
- gst_buffer_unref(buffer);
- buffer = NULL;
-@@ -489,7 +489,7 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget,
- NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
-
- gint64 seekPos = aTarget * GST_USECOND;
-- LOG(PR_LOG_DEBUG, ("%p About to seek to %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("%p About to seek to %" GST_TIME_FORMAT,
- mDecoder, GST_TIME_ARGS(seekPos)));
-
- if (!gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME,
-@@ -592,7 +592,7 @@ PRInt64 nsGStreamerReader::QueryDuration()
- if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
- &format, &duration)) {
- if (format == GST_FORMAT_TIME) {
-- LOG(PR_LOG_DEBUG, ("pipeline duration %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("pipeline duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration)));
- duration = GST_TIME_AS_USECONDS (duration);
- }
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,34 +0,0 @@
---- mozilla/gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000
-+++ mozilla/gfx/thebes/gfxPlatform.cpp 2012-02-07 13:06:01.084668445 +0000
-@@ -446,6 +446,7 @@
- static_cast<SourceSurface*>(srcBuffer)->Release();
- }
-
-+#ifdef MOZ_TREE_CAIRO
- void SourceSnapshotDetached(cairo_surface_t *nullSurf)
- {
- gfxImageSurface* origSurf =
-@@ -453,6 +454,7 @@
-
- origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
-+#endif
-
- RefPtr<SourceSurface>
- gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
-@@ -522,6 +524,7 @@
- imgSurface->Stride(),
- format);
-
-+ #ifdef MOZ_TREE_CAIRO
- cairo_surface_t *nullSurf =
- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
- cairo_surface_set_user_data(nullSurf,
-@@ -530,6 +533,7 @@
- NULL);
- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
- cairo_surface_destroy(nullSurf);
-+ #endif
- }
-
- srcBuffer->AddRef();
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-gfx-ycbcr-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-gfx-ycbcr-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- mozilla/gfx/ycbcr/Makefile.in~
-+++ mozilla/gfx/ycbcr/Makefile.in
-@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
- else
-+ifeq ($(OS_ARCH),FreeBSD)
-+CPPSRCS += yuv_row_posix.cpp \
-+ $(NULL)
-+else
- ifeq ($(OS_ARCH),SunOS)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
-@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \
- $(NULL)
- endif # Darwin
- endif # SunOS
-+endif # FreeBSD
- endif # linux
- endif # windows
-
\ No newline at end of file
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-gc-Memory.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-gc-Memory.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- mozilla/js/src/gc/Memory.cpp~
-+++ mozilla/js/src/gc/Memory.cpp
-@@ -292,9 +292,9 @@ GetPageFaultCount()
- #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN)
-
- #include <sys/mman.h>
--#include <unistd.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-+#include <unistd.h>
-
- void
- InitMemorySubsystem()
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-media-libvpx-vpx_config.c
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-media-libvpx-vpx_config.c Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- 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"
-
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-media-libvpx-vpx_config.h
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-media-libvpx-vpx_config.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- 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"
-
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- mozilla/memory/mozalloc/mozalloc.cpp~
-+++ mozilla/memory/mozalloc/mozalloc.cpp
-@@ -19,6 +19,9 @@
- #if defined(XP_UNIX)
- # include <unistd.h> // for valloc on *BSD
- #endif //if defined(XP_UNIX)
-+#ifdef __FreeBSD__
-+# include <malloc_np.h> // for malloc_usable_size
-+#endif
-
- #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
- # define MOZALLOC_EXPORT __declspec(dllexport)
-@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr)
-
- #if defined(XP_MACOSX)
- return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
-+#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
- // Android bionic libc doesn't have malloc_usable_size.
- return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/toolkit/xre/nsAppRunner.cpp~
-+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -3819,7 +3819,7 @@ XREMain::XRE_main(int argc, char* argv[]
- ScopedLogging log;
-
- #if defined(MOZ_WIDGET_GTK2)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- mozilla/widget/qt/nsNativeThemeQt.cpp~
-+++ mozilla/widget/qt/nsNativeThemeQt.cpp
-@@ -25,7 +25,9 @@
- #include "nsThemeConstants.h"
- #include "nsIServiceManager.h"
- #include "nsIDOMHTMLInputElement.h"
-+#ifdef __GLIBC__
- #include <malloc.h>
-+#endif
-
-
- #include "gfxASurface.h"
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsSound.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsSound.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- mozilla/widget/qt/nsSound.cpp~
-+++ mozilla/widget/qt/nsSound.cpp
-@@ -40,6 +40,7 @@
- #include <QSound>
-
- #include <string.h>
-+#include <unistd.h>
-
- #include "nscore.h"
- #include "plstr.h"
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- mozilla/xpcom/base/nsStackWalk.cpp.orig 2010-09-12 19:34:04.012503905 +0300
-+++ mozilla/xpcom/base/nsStackWalk.cpp 2010-09-12 19:34:41.294462134 +0300
-@@ -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>
-
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,38 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200
-@@ -70,7 +70,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
-@@ -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
-@@ -350,7 +365,7 @@
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -350,7 +350,7 @@
- #
- # OpenBSD/SPARC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
- ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
- endif
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla__content__base__public__nsContentUtils.h
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla__content__base__public__nsContentUtils.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200
-+++ mozilla/content/base/public/nsContentUtils.h 2011-07-07 10:46:12.000000000 +0200
-@@ -54,7 +54,7 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
-+#if !defined(__amd64__) && !defined(__i386__)
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #else
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Added: branches/experimental/mail/thunderbird3/files/patch-bug761077
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird3/files/patch-bug761077 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,110 @@
+diff --git mozilla/xpcom/reflect/xptcall/public/genstubs.pl mozilla/xpcom/reflect/xptcall/public/genstubs.pl
+index b8a87a5..918c4cf 100644
+--- mozilla/xpcom/reflect/xptcall/public/genstubs.pl
++++ mozilla/xpcom/reflect/xptcall/public/genstubs.pl
+@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n";
+ print OUTFILE "* 1 is AddRef\n";
+ print OUTFILE "* 2 is Release\n";
+ print OUTFILE "*/\n";
+-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
+ for($i = 0; $i < $entry_count; $i++) {
+ print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
+ }
+diff --git mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+index eb66761..807db26 100644
+--- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
++++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+@@ -8,7 +8,7 @@
+ * 1 is AddRef
+ * 2 is Release
+ */
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ NS_IMETHOD Stub3();
+ NS_IMETHOD Stub4();
+ NS_IMETHOD Stub5();
+diff --git mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+index ae6ed66..2783957 100644
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -85,7 +85,7 @@
+ # New code for Linux, et. al., with gcc
+ # Migrate other platforms here after testing
+ #
+-ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
++ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH)))
+ # Linux/x86-64
+ ifeq (x86_64,$(OS_TEST))
+ CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
+@@ -70,7 +70,7 @@ endif
+ 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
+@@ -109,12 +109,6 @@ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64
+ CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+ endif
+ #
+-# FreeBSD/amd64
+-#
+-ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
+-CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
+-endif
+-#
+ # BeOS/Intel (uses the same unixish_x86 code)
+ #
+ ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
+@@ -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
+@@ -350,7 +365,7 @@
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS := $(CC) -c -x assembler-with-cpp
+@@ -350,7 +350,7 @@ endif
+ #
+ # OpenBSD/SPARC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
+ endif
+diff --git mozilla/xpcom/reflect/xptcall/src/xptcprivate.h mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
+index d903ced..e4ec832 100644
+--- mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
++++ mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
+@@ -14,7 +14,7 @@
+
+ class xptiInterfaceEntry;
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
+@@ -31,7 +31,7 @@ public:
+ #undef STUB_ENTRY
+ #undef SENTINEL_ENTRY
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Copied and modified: branches/experimental/mail/thunderbird3/files/patch-bug778078 (from r955, branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp)
==============================================================================
--- branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/mail/thunderbird3/files/patch-bug778078 Tue Aug 28 15:25:15 2012 (r956)
@@ -5,7 +5,7 @@
#endif
#if defined(MOZ_WIDGET_GTK2)
-#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
// Disable the slice allocator, since jemalloc already uses similar layout
// algorithms, and using a sub-allocator tends to increase fragmentation.
// This must be done before g_thread_init() is called.
Copied and modified: branches/experimental/mail/thunderbird3/files/patch-bug781457 (from r955, branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp)
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/mail/thunderbird3/files/patch-bug781457 Tue Aug 28 15:25:15 2012 (r956)
@@ -1,5 +1,5 @@
---- mozilla/xpcom/base/nsStackWalk.cpp.orig 2010-09-12 19:34:04.012503905 +0300
-+++ mozilla/xpcom/base/nsStackWalk.cpp 2010-09-12 19:34:41.294462134 +0300
+--- mozilla/xpcom/base/nsStackWalk.cpp.orig 2012-05-29 00:57:31.000000000 +0200
++++ mozilla/xpcom/base/nsStackWalk.cpp 2012-06-03 12:33:40.000000000 +0200
@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
#elif defined(HAVE__UNWIND_BACKTRACE)
Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
==============================================================================
--- branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/toolkit/xre/nsAppRunner.cpp~
-+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -3046,7 +3046,7 @@ XRE_main(int argc, char* argv[], const n
- QApplication app(gArgc, gArgv);
- #endif
- #if defined(MOZ_WIDGET_GTK2)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
Modified: branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
==============================================================================
--- branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Tue Aug 28 15:24:27 2012 (r955)
+++ branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Tue Aug 28 15:25:15 2012 (r956)
@@ -8,11 +8,3 @@
#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>
-
Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
==============================================================================
--- branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,60 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200
-@@ -85,7 +85,7 @@
- # New code for Linux, et. al., with gcc
- # Migrate other platforms here after testing
- #
--ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
-+ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH)))
- # Linux/x86-64
- ifeq (x86_64,$(OS_TEST))
- CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
-@@ -70,7 +70,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
-@@ -109,12 +109,6 @@ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64
- CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
- endif
- #
--# FreeBSD/amd64
--#
--ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
--CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
--endif
--#
- # BeOS/Intel (uses the same unixish_x86 code)
- #
- ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
-@@ -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
-@@ -350,7 +365,7 @@
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -350,7 +350,7 @@
- #
- # OpenBSD/SPARC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
- ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
- endif
Added: branches/experimental/www/firefox-esr/files/patch-bug714312
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-bug714312 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,73 @@
+commit c104d9b
+Author: Landry Breuil <landry@openbsd.org>
+Date: Mon Jan 9 17:32:00 2012 -0600
+
+ Bug 714312 - Use <machine/endian.h> to get endianess on BSD systems, fixing the BSD build. r=ted
+
+ --HG--
+ extra : rebase_source : 8b418bdb2d713093d138ffed20bf1630c05f396b
+---
+ js/src/configure.in | 5 +++++
+ js/src/js-config.h.in | 4 ++++
+ js/src/jscpucfg.h | 17 +++++++++++++++++
+ 3 files changed, 26 insertions(+)
+
+diff --git js/src/configure.in js/src/configure.in
+index 164c896..361b29e 100644
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -2934,6 +2934,11 @@ if test "$ac_cv_header_endian_h" = yes;
+ AC_DEFINE(JS_HAVE_ENDIAN_H)
+ fi
+
++AC_CHECK_HEADERS(machine/endian.h)
++if test "$ac_cv_header_machine_endian_h" = yes; then
++ AC_DEFINE(JS_HAVE_MACHINE_ENDIAN_H)
++fi
++
+ AC_CHECK_HEADERS(sys/isa_defs.h)
+ if test "$ac_cv_header_sys_isa_defs_h" = yes; then
+ AC_DEFINE(JS_HAVE_SYS_ISA_DEFS_H)
+diff --git js/src/js-config.h.in js/src/js-config.h.in
+index fb009fa..402262e 100644
+--- js/src/js-config.h.in
++++ js/src/js-config.h.in
+@@ -59,6 +59,10 @@
+ useable. See jscpucfg.h. */
+ #undef JS_HAVE_ENDIAN_H
+
++/* Define to 1 if the <machine/endian.h> header is present and
++ useable. See jscpucfg.h. */
++#undef JS_HAVE_MACHINE_ENDIAN_H
++
+ /* Define to 1 if the <sys/isa_defs.h> header is present and
+ useable. See jscpucfg.h. */
+ #undef JS_HAVE_SYS_ISA_DEFS_H
+diff --git js/src/jscpucfg.h js/src/jscpucfg.h
+index dd32bce..5fd8415 100644
+--- js/src/jscpucfg.h
++++ js/src/jscpucfg.h
+@@ -92,6 +92,23 @@
+ # error "endian.h does not define __BYTE_ORDER. Cannot determine endianness."
+ # endif
+
++/* BSDs */
++#elif defined(JS_HAVE_MACHINE_ENDIAN_H)
++# include <sys/types.h>
++# include <machine/endian.h>
++
++# if defined(_BYTE_ORDER)
++# if _BYTE_ORDER == _LITTLE_ENDIAN
++# define IS_LITTLE_ENDIAN 1
++# undef IS_BIG_ENDIAN
++# elif _BYTE_ORDER == _BIG_ENDIAN
++# undef IS_LITTLE_ENDIAN
++# define IS_BIG_ENDIAN 1
++# endif
++# else /* !defined(_BYTE_ORDER) */
++# error "machine/endian.h does not define _BYTE_ORDER. Cannot determine endianness."
++# endif
++
+ #elif defined(JS_HAVE_SYS_ISA_DEFS_H)
+ # include <sys/isa_defs.h>
+
Added: branches/experimental/www/firefox-esr/files/patch-bug725655
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-bug725655 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,53 @@
+commit 18b9c9d
+Author: Martin Stránský <stransky@redhat.com>
+Date: Fri Feb 10 16:07:41 2012 +0100
+
+ Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
+---
+ ipc/chromium/src/base/file_util_linux.cc | 3 +++
+ ipc/chromium/src/base/message_pump_libevent.cc | 3 +++
+ ipc/chromium/src/base/time_posix.cc | 3 +++
+ 3 files changed, 9 insertions(+)
+
+diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc
+index cca706f..171e44f 100644
+--- ipc/chromium/src/base/file_util_linux.cc
++++ ipc/chromium/src/base/file_util_linux.cc
+@@ -5,6 +5,9 @@
+ #include "base/file_util.h"
+
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include <string>
+ #include <vector>
+diff --git ipc/chromium/src/base/message_pump_libevent.cc ipc/chromium/src/base/message_pump_libevent.cc
+index 6194f79..9f31dbb 100644
+--- ipc/chromium/src/base/message_pump_libevent.cc
++++ ipc/chromium/src/base/message_pump_libevent.cc
+@@ -6,6 +6,9 @@
+
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
+diff --git ipc/chromium/src/base/time_posix.cc ipc/chromium/src/base/time_posix.cc
+index 8d1a1d5..abf2a56 100644
+--- ipc/chromium/src/base/time_posix.cc
++++ ipc/chromium/src/base/time_posix.cc
+@@ -13,6 +13,9 @@
+ #else
+ #include <time.h>
+ #endif
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include <limits>
+
Added: branches/experimental/www/firefox-esr/files/patch-bug729155
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-bug729155 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,18 @@
+--- dom/plugins/ipc/PluginMessageUtils.cpp
++++ dom/plugins/ipc/PluginMessageUtils.cpp
+@@ -114,6 +114,7 @@ MediateRace(const RPCChannel::Message& parent,
+ }
+ }
+
++#if defined(OS_LINUX)
+ static string
+ ReplaceAll(const string& haystack, const string& needle, const string& with)
+ {
+@@ -127,6 +128,7 @@ ReplaceAll(const string& haystack, const string& needle, const string& with)
+
+ return munged;
+ }
++#endif
+
+ string
+ MungePluginDsoPath(const string& path)
Added: branches/experimental/www/firefox-esr/files/patch-bug761077
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-bug761077 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,88 @@
+diff --git xpcom/reflect/xptcall/public/genstubs.pl xpcom/reflect/xptcall/public/genstubs.pl
+index b8a87a5..918c4cf 100644
+--- xpcom/reflect/xptcall/public/genstubs.pl
++++ xpcom/reflect/xptcall/public/genstubs.pl
+@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n";
+ print OUTFILE "* 1 is AddRef\n";
+ print OUTFILE "* 2 is Release\n";
+ print OUTFILE "*/\n";
+-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
+ for($i = 0; $i < $entry_count; $i++) {
+ print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
+ }
+diff --git xpcom/reflect/xptcall/public/xptcstubsdecl.inc xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+index eb66761..807db26 100644
+--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc
++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+@@ -8,7 +8,7 @@
+ * 1 is AddRef
+ * 2 is Release
+ */
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ NS_IMETHOD Stub3();
+ NS_IMETHOD Stub4();
+ NS_IMETHOD Stub5();
+diff --git xpcom/reflect/xptcall/src/md/unix/Makefile.in xpcom/reflect/xptcall/src/md/unix/Makefile.in
+index ae6ed66..2783957 100644
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -70,7 +70,7 @@ endif
+ 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
+@@ -269,7 +269,7 @@ endif
+ #
+ # 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
+@@ -278,7 +278,7 @@ endif
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS := $(CC) -c -x assembler-with-cpp
+@@ -350,7 +350,7 @@ endif
+ #
+ # OpenBSD/SPARC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
+ endif
+diff --git xpcom/reflect/xptcall/src/xptcprivate.h xpcom/reflect/xptcall/src/xptcprivate.h
+index d903ced..e4ec832 100644
+--- xpcom/reflect/xptcall/src/xptcprivate.h
++++ xpcom/reflect/xptcall/src/xptcprivate.h
+@@ -14,7 +14,7 @@
+
+ class xptiInterfaceEntry;
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
+@@ -31,7 +31,7 @@ public:
+ #undef STUB_ENTRY
+ #undef SENTINEL_ENTRY
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Copied and modified: branches/experimental/www/firefox-esr/files/patch-bug778056 (from r955, branches/experimental/www/firefox-esr/files/patch-memory-mozalloc-mozalloc.cpp)
==============================================================================
Copied and modified: branches/experimental/www/firefox-esr/files/patch-bug778078 (from r955, branches/experimental/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp)
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/www/firefox-esr/files/patch-bug778078 Tue Aug 28 15:25:15 2012 (r956)
@@ -5,7 +5,7 @@
#endif
#if defined(MOZ_WIDGET_GTK2)
-#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
// Disable the slice allocator, since jemalloc already uses similar layout
// algorithms, and using a sub-allocator tends to increase fragmentation.
// This must be done before g_thread_init() is called.
Added: branches/experimental/www/firefox-esr/files/patch-bug779847
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-bug779847 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,28 @@
+--- gfx/ycbcr/Makefile.in
++++ gfx/ycbcr/Makefile.in
+@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \
+ $(NULL)
+ endif
+ else
+-ifeq ($(OS_ARCH),Linux)
+-CPPSRCS += yuv_row_posix.cpp \
+- $(NULL)
+-else
+-ifeq ($(OS_ARCH),SunOS)
+-CPPSRCS += yuv_row_posix.cpp \
+- $(NULL)
+-else
+-ifeq ($(OS_ARCH),Darwin)
++ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH)))
+ CPPSRCS += yuv_row_posix.cpp \
+ $(NULL)
+ else
+ CPPSRCS += yuv_row_other.cpp \
+ $(NULL)
+-endif # Darwin
+-endif # SunOS
+-endif # linux
++endif # posix
+ endif # windows
+
+ ifeq (arm,$(findstring arm,$(OS_TEST)))
Copied and modified: branches/experimental/www/firefox-esr/files/patch-bug781457 (from r955, branches/experimental/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp)
==============================================================================
Copied and modified: branches/experimental/www/firefox-esr/files/patch-bug781474 (from r955, branches/experimental/www/firefox-esr/files/patch-content__base__public__nsContentUtils.h)
==============================================================================
Added: branches/experimental/www/firefox-esr/files/patch-bug783463
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-bug783463 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,20 @@
+--- widget/src/qt/nsNativeThemeQt.cpp~
++++ widget/src/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,6 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
+-#include <malloc.h>
+
+
+ #include "gfxASurface.h"
+--- widget/src/qt/nsSound.cpp~
++++ widget/src/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Added: branches/experimental/www/firefox-esr/files/patch-bug785638
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-bug785638 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,168 @@
+diff --git configure.in configure.in
+index cef992b..3bd39ca 100644
+--- configure.in
++++ configure.in
+@@ -5353,22 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+
+ dnl See if we have assembly on this platform.
+ case "$OS_ARCH:$CPU_ARCH" in
+- Linux:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+ Darwin:x86)
+ VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC"
+ VPX_X86_ASM=1
+@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+ VPX_ASM_SUFFIX="$ASM_SUFFIX"
+ VPX_ARM_ASM=1
+ fi
++ ;;
++ *:x86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
++ VPX_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
++ VPX_X86_ASM=1
++ fi
++ ;;
+ esac
+
+ if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then
+@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+
+ dnl Do we support libjpeg-turbo on this platform?
+ case "$OS_ARCH:$OS_TEST" in
+- Linux:x86|Linux:i?86)
+- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+- LIBJPEG_TURBO_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- 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
+- ;;
+- SunOS:x86_64)
+- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+- LIBJPEG_TURBO_X64_ASM=1
+- ;;
+ Darwin:i?86)
+ LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO"
+ LIBJPEG_TURBO_X86_ASM=1
+@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+ LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon"
+ LIBJPEG_TURBO_ARM_ASM=1
+ ;;
++ *:x86|*:i?86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++ LIBJPEG_TURBO_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++ LIBJPEG_TURBO_X64_ASM=1
++ fi
++ ;;
+ esac
+
+ fi
+diff --git media/libvpx/update.sh media/libvpx/update.sh
+index 79e0fb1..51956af 100755
+--- media/libvpx/update.sh
++++ media/libvpx/update.sh
+@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h
+ # Should be same for all platforms...
+ cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h
+
+-# Config files for x86-linux-gcc and Solaris x86
++# Config files for x86-linux-gcc and other x86 elf platforms
+ cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c
+ cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm
+ cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h
+
+-# Config files for x86_64-linux-gcc and Solaris x86_64
++# Config files for x86_64-linux-gcc and other x86_64 elf platforms
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h
+diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h
+index 55433f3..36e1780 100644
+--- media/libvpx/vpx_config.h
++++ media/libvpx/vpx_config.h
+@@ -16,20 +16,12 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.h"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.h"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.h"
+
+ #else
+diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c
+index eedd515..c8b5375 100644
+--- media/libvpx/vpx_config_c.c
++++ media/libvpx/vpx_config_c.c
+@@ -12,22 +12,14 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.c"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.c"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.c"
+
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+ #elif defined(_MSC_VER) && defined(_M_X64)
+ #include "vpx_config_x86_64-win64-vs8.c"
+
Modified: branches/experimental/www/firefox-esr/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-configure.in Tue Aug 28 15:24:27 2012 (r955)
+++ branches/experimental/www/firefox-esr/files/patch-configure.in Tue Aug 28 15:25:15 2012 (r956)
@@ -50,33 +50,3 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -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:x86_64)
-+ 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:x86_64)
-+ 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
Deleted: branches/experimental/www/firefox-esr/files/patch-content__base__public__nsContentUtils.h
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-content__base__public__nsContentUtils.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200
-+++ content/base/public/nsContentUtils.h 2011-07-07 10:46:12.000000000 +0200
-@@ -54,7 +54,7 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
-+#if !defined(__amd64__) && !defined(__i386__)
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #else
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Deleted: branches/experimental/www/firefox-esr/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- dom/plugins/ipc/PluginMessageUtils.cpp~
-+++ dom/plugins/ipc/PluginMessageUtils.cpp
-@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const
- i += with.length();
- }
-
-- return munged;
-+ return munged.c_str();
- }
- #endif
-
Deleted: branches/experimental/www/firefox-esr/files/patch-gfx-ycbcr-Makefile.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-gfx-ycbcr-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- gfx/ycbcr/Makefile.in~
-+++ gfx/ycbcr/Makefile.in
-@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
- else
-+ifeq ($(OS_ARCH),FreeBSD)
-+CPPSRCS += yuv_row_posix.cpp \
-+ $(NULL)
-+else
- ifeq ($(OS_ARCH),SunOS)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
-@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \
- $(NULL)
- endif # Darwin
- endif # SunOS
-+endif # FreeBSD
- endif # linux
- endif # windows
-
\ No newline at end of file
Deleted: branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,8 +0,0 @@
---- ipc/chromium/src/base/file_util_linux.cc~
-+++ ipc/chromium/src/base/file_util_linux.cc
-@@ -5,6 +5,7 @@
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#include <unistd.h>
-
Modified: branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Tue Aug 28 15:24:27 2012 (r955)
+++ branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Tue Aug 28 15:25:15 2012 (r956)
@@ -1,13 +1,5 @@
--- ipc/chromium/src/base/message_pump_libevent.cc~
+++ ipc/chromium/src/base/message_pump_libevent.cc
-@@ -6,6 +6,7 @@
-
- #include <errno.h>
- #include <fcntl.h>
-+#include <unistd.h>
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
@@ -15,7 +15,7 @@
#include "base/scoped_nsautorelease_pool.h"
#include "base/scoped_ptr.h"
Deleted: branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-time_posix.cc
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-time_posix.cc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- ipc/chromium/src/base/time_posix.cc~
-+++ 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
Deleted: branches/experimental/www/firefox-esr/files/patch-js-src-jscpucfg.h
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-js-src-jscpucfg.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,22 +0,0 @@
---- js/src/jscpucfg.h.orig 2012-01-18 17:38:54.409461514 +0100
-+++ js/src/jscpucfg.h 2012-01-18 17:38:59.522462164 +0100
-@@ -77,6 +77,19 @@
- #define IS_BIG_ENDIAN 1
- #endif
-
-+#elif defined(__FreeBSD__)
-+#include <sys/endian.h>
-+
-+#if defined(BYTE_ORDER)
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
-+#elif BYTE_ORDER == BIG_ENDIAN
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#endif
-+#endif
-+
- #elif defined(JS_HAVE_ENDIAN_H)
- #include <endian.h>
-
Deleted: branches/experimental/www/firefox-esr/files/patch-media-libvpx-vpx_config.c
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-media-libvpx-vpx_config.c Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- media/libvpx/vpx_config_c.c~
-+++ 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"
-
Deleted: branches/experimental/www/firefox-esr/files/patch-media-libvpx-vpx_config.h
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-media-libvpx-vpx_config.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- media/libvpx/vpx_config.h~
-+++ 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"
-
Deleted: branches/experimental/www/firefox-esr/files/patch-memory-mozalloc-mozalloc.cpp
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-memory-mozalloc-mozalloc.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- memory/mozalloc/mozalloc.cpp~
-+++ memory/mozalloc/mozalloc.cpp
-@@ -52,6 +52,9 @@
- #if defined(XP_UNIX)
- # include <unistd.h> // for valloc on *BSD
- #endif //if defined(XP_UNIX)
-+#ifdef __FreeBSD__
-+# include <malloc_np.h> // for malloc_usable_size
-+#endif
-
- #if defined(MOZ_MEMORY)
- // jemalloc.h doesn't redeclare symbols if they're provided by the OS
-@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
-
- #if defined(XP_MACOSX)
- return malloc_size(ptr);
--#elif defined(MOZ_MEMORY)
-+#elif defined(MOZ_MEMORY) || defined(__FreeBSD__)
- return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
- return _msize(ptr);
Deleted: branches/experimental/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- toolkit/xre/nsAppRunner.cpp~
-+++ toolkit/xre/nsAppRunner.cpp
-@@ -3133,7 +3133,7 @@ XRE_main(int argc, char* argv[], const n
- gQtOnlyArgv[gQtOnlyArgc] = nsnull;
- #endif
- #if defined(MOZ_WIDGET_GTK2)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
Deleted: branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsNativeThemeQt.cpp
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsNativeThemeQt.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- widget/src/qt/nsNativeThemeQt.cpp~
-+++ widget/src/qt/nsNativeThemeQt.cpp
-@@ -25,7 +25,9 @@
- #include "nsThemeConstants.h"
- #include "nsIServiceManager.h"
- #include "nsIDOMHTMLInputElement.h"
-+#ifdef __GLIBC__
- #include <malloc.h>
-+#endif
-
-
- #include "gfxASurface.h"
Deleted: branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsSound.cpp
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsSound.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- widget/src/qt/nsSound.cpp~
-+++ widget/src/qt/nsSound.cpp
-@@ -40,6 +40,7 @@
- #include <QSound>
-
- #include <string.h>
-+#include <unistd.h>
-
- #include "nscore.h"
- #include "plstr.h"
Deleted: branches/experimental/www/firefox-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
Deleted: branches/experimental/www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
---- xpcom/reflect/xptcall/src/xptcprivate.h.orig 2009-11-09 21:43:49.000000000 -0800
-+++ xpcom/reflect/xptcall/src/xptcprivate.h 2009-11-09 21:44:05.000000000 -0800
-@@ -45,7 +45,7 @@
-
- class xptiInterfaceEntry;
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
-@@ -62,7 +62,7 @@
- #undef STUB_ENTRY
- #undef SENTINEL_ENTRY
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Deleted: branches/experimental/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- xpcom/base/nsStackWalk.cpp.orig 2010-12-15 02:03:41.000000000 +0100
-+++ xpcom/base/nsStackWalk.cpp 2010-12-15 11:28:20.000000000 +0100
-@@ -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>
-
Deleted: branches/experimental/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,38 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200
-@@ -70,7 +70,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
-@@ -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
-@@ -350,7 +365,7 @@
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -350,7 +350,7 @@
- #
- # OpenBSD/SPARC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
- ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
- endif
Copied and modified: branches/experimental/www/firefox-nightly/files/patch-bug722975 (from r955, branches/experimental/www/firefox-nightly/files/patch-gfx-thebes-gfxPlatform.cpp)
==============================================================================
Copied and modified: branches/experimental/www/firefox-nightly/files/patch-bug778078 (from r955, branches/experimental/www/firefox-nightly/files/patch-toolkit-xre-nsAppRunner.cpp)
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/www/firefox-nightly/files/patch-bug778078 Tue Aug 28 15:25:15 2012 (r956)
@@ -5,7 +5,7 @@
#if defined(MOZ_WIDGET_GTK)
-#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
// Disable the slice allocator, since jemalloc already uses similar layout
// algorithms, and using a sub-allocator tends to increase fragmentation.
// This must be done before g_thread_init() is called.
Added: branches/experimental/www/firefox-nightly/files/patch-bug783463
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-bug783463 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,34 @@
+--- gfx/skia/Makefile.in~
++++ gfx/skia/Makefile.in
+@@ -339,10 +339,9 @@ CPPSRCS += \
+ SkMMapStream.cpp \
+ SkOSFile.cpp \
+ $(NULL)
+-ifeq (Linux,$(OS_TARGET))
++ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET))))
+ CPPSRCS += \
+ SkFontHost_linux.cpp \
+- SkFontHost_tables.cpp \
+ SkTime_Unix.cpp \
+ $(NULL)
+ endif
+--- widget/qt/nsNativeThemeQt.cpp~
++++ widget/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,6 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
+-#include <malloc.h>
+
+
+ #include "gfxASurface.h"
+--- widget/qt/nsSound.cpp~
++++ widget/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Added: branches/experimental/www/firefox-nightly/files/patch-bug785638
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-bug785638 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,192 @@
+diff --git configure.in configure.in
+index cef992b..3bd39ca 100644
+--- configure.in
++++ configure.in
+@@ -5353,30 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+
+ dnl See if we have assembly on this platform.
+ case "$OS_ARCH:$CPU_ARCH" in
+- Linux:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+- OpenBSD:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- OpenBSD:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+ Darwin:x86)
+ VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC"
+ VPX_X86_ASM=1
+@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+ VPX_ASM_SUFFIX="$ASM_SUFFIX"
+ VPX_ARM_ASM=1
+ fi
++ ;;
++ *:x86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
++ VPX_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
++ VPX_X86_ASM=1
++ fi
++ ;;
+ esac
+
+ if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then
+@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+
+ dnl Do we support libjpeg-turbo on this platform?
+ case "$OS_ARCH:$OS_TEST" in
+- Linux:x86|Linux:i?86)
+- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+- LIBJPEG_TURBO_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- 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
+- ;;
+- SunOS:x86_64)
+- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+- LIBJPEG_TURBO_X64_ASM=1
+- ;;
+ Darwin:i?86)
+ LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO"
+ LIBJPEG_TURBO_X86_ASM=1
+@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+ LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon"
+ LIBJPEG_TURBO_ARM_ASM=1
+ ;;
++ *:x86|*:i?86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++ LIBJPEG_TURBO_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++ LIBJPEG_TURBO_X64_ASM=1
++ fi
++ ;;
+ esac
+
+ fi
+diff --git media/libvpx/update.sh media/libvpx/update.sh
+index 79e0fb1..51956af 100755
+--- media/libvpx/update.sh
++++ media/libvpx/update.sh
+@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h
+ # Should be same for all platforms...
+ cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h
+
+-# Config files for x86-linux-gcc, OpenBSD/i386 and Solaris x86
++# Config files for x86-linux-gcc and other x86 elf platforms
+ cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c
+ cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm
+ cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h
+
+-# Config files for x86_64-linux-gcc, OpenBSD/amd64 and Solaris x86_64
++# Config files for x86_64-linux-gcc and other x86_64 elf platforms
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h
+diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h
+index 55433f3..36e1780 100644
+--- media/libvpx/vpx_config.h
++++ media/libvpx/vpx_config.h
+@@ -16,28 +16,12 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.h"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.h"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+-#elif defined(__OpenBSD__) && defined(__i386__)
+-/* 32 bit OpenBSD. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__OpenBSD__) && defined(__x86_64__)
+-/* 64 bit OpenBSD. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.h"
+
+ #else
+diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c
+index eedd515..c8b5375 100644
+--- media/libvpx/vpx_config_c.c
++++ media/libvpx/vpx_config_c.c
+@@ -15,30 +15,14 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.c"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.c"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.c"
+
+-#elif defined(__OpenBSD__) && defined(__i386)
+-/* 32 bit OpenBSD. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__OpenBSD__) && defined(__x86_64)
+-/* 64 bit OpenBSD. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+ #else
+ #error VPX_X86_ASM is defined, but assembly not supported on this platform!
+ #endif
Modified: branches/experimental/www/firefox-nightly/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-configure.in Tue Aug 28 15:24:27 2012 (r955)
+++ branches/experimental/www/firefox-nightly/files/patch-configure.in Tue Aug 28 15:25:15 2012 (r956)
@@ -23,33 +23,3 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -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:x86_64)
-+ 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:x86_64)
-+ 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
Deleted: branches/experimental/www/firefox-nightly/files/patch-gfx-skia-Makefile.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-gfx-skia-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- gfx/skia/Makefile.in~
-+++ gfx/skia/Makefile.in
-@@ -339,7 +339,7 @@ CPPSRCS += \
- SkMMapStream.cpp \
- SkOSFile.cpp \
- $(NULL)
--ifeq (Linux,$(OS_TARGET))
-+ifneq (,$(MOZ_X11))
- CPPSRCS += \
- SkFontHost_linux.cpp \
- SkFontHost_tables.cpp \
Deleted: branches/experimental/www/firefox-nightly/files/patch-gfx-thebes-gfxPlatform.cpp
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-gfx-thebes-gfxPlatform.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,34 +0,0 @@
---- gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000
-+++ gfx/thebes/gfxPlatform.cpp 2012-02-07 13:06:01.084668445 +0000
-@@ -446,6 +446,7 @@
- static_cast<SourceSurface*>(srcBuffer)->Release();
- }
-
-+#ifdef MOZ_TREE_CAIRO
- void SourceSnapshotDetached(cairo_surface_t *nullSurf)
- {
- gfxImageSurface* origSurf =
-@@ -453,6 +454,7 @@
-
- origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
-+#endif
-
- RefPtr<SourceSurface>
- gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
-@@ -522,6 +524,7 @@
- imgSurface->Stride(),
- format);
-
-+ #ifdef MOZ_TREE_CAIRO
- cairo_surface_t *nullSurf =
- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
- cairo_surface_set_user_data(nullSurf,
-@@ -530,6 +533,7 @@
- NULL);
- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
- cairo_surface_destroy(nullSurf);
-+ #endif
- }
-
- srcBuffer->AddRef();
Deleted: branches/experimental/www/firefox-nightly/files/patch-media-libvpx-vpx_config.c
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-media-libvpx-vpx_config.c Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- media/libvpx/vpx_config_c.c~
-+++ 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"
-
Deleted: branches/experimental/www/firefox-nightly/files/patch-media-libvpx-vpx_config.h
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-media-libvpx-vpx_config.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- media/libvpx/vpx_config.h~
-+++ 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"
-
Deleted: branches/experimental/www/firefox-nightly/files/patch-toolkit-xre-nsAppRunner.cpp
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- toolkit/xre/nsAppRunner.cpp~
-+++ toolkit/xre/nsAppRunner.cpp
-@@ -3824,7 +3824,7 @@ XREMain::XRE_main(int argc, char* argv[]
- ScopedLogging log;
-
- #if defined(MOZ_WIDGET_GTK)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
Deleted: branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsNativeThemeQt.cpp
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsNativeThemeQt.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- widget/qt/nsNativeThemeQt.cpp~
-+++ widget/qt/nsNativeThemeQt.cpp
-@@ -25,7 +25,9 @@
- #include "nsThemeConstants.h"
- #include "nsIServiceManager.h"
- #include "nsIDOMHTMLInputElement.h"
-+#ifdef __GLIBC__
- #include <malloc.h>
-+#endif
-
-
- #include "gfxASurface.h"
Deleted: branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsSound.cpp
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsSound.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- widget/qt/nsSound.cpp~
-+++ widget/qt/nsSound.cpp
-@@ -40,6 +40,7 @@
- #include <QSound>
-
- #include <string.h>
-+#include <unistd.h>
-
- #include "nscore.h"
- #include "plstr.h"
Copied and modified: branches/experimental/www/firefox/files/patch-bug722975 (from r955, branches/experimental/www/firefox/files/patch-gfx-thebes-gfxPlatform.cpp)
==============================================================================
Added: branches/experimental/www/firefox/files/patch-bug759459
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-bug759459 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,24 @@
+commit 4d0c5b9
+Author: Marco Perez <bugmail@millibyte.net>
+Date: Sat Jun 9 12:24:56 2012 -0400
+
+ Bug 759459 - Build broken on FreeBSD since patch for bug 745034 landed. r=terrence
+---
+ js/src/gc/Memory.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp
+index 815e90b..10c1a91 100644
+--- js/src/gc/Memory.cpp
++++ js/src/gc/Memory.cpp
+@@ -292,9 +292,9 @@ GetPageFaultCount()
+ #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN)
+
+ #include <sys/mman.h>
+-#include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
++#include <unistd.h>
+
+ void
+ InitMemorySubsystem()
Copied and modified: branches/experimental/www/firefox/files/patch-bug760899 (from r955, branches/experimental/www/firefox/files/patch-content-media-gstreamer-nsGStreamerReader.cpp)
==============================================================================
--- branches/experimental/www/firefox/files/patch-content-media-gstreamer-nsGStreamerReader.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/www/firefox/files/patch-bug760899 Tue Aug 28 15:25:15 2012 (r956)
@@ -1,25 +1,3 @@
-commit f0a73aa
-Author: Paul Adenot <paul@paul.cx>
-Date: Thu Jun 21 20:44:39 2012 -0400
-
- Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik
----
- content/media/gstreamer/nsGStreamerReader.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 06a09b5..c48f92e 100644
---- content/media/gstreamer/nsGStreamerReader.cpp
-+++ content/media/gstreamer/nsGStreamerReader.cpp
-@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- * stream but that are otherwise decodeable.
- */
- guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
-- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
-+ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
- guint default_flags, current_flags;
- g_object_get(mPlayBin, "flags", &default_flags, NULL);
-
commit 667daed
Author: Stephen Moehle <stephen.moehle@gmail.com>
Date: Tue Jun 5 11:32:36 2012 +1200
Added: branches/experimental/www/firefox/files/patch-bug761077
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-bug761077 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,88 @@
+diff --git xpcom/reflect/xptcall/public/genstubs.pl xpcom/reflect/xptcall/public/genstubs.pl
+index b8a87a5..918c4cf 100644
+--- xpcom/reflect/xptcall/public/genstubs.pl
++++ xpcom/reflect/xptcall/public/genstubs.pl
+@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n";
+ print OUTFILE "* 1 is AddRef\n";
+ print OUTFILE "* 2 is Release\n";
+ print OUTFILE "*/\n";
+-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
+ for($i = 0; $i < $entry_count; $i++) {
+ print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
+ }
+diff --git xpcom/reflect/xptcall/public/xptcstubsdecl.inc xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+index eb66761..807db26 100644
+--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc
++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+@@ -8,7 +8,7 @@
+ * 1 is AddRef
+ * 2 is Release
+ */
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ NS_IMETHOD Stub3();
+ NS_IMETHOD Stub4();
+ NS_IMETHOD Stub5();
+diff --git xpcom/reflect/xptcall/src/md/unix/Makefile.in xpcom/reflect/xptcall/src/md/unix/Makefile.in
+index ae6ed66..2783957 100644
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -70,7 +70,7 @@ endif
+ 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
+@@ -269,7 +269,7 @@ endif
+ #
+ # 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
+@@ -278,7 +278,7 @@ endif
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS := $(CC) -c -x assembler-with-cpp
+@@ -350,7 +350,7 @@ endif
+ #
+ # OpenBSD/SPARC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
+ endif
+diff --git xpcom/reflect/xptcall/src/xptcprivate.h xpcom/reflect/xptcall/src/xptcprivate.h
+index d903ced..e4ec832 100644
+--- xpcom/reflect/xptcall/src/xptcprivate.h
++++ xpcom/reflect/xptcall/src/xptcprivate.h
+@@ -14,7 +14,7 @@
+
+ class xptiInterfaceEntry;
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
+@@ -31,7 +31,7 @@ public:
+ #undef STUB_ENTRY
+ #undef SENTINEL_ENTRY
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Added: branches/experimental/www/firefox/files/patch-bug761419
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-bug761419 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,22 @@
+commit f0a73aa
+Author: Paul Adenot <paul@paul.cx>
+Date: Thu Jun 21 20:44:39 2012 -0400
+
+ Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik
+---
+ content/media/gstreamer/nsGStreamerReader.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
+index 06a09b5..c48f92e 100644
+--- content/media/gstreamer/nsGStreamerReader.cpp
++++ content/media/gstreamer/nsGStreamerReader.cpp
+@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
+ * stream but that are otherwise decodeable.
+ */
+ guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
+- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
++ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
+ guint default_flags, current_flags;
+ g_object_get(mPlayBin, "flags", &default_flags, NULL);
+
Copied and modified: branches/experimental/www/firefox/files/patch-bug778056 (from r955, branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp)
==============================================================================
Copied and modified: branches/experimental/www/firefox/files/patch-bug778078 (from r955, branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp)
==============================================================================
--- branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/www/firefox/files/patch-bug778078 Tue Aug 28 15:25:15 2012 (r956)
@@ -5,7 +5,7 @@
#if defined(MOZ_WIDGET_GTK2)
-#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
// Disable the slice allocator, since jemalloc already uses similar layout
// algorithms, and using a sub-allocator tends to increase fragmentation.
// This must be done before g_thread_init() is called.
Added: branches/experimental/www/firefox/files/patch-bug779847
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-bug779847 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,28 @@
+--- gfx/ycbcr/Makefile.in
++++ gfx/ycbcr/Makefile.in
+@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \
+ $(NULL)
+ endif
+ else
+-ifeq ($(OS_ARCH),Linux)
+-CPPSRCS += yuv_row_posix.cpp \
+- $(NULL)
+-else
+-ifeq ($(OS_ARCH),SunOS)
+-CPPSRCS += yuv_row_posix.cpp \
+- $(NULL)
+-else
+-ifeq ($(OS_ARCH),Darwin)
++ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH)))
+ CPPSRCS += yuv_row_posix.cpp \
+ $(NULL)
+ else
+ CPPSRCS += yuv_row_other.cpp \
+ $(NULL)
+-endif # Darwin
+-endif # SunOS
+-endif # linux
++endif # posix
+ endif # windows
+
+ ifeq (arm,$(findstring arm,$(OS_TEST)))
Copied and modified: branches/experimental/www/firefox/files/patch-bug781457 (from r955, branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp)
==============================================================================
Copied and modified: branches/experimental/www/firefox/files/patch-bug781474 (from r955, branches/experimental/www/firefox/files/patch-content__base__public__nsContentUtils.h)
==============================================================================
Added: branches/experimental/www/firefox/files/patch-bug783463
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-bug783463 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,34 @@
+--- gfx/skia/Makefile.in~
++++ gfx/skia/Makefile.in
+@@ -339,10 +339,9 @@ CPPSRCS += \
+ SkMMapStream.cpp \
+ SkOSFile.cpp \
+ $(NULL)
+-ifeq (Linux,$(OS_TARGET))
++ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET))))
+ CPPSRCS += \
+ SkFontHost_linux.cpp \
+- SkFontHost_tables.cpp \
+ SkTime_Unix.cpp \
+ $(NULL)
+ endif
+--- widget/qt/nsNativeThemeQt.cpp~
++++ widget/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,6 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
+-#include <malloc.h>
+
+
+ #include "gfxASurface.h"
+--- widget/qt/nsSound.cpp~
++++ widget/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Added: branches/experimental/www/firefox/files/patch-bug785638
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-bug785638 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,168 @@
+diff --git configure.in configure.in
+index cef992b..3bd39ca 100644
+--- configure.in
++++ configure.in
+@@ -5353,22 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+
+ dnl See if we have assembly on this platform.
+ case "$OS_ARCH:$CPU_ARCH" in
+- Linux:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+ Darwin:x86)
+ VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC"
+ VPX_X86_ASM=1
+@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+ VPX_ASM_SUFFIX="$ASM_SUFFIX"
+ VPX_ARM_ASM=1
+ fi
++ ;;
++ *:x86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
++ VPX_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
++ VPX_X86_ASM=1
++ fi
++ ;;
+ esac
+
+ if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then
+@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+
+ dnl Do we support libjpeg-turbo on this platform?
+ case "$OS_ARCH:$OS_TEST" in
+- Linux:x86|Linux:i?86)
+- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+- LIBJPEG_TURBO_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- 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
+- ;;
+- SunOS:x86_64)
+- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+- LIBJPEG_TURBO_X64_ASM=1
+- ;;
+ Darwin:i?86)
+ LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO"
+ LIBJPEG_TURBO_X86_ASM=1
+@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+ LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon"
+ LIBJPEG_TURBO_ARM_ASM=1
+ ;;
++ *:x86|*:i?86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++ LIBJPEG_TURBO_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++ LIBJPEG_TURBO_X64_ASM=1
++ fi
++ ;;
+ esac
+
+ fi
+diff --git media/libvpx/update.sh media/libvpx/update.sh
+index 79e0fb1..51956af 100755
+--- media/libvpx/update.sh
++++ media/libvpx/update.sh
+@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h
+ # Should be same for all platforms...
+ cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h
+
+-# Config files for x86-linux-gcc and Solaris x86
++# Config files for x86-linux-gcc and other x86 elf platforms
+ cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c
+ cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm
+ cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h
+
+-# Config files for x86_64-linux-gcc and Solaris x86_64
++# Config files for x86_64-linux-gcc and other x86_64 elf platforms
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h
+diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h
+index 55433f3..36e1780 100644
+--- media/libvpx/vpx_config.h
++++ media/libvpx/vpx_config.h
+@@ -16,20 +16,12 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.h"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.h"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.h"
+
+ #else
+diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c
+index eedd515..c8b5375 100644
+--- media/libvpx/vpx_config_c.c
++++ media/libvpx/vpx_config_c.c
+@@ -15,22 +15,14 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.c"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.c"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.c"
+
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+ #else
+ #error VPX_X86_ASM is defined, but assembly not supported on this platform!
+ #endif
Modified: branches/experimental/www/firefox/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-configure.in Tue Aug 28 15:24:27 2012 (r955)
+++ branches/experimental/www/firefox/files/patch-configure.in Tue Aug 28 15:25:15 2012 (r956)
@@ -23,33 +23,3 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -5903,6 +5903,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:x86_64)
-+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
-+ VPX_X86_ASM=1
-+ ;;
- SunOS:x86)
- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
- VPX_X86_ASM=1
-@@ -6297,6 +6305,14 @@
- 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:x86_64)
-+ 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
Deleted: branches/experimental/www/firefox/files/patch-content-media-gstreamer-nsGStreamerReader.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-content-media-gstreamer-nsGStreamerReader.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,76 +0,0 @@
-commit f0a73aa
-Author: Paul Adenot <paul@paul.cx>
-Date: Thu Jun 21 20:44:39 2012 -0400
-
- Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik
----
- content/media/gstreamer/nsGStreamerReader.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 06a09b5..c48f92e 100644
---- content/media/gstreamer/nsGStreamerReader.cpp
-+++ content/media/gstreamer/nsGStreamerReader.cpp
-@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- * stream but that are otherwise decodeable.
- */
- guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
-- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
-+ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
- guint default_flags, current_flags;
- g_object_get(mPlayBin, "flags", &default_flags, NULL);
-
-commit 667daed
-Author: Stephen Moehle <stephen.moehle@gmail.com>
-Date: Tue Jun 5 11:32:36 2012 +1200
-
- Bug 760899 - Fix debug builds with gstreamer enabled - r=kinetik
-
- --HG--
- extra : rebase_source : 22598bc470d35d94991ea9f1b14df11ba19a461a
----
- content/media/gstreamer/nsGStreamerReader.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 6a50e09..164fb2e 100644
---- content/media/gstreamer/nsGStreamerReader.cpp
-+++ content/media/gstreamer/nsGStreamerReader.cpp
-@@ -278,7 +278,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
- &format, &duration) && format == GST_FORMAT_TIME) {
- ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-- LOG(PR_LOG_DEBUG, ("returning duration %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("returning duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration)));
- duration = GST_TIME_AS_USECONDS (duration);
- mDecoder->GetStateMachine()->SetDuration(duration);
-@@ -422,8 +422,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
- nextTimestamp += gst_util_uint64_scale(GST_USECOND, fpsNum, fpsDen);
-
- if (timestamp < aTimeThreshold) {
-- LOG(PR_LOG_DEBUG, ("skipping frame %"GST_TIME_FORMAT
-- " threshold %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("skipping frame %" GST_TIME_FORMAT
-+ " threshold %" GST_TIME_FORMAT,
- GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold)));
- gst_buffer_unref(buffer);
- buffer = NULL;
-@@ -489,7 +489,7 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget,
- NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
-
- gint64 seekPos = aTarget * GST_USECOND;
-- LOG(PR_LOG_DEBUG, ("%p About to seek to %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("%p About to seek to %" GST_TIME_FORMAT,
- mDecoder, GST_TIME_ARGS(seekPos)));
-
- if (!gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME,
-@@ -592,7 +592,7 @@ PRInt64 nsGStreamerReader::QueryDuration()
- if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
- &format, &duration)) {
- if (format == GST_FORMAT_TIME) {
-- LOG(PR_LOG_DEBUG, ("pipeline duration %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("pipeline duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration)));
- duration = GST_TIME_AS_USECONDS (duration);
- }
Deleted: branches/experimental/www/firefox/files/patch-content__base__public__nsContentUtils.h
==============================================================================
--- branches/experimental/www/firefox/files/patch-content__base__public__nsContentUtils.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200
-+++ content/base/public/nsContentUtils.h 2011-07-07 10:46:12.000000000 +0200
-@@ -54,7 +54,7 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
-+#if !defined(__amd64__) && !defined(__i386__)
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #else
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Deleted: branches/experimental/www/firefox/files/patch-gfx-skia-Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-gfx-skia-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- gfx/skia/Makefile.in~
-+++ gfx/skia/Makefile.in
-@@ -339,7 +339,7 @@ CPPSRCS += \
- SkMMapStream.cpp \
- SkOSFile.cpp \
- $(NULL)
--ifeq (Linux,$(OS_TARGET))
-+ifneq (,$(MOZ_X11))
- CPPSRCS += \
- SkFontHost_linux.cpp \
- SkFontHost_tables.cpp \
Deleted: branches/experimental/www/firefox/files/patch-gfx-thebes-gfxPlatform.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-gfx-thebes-gfxPlatform.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,34 +0,0 @@
---- gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000
-+++ gfx/thebes/gfxPlatform.cpp 2012-02-07 13:06:01.084668445 +0000
-@@ -446,6 +446,7 @@
- static_cast<SourceSurface*>(srcBuffer)->Release();
- }
-
-+#ifdef MOZ_TREE_CAIRO
- void SourceSnapshotDetached(cairo_surface_t *nullSurf)
- {
- gfxImageSurface* origSurf =
-@@ -453,6 +454,7 @@
-
- origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
-+#endif
-
- RefPtr<SourceSurface>
- gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
-@@ -522,6 +524,7 @@
- imgSurface->Stride(),
- format);
-
-+ #ifdef MOZ_TREE_CAIRO
- cairo_surface_t *nullSurf =
- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
- cairo_surface_set_user_data(nullSurf,
-@@ -530,6 +533,7 @@
- NULL);
- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
- cairo_surface_destroy(nullSurf);
-+ #endif
- }
-
- srcBuffer->AddRef();
Deleted: branches/experimental/www/firefox/files/patch-gfx-ycbcr-Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-gfx-ycbcr-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- gfx/ycbcr/Makefile.in~
-+++ gfx/ycbcr/Makefile.in
-@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
- else
-+ifeq ($(OS_ARCH),FreeBSD)
-+CPPSRCS += yuv_row_posix.cpp \
-+ $(NULL)
-+else
- ifeq ($(OS_ARCH),SunOS)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
-@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \
- $(NULL)
- endif # Darwin
- endif # SunOS
-+endif # FreeBSD
- endif # linux
- endif # windows
-
\ No newline at end of file
Deleted: branches/experimental/www/firefox/files/patch-js-src-gc-Memory.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-js-src-gc-Memory.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- js/src/gc/Memory.cpp~
-+++ js/src/gc/Memory.cpp
-@@ -292,9 +292,9 @@ GetPageFaultCount()
- #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN)
-
- #include <sys/mman.h>
--#include <unistd.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-+#include <unistd.h>
-
- void
- InitMemorySubsystem()
Deleted: branches/experimental/www/firefox/files/patch-media-libvpx-vpx_config.c
==============================================================================
--- branches/experimental/www/firefox/files/patch-media-libvpx-vpx_config.c Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- media/libvpx/vpx_config_c.c~
-+++ 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"
-
Deleted: branches/experimental/www/firefox/files/patch-media-libvpx-vpx_config.h
==============================================================================
--- branches/experimental/www/firefox/files/patch-media-libvpx-vpx_config.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- media/libvpx/vpx_config.h~
-+++ 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"
-
Deleted: branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- memory/mozalloc/mozalloc.cpp~
-+++ memory/mozalloc/mozalloc.cpp
-@@ -19,6 +19,9 @@
- #if defined(XP_UNIX)
- # include <unistd.h> // for valloc on *BSD
- #endif //if defined(XP_UNIX)
-+#ifdef __FreeBSD__
-+# include <malloc_np.h> // for malloc_usable_size
-+#endif
-
- #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
- # define MOZALLOC_EXPORT __declspec(dllexport)
-@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr)
-
- #if defined(XP_MACOSX)
- return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
-+#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
- // Android bionic libc doesn't have malloc_usable_size.
- return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
Deleted: branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- toolkit/xre/nsAppRunner.cpp~
-+++ toolkit/xre/nsAppRunner.cpp
-@@ -3819,7 +3819,7 @@ XREMain::XRE_main(int argc, char* argv[]
- ScopedLogging log;
-
- #if defined(MOZ_WIDGET_GTK2)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
Deleted: branches/experimental/www/firefox/files/patch-widget-qt-nsNativeThemeQt.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-widget-qt-nsNativeThemeQt.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- widget/qt/nsNativeThemeQt.cpp~
-+++ widget/qt/nsNativeThemeQt.cpp
-@@ -25,7 +25,9 @@
- #include "nsThemeConstants.h"
- #include "nsIServiceManager.h"
- #include "nsIDOMHTMLInputElement.h"
-+#ifdef __GLIBC__
- #include <malloc.h>
-+#endif
-
-
- #include "gfxASurface.h"
Deleted: branches/experimental/www/firefox/files/patch-widget-qt-nsSound.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-widget-qt-nsSound.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- widget/qt/nsSound.cpp~
-+++ widget/qt/nsSound.cpp
-@@ -40,6 +40,7 @@
- #include <QSound>
-
- #include <string.h>
-+#include <unistd.h>
-
- #include "nscore.h"
- #include "plstr.h"
Deleted: branches/experimental/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
==============================================================================
--- branches/experimental/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
Deleted: branches/experimental/www/firefox/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
==============================================================================
--- branches/experimental/www/firefox/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
---- xpcom/reflect/xptcall/src/xptcprivate.h.orig 2009-11-09 21:43:49.000000000 -0800
-+++ xpcom/reflect/xptcall/src/xptcprivate.h 2009-11-09 21:44:05.000000000 -0800
-@@ -45,7 +45,7 @@
-
- class xptiInterfaceEntry;
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
-@@ -62,7 +62,7 @@
- #undef STUB_ENTRY
- #undef SENTINEL_ENTRY
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Deleted: branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- xpcom/base/nsStackWalk.cpp.orig 2012-05-29 00:57:31.000000000 +0200
-+++ xpcom/base/nsStackWalk.cpp 2012-06-03 12:33:40.000000000 +0200
-@@ -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>
-
Deleted: branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,38 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200
-@@ -70,7 +70,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
-@@ -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
-@@ -350,7 +365,7 @@
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -350,7 +350,7 @@
- #
- # OpenBSD/SPARC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
- ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
- endif
Added: branches/experimental/www/firefox36/files/patch-bug761077
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox36/files/patch-bug761077 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,110 @@
+diff --git xpcom/reflect/xptcall/public/genstubs.pl xpcom/reflect/xptcall/public/genstubs.pl
+index b8a87a5..918c4cf 100644
+--- xpcom/reflect/xptcall/public/genstubs.pl
++++ xpcom/reflect/xptcall/public/genstubs.pl
+@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n";
+ print OUTFILE "* 1 is AddRef\n";
+ print OUTFILE "* 2 is Release\n";
+ print OUTFILE "*/\n";
+-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
+ for($i = 0; $i < $entry_count; $i++) {
+ print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
+ }
+diff --git xpcom/reflect/xptcall/public/xptcstubsdecl.inc xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+index eb66761..807db26 100644
+--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc
++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+@@ -8,7 +8,7 @@
+ * 1 is AddRef
+ * 2 is Release
+ */
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ NS_IMETHOD Stub3();
+ NS_IMETHOD Stub4();
+ NS_IMETHOD Stub5();
+diff --git xpcom/reflect/xptcall/src/md/unix/Makefile.in xpcom/reflect/xptcall/src/md/unix/Makefile.in
+index ae6ed66..2783957 100644
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -85,7 +85,7 @@
+ # New code for Linux, et. al., with gcc
+ # Migrate other platforms here after testing
+ #
+-ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
++ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH)))
+ # Linux/x86-64
+ ifeq (x86_64,$(OS_TEST))
+ CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
+@@ -70,7 +70,7 @@ endif
+ 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
+@@ -109,12 +109,6 @@ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64
+ CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+ endif
+ #
+-# FreeBSD/amd64
+-#
+-ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
+-CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
+-endif
+-#
+ # BeOS/Intel (uses the same unixish_x86 code)
+ #
+ ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
+@@ -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
+@@ -350,7 +365,7 @@
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS := $(CC) -c -x assembler-with-cpp
+@@ -350,7 +350,7 @@ endif
+ #
+ # OpenBSD/SPARC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
+ endif
+diff --git xpcom/reflect/xptcall/src/xptcprivate.h xpcom/reflect/xptcall/src/xptcprivate.h
+index d903ced..e4ec832 100644
+--- xpcom/reflect/xptcall/src/xptcprivate.h
++++ xpcom/reflect/xptcall/src/xptcprivate.h
+@@ -14,7 +14,7 @@
+
+ class xptiInterfaceEntry;
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
+@@ -31,7 +31,7 @@ public:
+ #undef STUB_ENTRY
+ #undef SENTINEL_ENTRY
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Copied and modified: branches/experimental/www/firefox36/files/patch-bug778078 (from r955, branches/experimental/www/libxul19/files/patch-toolkit-xre-nsAppRunner.cpp)
==============================================================================
--- branches/experimental/www/libxul19/files/patch-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/www/firefox36/files/patch-bug778078 Tue Aug 28 15:25:15 2012 (r956)
@@ -5,7 +5,7 @@
#endif
#if defined(MOZ_WIDGET_GTK2)
-#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
// Disable the slice allocator, since jemalloc already uses similar layout
// algorithms, and using a sub-allocator tends to increase fragmentation.
// This must be done before g_thread_init() is called.
Copied and modified: branches/experimental/www/firefox36/files/patch-bug781457 (from r955, branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp)
==============================================================================
Deleted: branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp
==============================================================================
--- branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- toolkit/xre/nsAppRunner.cpp~
-+++ toolkit/xre/nsAppRunner.cpp
-@@ -3046,7 +3046,7 @@ XRE_main(int argc, char* argv[], const n
- QApplication app(gArgc, gArgv);
- #endif
- #if defined(MOZ_WIDGET_GTK2)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
Deleted: branches/experimental/www/firefox36/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
==============================================================================
--- branches/experimental/www/firefox36/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
Deleted: branches/experimental/www/firefox36/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
==============================================================================
--- branches/experimental/www/firefox36/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
---- xpcom/reflect/xptcall/src/xptcprivate.h.orig 2009-11-09 21:43:49.000000000 -0800
-+++ xpcom/reflect/xptcall/src/xptcprivate.h 2009-11-09 21:44:05.000000000 -0800
-@@ -45,7 +45,7 @@
-
- class xptiInterfaceEntry;
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
-@@ -62,7 +62,7 @@
- #undef STUB_ENTRY
- #undef SENTINEL_ENTRY
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Modified: branches/experimental/www/firefox36/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- branches/experimental/www/firefox36/files/patch-xpcom_base_nsStackWalk.cpp Tue Aug 28 15:24:27 2012 (r955)
+++ branches/experimental/www/firefox36/files/patch-xpcom_base_nsStackWalk.cpp Tue Aug 28 15:25:15 2012 (r956)
@@ -9,11 +9,3 @@
#include <dlfcn.h>
#endif
-@@ -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>
-
Deleted: branches/experimental/www/firefox36/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- branches/experimental/www/firefox36/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,60 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200
-@@ -85,7 +85,7 @@
- # New code for Linux, et. al., with gcc
- # Migrate other platforms here after testing
- #
--ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
-+ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH)))
- # Linux/x86-64
- ifeq (x86_64,$(OS_TEST))
- CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
-@@ -70,7 +70,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
-@@ -109,12 +109,6 @@ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64
- CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
- endif
- #
--# FreeBSD/amd64
--#
--ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
--CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
--endif
--#
- # BeOS/Intel (uses the same unixish_x86 code)
- #
- ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
-@@ -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
-@@ -350,7 +365,7 @@
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -350,7 +350,7 @@
- #
- # OpenBSD/SPARC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
- ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
- endif
Added: branches/experimental/www/libxul/files/patch-bug714312
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-bug714312 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,73 @@
+commit c104d9b
+Author: Landry Breuil <landry@openbsd.org>
+Date: Mon Jan 9 17:32:00 2012 -0600
+
+ Bug 714312 - Use <machine/endian.h> to get endianess on BSD systems, fixing the BSD build. r=ted
+
+ --HG--
+ extra : rebase_source : 8b418bdb2d713093d138ffed20bf1630c05f396b
+---
+ js/src/configure.in | 5 +++++
+ js/src/js-config.h.in | 4 ++++
+ js/src/jscpucfg.h | 17 +++++++++++++++++
+ 3 files changed, 26 insertions(+)
+
+diff --git js/src/configure.in js/src/configure.in
+index 164c896..361b29e 100644
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -2934,6 +2934,11 @@ if test "$ac_cv_header_endian_h" = yes;
+ AC_DEFINE(JS_HAVE_ENDIAN_H)
+ fi
+
++AC_CHECK_HEADERS(machine/endian.h)
++if test "$ac_cv_header_machine_endian_h" = yes; then
++ AC_DEFINE(JS_HAVE_MACHINE_ENDIAN_H)
++fi
++
+ AC_CHECK_HEADERS(sys/isa_defs.h)
+ if test "$ac_cv_header_sys_isa_defs_h" = yes; then
+ AC_DEFINE(JS_HAVE_SYS_ISA_DEFS_H)
+diff --git js/src/js-config.h.in js/src/js-config.h.in
+index fb009fa..402262e 100644
+--- js/src/js-config.h.in
++++ js/src/js-config.h.in
+@@ -59,6 +59,10 @@
+ useable. See jscpucfg.h. */
+ #undef JS_HAVE_ENDIAN_H
+
++/* Define to 1 if the <machine/endian.h> header is present and
++ useable. See jscpucfg.h. */
++#undef JS_HAVE_MACHINE_ENDIAN_H
++
+ /* Define to 1 if the <sys/isa_defs.h> header is present and
+ useable. See jscpucfg.h. */
+ #undef JS_HAVE_SYS_ISA_DEFS_H
+diff --git js/src/jscpucfg.h js/src/jscpucfg.h
+index dd32bce..5fd8415 100644
+--- js/src/jscpucfg.h
++++ js/src/jscpucfg.h
+@@ -92,6 +92,23 @@
+ # error "endian.h does not define __BYTE_ORDER. Cannot determine endianness."
+ # endif
+
++/* BSDs */
++#elif defined(JS_HAVE_MACHINE_ENDIAN_H)
++# include <sys/types.h>
++# include <machine/endian.h>
++
++# if defined(_BYTE_ORDER)
++# if _BYTE_ORDER == _LITTLE_ENDIAN
++# define IS_LITTLE_ENDIAN 1
++# undef IS_BIG_ENDIAN
++# elif _BYTE_ORDER == _BIG_ENDIAN
++# undef IS_LITTLE_ENDIAN
++# define IS_BIG_ENDIAN 1
++# endif
++# else /* !defined(_BYTE_ORDER) */
++# error "machine/endian.h does not define _BYTE_ORDER. Cannot determine endianness."
++# endif
++
+ #elif defined(JS_HAVE_SYS_ISA_DEFS_H)
+ # include <sys/isa_defs.h>
+
Added: branches/experimental/www/libxul/files/patch-bug725655
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-bug725655 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,53 @@
+commit 18b9c9d
+Author: Martin Stránský <stransky@redhat.com>
+Date: Fri Feb 10 16:07:41 2012 +0100
+
+ Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
+---
+ ipc/chromium/src/base/file_util_linux.cc | 3 +++
+ ipc/chromium/src/base/message_pump_libevent.cc | 3 +++
+ ipc/chromium/src/base/time_posix.cc | 3 +++
+ 3 files changed, 9 insertions(+)
+
+diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc
+index cca706f..171e44f 100644
+--- ipc/chromium/src/base/file_util_linux.cc
++++ ipc/chromium/src/base/file_util_linux.cc
+@@ -5,6 +5,9 @@
+ #include "base/file_util.h"
+
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include <string>
+ #include <vector>
+diff --git ipc/chromium/src/base/message_pump_libevent.cc ipc/chromium/src/base/message_pump_libevent.cc
+index 6194f79..9f31dbb 100644
+--- ipc/chromium/src/base/message_pump_libevent.cc
++++ ipc/chromium/src/base/message_pump_libevent.cc
+@@ -6,6 +6,9 @@
+
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
+diff --git ipc/chromium/src/base/time_posix.cc ipc/chromium/src/base/time_posix.cc
+index 8d1a1d5..abf2a56 100644
+--- ipc/chromium/src/base/time_posix.cc
++++ ipc/chromium/src/base/time_posix.cc
+@@ -13,6 +13,9 @@
+ #else
+ #include <time.h>
+ #endif
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include <limits>
+
Added: branches/experimental/www/libxul/files/patch-bug729155
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-bug729155 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,18 @@
+--- dom/plugins/ipc/PluginMessageUtils.cpp
++++ dom/plugins/ipc/PluginMessageUtils.cpp
+@@ -114,6 +114,7 @@ MediateRace(const RPCChannel::Message& parent,
+ }
+ }
+
++#if defined(OS_LINUX)
+ static string
+ ReplaceAll(const string& haystack, const string& needle, const string& with)
+ {
+@@ -127,6 +128,7 @@ ReplaceAll(const string& haystack, const string& needle, const string& with)
+
+ return munged;
+ }
++#endif
+
+ string
+ MungePluginDsoPath(const string& path)
Added: branches/experimental/www/libxul/files/patch-bug761077
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-bug761077 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,88 @@
+diff --git xpcom/reflect/xptcall/public/genstubs.pl xpcom/reflect/xptcall/public/genstubs.pl
+index b8a87a5..918c4cf 100644
+--- xpcom/reflect/xptcall/public/genstubs.pl
++++ xpcom/reflect/xptcall/public/genstubs.pl
+@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n";
+ print OUTFILE "* 1 is AddRef\n";
+ print OUTFILE "* 2 is Release\n";
+ print OUTFILE "*/\n";
+-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
+ for($i = 0; $i < $entry_count; $i++) {
+ print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
+ }
+diff --git xpcom/reflect/xptcall/public/xptcstubsdecl.inc xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+index eb66761..807db26 100644
+--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc
++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+@@ -8,7 +8,7 @@
+ * 1 is AddRef
+ * 2 is Release
+ */
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ NS_IMETHOD Stub3();
+ NS_IMETHOD Stub4();
+ NS_IMETHOD Stub5();
+diff --git xpcom/reflect/xptcall/src/md/unix/Makefile.in xpcom/reflect/xptcall/src/md/unix/Makefile.in
+index ae6ed66..2783957 100644
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -70,7 +70,7 @@ endif
+ 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
+@@ -269,7 +269,7 @@ endif
+ #
+ # 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
+@@ -278,7 +278,7 @@ endif
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS := $(CC) -c -x assembler-with-cpp
+@@ -350,7 +350,7 @@ endif
+ #
+ # OpenBSD/SPARC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
+ endif
+diff --git xpcom/reflect/xptcall/src/xptcprivate.h xpcom/reflect/xptcall/src/xptcprivate.h
+index d903ced..e4ec832 100644
+--- xpcom/reflect/xptcall/src/xptcprivate.h
++++ xpcom/reflect/xptcall/src/xptcprivate.h
+@@ -14,7 +14,7 @@
+
+ class xptiInterfaceEntry;
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
+@@ -31,7 +31,7 @@ public:
+ #undef STUB_ENTRY
+ #undef SENTINEL_ENTRY
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Copied and modified: branches/experimental/www/libxul/files/patch-bug778056 (from r955, branches/experimental/www/libxul/files/patch-memory-mozalloc-mozalloc.cpp)
==============================================================================
Copied and modified: branches/experimental/www/libxul/files/patch-bug778078 (from r955, branches/experimental/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp)
==============================================================================
--- branches/experimental/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/www/libxul/files/patch-bug778078 Tue Aug 28 15:25:15 2012 (r956)
@@ -5,7 +5,7 @@
#endif
#if defined(MOZ_WIDGET_GTK2)
-#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
// Disable the slice allocator, since jemalloc already uses similar layout
// algorithms, and using a sub-allocator tends to increase fragmentation.
// This must be done before g_thread_init() is called.
Added: branches/experimental/www/libxul/files/patch-bug779847
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-bug779847 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,28 @@
+--- gfx/ycbcr/Makefile.in
++++ gfx/ycbcr/Makefile.in
+@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \
+ $(NULL)
+ endif
+ else
+-ifeq ($(OS_ARCH),Linux)
+-CPPSRCS += yuv_row_posix.cpp \
+- $(NULL)
+-else
+-ifeq ($(OS_ARCH),SunOS)
+-CPPSRCS += yuv_row_posix.cpp \
+- $(NULL)
+-else
+-ifeq ($(OS_ARCH),Darwin)
++ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH)))
+ CPPSRCS += yuv_row_posix.cpp \
+ $(NULL)
+ else
+ CPPSRCS += yuv_row_other.cpp \
+ $(NULL)
+-endif # Darwin
+-endif # SunOS
+-endif # linux
++endif # posix
+ endif # windows
+
+ ifeq (arm,$(findstring arm,$(OS_TEST)))
Copied and modified: branches/experimental/www/libxul/files/patch-bug781457 (from r955, branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp)
==============================================================================
Copied and modified: branches/experimental/www/libxul/files/patch-bug781474 (from r955, branches/experimental/www/libxul/files/patch-content__base__public__nsContentUtils.h)
==============================================================================
Added: branches/experimental/www/libxul/files/patch-bug783463
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-bug783463 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,20 @@
+--- widget/src/qt/nsNativeThemeQt.cpp~
++++ widget/src/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,6 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
+-#include <malloc.h>
+
+
+ #include "gfxASurface.h"
+--- widget/src/qt/nsSound.cpp~
++++ widget/src/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Added: branches/experimental/www/libxul/files/patch-bug785638
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-bug785638 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,168 @@
+diff --git configure.in configure.in
+index cef992b..3bd39ca 100644
+--- configure.in
++++ configure.in
+@@ -5353,22 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+
+ dnl See if we have assembly on this platform.
+ case "$OS_ARCH:$CPU_ARCH" in
+- Linux:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+ Darwin:x86)
+ VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC"
+ VPX_X86_ASM=1
+@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+ VPX_ASM_SUFFIX="$ASM_SUFFIX"
+ VPX_ARM_ASM=1
+ fi
++ ;;
++ *:x86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
++ VPX_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
++ VPX_X86_ASM=1
++ fi
++ ;;
+ esac
+
+ if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then
+@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+
+ dnl Do we support libjpeg-turbo on this platform?
+ case "$OS_ARCH:$OS_TEST" in
+- Linux:x86|Linux:i?86)
+- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+- LIBJPEG_TURBO_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- 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
+- ;;
+- SunOS:x86_64)
+- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+- LIBJPEG_TURBO_X64_ASM=1
+- ;;
+ Darwin:i?86)
+ LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO"
+ LIBJPEG_TURBO_X86_ASM=1
+@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+ LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon"
+ LIBJPEG_TURBO_ARM_ASM=1
+ ;;
++ *:x86|*:i?86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++ LIBJPEG_TURBO_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++ LIBJPEG_TURBO_X64_ASM=1
++ fi
++ ;;
+ esac
+
+ fi
+diff --git media/libvpx/update.sh media/libvpx/update.sh
+index 79e0fb1..51956af 100755
+--- media/libvpx/update.sh
++++ media/libvpx/update.sh
+@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h
+ # Should be same for all platforms...
+ cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h
+
+-# Config files for x86-linux-gcc and Solaris x86
++# Config files for x86-linux-gcc and other x86 elf platforms
+ cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c
+ cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm
+ cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h
+
+-# Config files for x86_64-linux-gcc and Solaris x86_64
++# Config files for x86_64-linux-gcc and other x86_64 elf platforms
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h
+diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h
+index 55433f3..36e1780 100644
+--- media/libvpx/vpx_config.h
++++ media/libvpx/vpx_config.h
+@@ -16,20 +16,12 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.h"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.h"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.h"
+
+ #else
+diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c
+index eedd515..c8b5375 100644
+--- media/libvpx/vpx_config_c.c
++++ media/libvpx/vpx_config_c.c
+@@ -12,22 +12,14 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.c"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.c"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.c"
+
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+ #elif defined(_MSC_VER) && defined(_M_X64)
+ #include "vpx_config_x86_64-win64-vs8.c"
+
Modified: branches/experimental/www/libxul/files/patch-configure.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-configure.in Tue Aug 28 15:24:27 2012 (r955)
+++ branches/experimental/www/libxul/files/patch-configure.in Tue Aug 28 15:25:15 2012 (r956)
@@ -50,33 +50,3 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -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:x86_64)
-+ 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:x86_64)
-+ 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
Deleted: branches/experimental/www/libxul/files/patch-content__base__public__nsContentUtils.h
==============================================================================
--- branches/experimental/www/libxul/files/patch-content__base__public__nsContentUtils.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200
-+++ content/base/public/nsContentUtils.h 2011-07-07 10:46:12.000000000 +0200
-@@ -54,7 +54,7 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
-+#if !defined(__amd64__) && !defined(__i386__)
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #else
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Deleted: branches/experimental/www/libxul/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- dom/plugins/ipc/PluginMessageUtils.cpp~
-+++ dom/plugins/ipc/PluginMessageUtils.cpp
-@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const
- i += with.length();
- }
-
-- return munged;
-+ return munged.c_str();
- }
- #endif
-
Deleted: branches/experimental/www/libxul/files/patch-gfx-ycbcr-Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-gfx-ycbcr-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- gfx/ycbcr/Makefile.in~
-+++ gfx/ycbcr/Makefile.in
-@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
- else
-+ifeq ($(OS_ARCH),FreeBSD)
-+CPPSRCS += yuv_row_posix.cpp \
-+ $(NULL)
-+else
- ifeq ($(OS_ARCH),SunOS)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
-@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \
- $(NULL)
- endif # Darwin
- endif # SunOS
-+endif # FreeBSD
- endif # linux
- endif # windows
-
\ No newline at end of file
Deleted: branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-file_util_linux.cc
==============================================================================
--- branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-file_util_linux.cc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,8 +0,0 @@
---- ipc/chromium/src/base/file_util_linux.cc~
-+++ ipc/chromium/src/base/file_util_linux.cc
-@@ -5,6 +5,7 @@
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#include <unistd.h>
-
Modified: branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Tue Aug 28 15:24:27 2012 (r955)
+++ branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Tue Aug 28 15:25:15 2012 (r956)
@@ -1,13 +1,5 @@
--- ipc/chromium/src/base/message_pump_libevent.cc~
+++ ipc/chromium/src/base/message_pump_libevent.cc
-@@ -6,6 +6,7 @@
-
- #include <errno.h>
- #include <fcntl.h>
-+#include <unistd.h>
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
@@ -15,7 +15,7 @@
#include "base/scoped_nsautorelease_pool.h"
#include "base/scoped_ptr.h"
Deleted: branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-time_posix.cc
==============================================================================
--- branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-time_posix.cc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- ipc/chromium/src/base/time_posix.cc~
-+++ 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
Deleted: branches/experimental/www/libxul/files/patch-js-src-jscpucfg.h
==============================================================================
--- branches/experimental/www/libxul/files/patch-js-src-jscpucfg.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,22 +0,0 @@
---- js/src/jscpucfg.h.orig 2012-01-18 17:38:54.409461514 +0100
-+++ js/src/jscpucfg.h 2012-01-18 17:38:59.522462164 +0100
-@@ -77,6 +77,19 @@
- #define IS_BIG_ENDIAN 1
- #endif
-
-+#elif defined(__FreeBSD__)
-+#include <sys/endian.h>
-+
-+#if defined(BYTE_ORDER)
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
-+#elif BYTE_ORDER == BIG_ENDIAN
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#endif
-+#endif
-+
- #elif defined(JS_HAVE_ENDIAN_H)
- #include <endian.h>
-
Deleted: branches/experimental/www/libxul/files/patch-media-libvpx-vpx_config.c
==============================================================================
--- branches/experimental/www/libxul/files/patch-media-libvpx-vpx_config.c Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- media/libvpx/vpx_config_c.c~
-+++ 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"
-
Deleted: branches/experimental/www/libxul/files/patch-media-libvpx-vpx_config.h
==============================================================================
--- branches/experimental/www/libxul/files/patch-media-libvpx-vpx_config.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- media/libvpx/vpx_config.h~
-+++ 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"
-
Deleted: branches/experimental/www/libxul/files/patch-memory-mozalloc-mozalloc.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-memory-mozalloc-mozalloc.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- memory/mozalloc/mozalloc.cpp~
-+++ memory/mozalloc/mozalloc.cpp
-@@ -52,6 +52,9 @@
- #if defined(XP_UNIX)
- # include <unistd.h> // for valloc on *BSD
- #endif //if defined(XP_UNIX)
-+#ifdef __FreeBSD__
-+# include <malloc_np.h> // for malloc_usable_size
-+#endif
-
- #if defined(MOZ_MEMORY)
- // jemalloc.h doesn't redeclare symbols if they're provided by the OS
-@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
-
- #if defined(XP_MACOSX)
- return malloc_size(ptr);
--#elif defined(MOZ_MEMORY)
-+#elif defined(MOZ_MEMORY) || defined(__FreeBSD__)
- return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
- return _msize(ptr);
Deleted: branches/experimental/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- toolkit/xre/nsAppRunner.cpp~
-+++ toolkit/xre/nsAppRunner.cpp
-@@ -3133,7 +3133,7 @@ XRE_main(int argc, char* argv[], const n
- gQtOnlyArgv[gQtOnlyArgc] = nsnull;
- #endif
- #if defined(MOZ_WIDGET_GTK2)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
Deleted: branches/experimental/www/libxul/files/patch-widget-src-qt-nsNativeThemeQt.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-widget-src-qt-nsNativeThemeQt.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- widget/src/qt/nsNativeThemeQt.cpp~
-+++ widget/src/qt/nsNativeThemeQt.cpp
-@@ -25,7 +25,9 @@
- #include "nsThemeConstants.h"
- #include "nsIServiceManager.h"
- #include "nsIDOMHTMLInputElement.h"
-+#ifdef __GLIBC__
- #include <malloc.h>
-+#endif
-
-
- #include "gfxASurface.h"
Deleted: branches/experimental/www/libxul/files/patch-widget-src-qt-nsSound.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-widget-src-qt-nsSound.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- widget/src/qt/nsSound.cpp~
-+++ widget/src/qt/nsSound.cpp
-@@ -40,6 +40,7 @@
- #include <QSound>
-
- #include <string.h>
-+#include <unistd.h>
-
- #include "nscore.h"
- #include "plstr.h"
Deleted: branches/experimental/www/libxul/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
==============================================================================
--- branches/experimental/www/libxul/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
Deleted: branches/experimental/www/libxul/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
==============================================================================
--- branches/experimental/www/libxul/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
---- xpcom/reflect/xptcall/src/xptcprivate.h.orig 2009-11-09 21:43:49.000000000 -0800
-+++ xpcom/reflect/xptcall/src/xptcprivate.h 2009-11-09 21:44:05.000000000 -0800
-@@ -45,7 +45,7 @@
-
- class xptiInterfaceEntry;
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
-@@ -62,7 +62,7 @@
- #undef STUB_ENTRY
- #undef SENTINEL_ENTRY
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Deleted: branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- xpcom/base/nsStackWalk.cpp.orig 2010-12-15 02:03:41.000000000 +0100
-+++ xpcom/base/nsStackWalk.cpp 2010-12-15 11:28:20.000000000 +0100
-@@ -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>
-
Deleted: branches/experimental/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,38 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200
-@@ -70,7 +70,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
-@@ -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
-@@ -350,7 +365,7 @@
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -350,7 +350,7 @@
- #
- # OpenBSD/SPARC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
- ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
- endif
Added: branches/experimental/www/libxul19/files/patch-bug761077
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul19/files/patch-bug761077 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,110 @@
+diff --git xpcom/reflect/xptcall/public/genstubs.pl xpcom/reflect/xptcall/public/genstubs.pl
+index b8a87a5..918c4cf 100644
+--- xpcom/reflect/xptcall/public/genstubs.pl
++++ xpcom/reflect/xptcall/public/genstubs.pl
+@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n";
+ print OUTFILE "* 1 is AddRef\n";
+ print OUTFILE "* 2 is Release\n";
+ print OUTFILE "*/\n";
+-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
+ for($i = 0; $i < $entry_count; $i++) {
+ print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
+ }
+diff --git xpcom/reflect/xptcall/public/xptcstubsdecl.inc xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+index eb66761..807db26 100644
+--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc
++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+@@ -8,7 +8,7 @@
+ * 1 is AddRef
+ * 2 is Release
+ */
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ NS_IMETHOD Stub3();
+ NS_IMETHOD Stub4();
+ NS_IMETHOD Stub5();
+diff --git xpcom/reflect/xptcall/src/md/unix/Makefile.in xpcom/reflect/xptcall/src/md/unix/Makefile.in
+index ae6ed66..2783957 100644
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -85,7 +85,7 @@
+ # New code for Linux, et. al., with gcc
+ # Migrate other platforms here after testing
+ #
+-ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
++ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH)))
+ # Linux/x86-64
+ ifeq (x86_64,$(OS_TEST))
+ CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
+@@ -70,7 +70,7 @@ endif
+ 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
+@@ -109,12 +109,6 @@ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64
+ CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+ endif
+ #
+-# FreeBSD/amd64
+-#
+-ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
+-CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
+-endif
+-#
+ # BeOS/Intel (uses the same unixish_x86 code)
+ #
+ ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
+@@ -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
+@@ -350,7 +365,7 @@
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS := $(CC) -c -x assembler-with-cpp
+@@ -350,7 +350,7 @@ endif
+ #
+ # OpenBSD/SPARC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
+ endif
+diff --git xpcom/reflect/xptcall/src/xptcprivate.h xpcom/reflect/xptcall/src/xptcprivate.h
+index d903ced..e4ec832 100644
+--- xpcom/reflect/xptcall/src/xptcprivate.h
++++ xpcom/reflect/xptcall/src/xptcprivate.h
+@@ -14,7 +14,7 @@
+
+ class xptiInterfaceEntry;
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
+@@ -31,7 +31,7 @@ public:
+ #undef STUB_ENTRY
+ #undef SENTINEL_ENTRY
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Copied and modified: branches/experimental/www/libxul19/files/patch-bug778078 (from r955, branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp)
==============================================================================
--- branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/www/libxul19/files/patch-bug778078 Tue Aug 28 15:25:15 2012 (r956)
@@ -5,7 +5,7 @@
#endif
#if defined(MOZ_WIDGET_GTK2)
-#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
// Disable the slice allocator, since jemalloc already uses similar layout
// algorithms, and using a sub-allocator tends to increase fragmentation.
// This must be done before g_thread_init() is called.
Copied and modified: branches/experimental/www/libxul19/files/patch-bug781457 (from r955, branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp)
==============================================================================
Deleted: branches/experimental/www/libxul19/files/patch-toolkit-xre-nsAppRunner.cpp
==============================================================================
--- branches/experimental/www/libxul19/files/patch-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- toolkit/xre/nsAppRunner.cpp~
-+++ toolkit/xre/nsAppRunner.cpp
-@@ -3046,7 +3046,7 @@ XRE_main(int argc, char* argv[], const n
- QApplication app(gArgc, gArgv);
- #endif
- #if defined(MOZ_WIDGET_GTK2)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
Modified: branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp Tue Aug 28 15:24:27 2012 (r955)
+++ branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp Tue Aug 28 15:25:15 2012 (r956)
@@ -9,11 +9,3 @@
#include <dlfcn.h>
#endif
-@@ -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>
-
Deleted: branches/experimental/www/libxul19/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc
==============================================================================
--- branches/experimental/www/libxul19/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
Deleted: branches/experimental/www/libxul19/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- branches/experimental/www/libxul19/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,60 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200
-@@ -85,7 +85,7 @@
- # New code for Linux, et. al., with gcc
- # Migrate other platforms here after testing
- #
--ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
-+ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH)))
- # Linux/x86-64
- ifeq (x86_64,$(OS_TEST))
- CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
-@@ -70,7 +70,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
-@@ -109,12 +109,6 @@ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64
- CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
- endif
- #
--# FreeBSD/amd64
--#
--ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
--CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
--endif
--#
- # BeOS/Intel (uses the same unixish_x86 code)
- #
- ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
-@@ -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
-@@ -350,7 +365,7 @@
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -350,7 +350,7 @@
- #
- # OpenBSD/SPARC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
- ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
- endif
Copied and modified: branches/experimental/www/seamonkey/files/patch-bug722975 (from r955, branches/experimental/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp)
==============================================================================
Added: branches/experimental/www/seamonkey/files/patch-bug759459
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-bug759459 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,24 @@
+commit 4d0c5b9
+Author: Marco Perez <bugmail@millibyte.net>
+Date: Sat Jun 9 12:24:56 2012 -0400
+
+ Bug 759459 - Build broken on FreeBSD since patch for bug 745034 landed. r=terrence
+---
+ js/src/gc/Memory.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp
+index 815e90b..10c1a91 100644
+--- mozilla/js/src/gc/Memory.cpp
++++ mozilla/js/src/gc/Memory.cpp
+@@ -292,9 +292,9 @@ GetPageFaultCount()
+ #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN)
+
+ #include <sys/mman.h>
+-#include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
++#include <unistd.h>
+
+ void
+ InitMemorySubsystem()
Copied and modified: branches/experimental/www/seamonkey/files/patch-bug760899 (from r955, branches/experimental/mail/thunderbird/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp)
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/www/seamonkey/files/patch-bug760899 Tue Aug 28 15:25:15 2012 (r956)
@@ -1,25 +1,3 @@
-commit f0a73aa
-Author: Paul Adenot <paul@paul.cx>
-Date: Thu Jun 21 20:44:39 2012 -0400
-
- Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik
----
- content/media/gstreamer/nsGStreamerReader.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 06a09b5..c48f92e 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- * stream but that are otherwise decodeable.
- */
- guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
-- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
-+ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
- guint default_flags, current_flags;
- g_object_get(mPlayBin, "flags", &default_flags, NULL);
-
commit 667daed
Author: Stephen Moehle <stephen.moehle@gmail.com>
Date: Tue Jun 5 11:32:36 2012 +1200
Added: branches/experimental/www/seamonkey/files/patch-bug761077
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-bug761077 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,88 @@
+diff --git mozilla/xpcom/reflect/xptcall/public/genstubs.pl mozilla/xpcom/reflect/xptcall/public/genstubs.pl
+index b8a87a5..918c4cf 100644
+--- mozilla/xpcom/reflect/xptcall/public/genstubs.pl
++++ mozilla/xpcom/reflect/xptcall/public/genstubs.pl
+@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n";
+ print OUTFILE "* 1 is AddRef\n";
+ print OUTFILE "* 2 is Release\n";
+ print OUTFILE "*/\n";
+-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
++print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
+ for($i = 0; $i < $entry_count; $i++) {
+ print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
+ }
+diff --git mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+index eb66761..807db26 100644
+--- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
++++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+@@ -8,7 +8,7 @@
+ * 1 is AddRef
+ * 2 is Release
+ */
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ NS_IMETHOD Stub3();
+ NS_IMETHOD Stub4();
+ NS_IMETHOD Stub5();
+diff --git mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+index ae6ed66..2783957 100644
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -70,7 +70,7 @@ endif
+ 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
+@@ -269,7 +269,7 @@ endif
+ #
+ # 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
+@@ -278,7 +278,7 @@ endif
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS := $(CC) -c -x assembler-with-cpp
+@@ -350,7 +350,7 @@ endif
+ #
+ # OpenBSD/SPARC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
+ endif
+diff --git mozilla/xpcom/reflect/xptcall/src/xptcprivate.h mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
+index d903ced..e4ec832 100644
+--- mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
++++ mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
+@@ -14,7 +14,7 @@
+
+ class xptiInterfaceEntry;
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
+@@ -31,7 +31,7 @@ public:
+ #undef STUB_ENTRY
+ #undef SENTINEL_ENTRY
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Added: branches/experimental/www/seamonkey/files/patch-bug761419
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-bug761419 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,22 @@
+commit f0a73aa
+Author: Paul Adenot <paul@paul.cx>
+Date: Thu Jun 21 20:44:39 2012 -0400
+
+ Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik
+---
+ content/media/gstreamer/nsGStreamerReader.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
+index 06a09b5..c48f92e 100644
+--- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
++++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
+@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
+ * stream but that are otherwise decodeable.
+ */
+ guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
+- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
++ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
+ guint default_flags, current_flags;
+ g_object_get(mPlayBin, "flags", &default_flags, NULL);
+
Copied and modified: branches/experimental/www/seamonkey/files/patch-bug778056 (from r955, branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp)
==============================================================================
Copied and modified: branches/experimental/www/seamonkey/files/patch-bug778078 (from r955, branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp)
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:24:27 2012 (r955, copy source)
+++ branches/experimental/www/seamonkey/files/patch-bug778078 Tue Aug 28 15:25:15 2012 (r956)
@@ -5,7 +5,7 @@
#if defined(MOZ_WIDGET_GTK2)
-#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
// Disable the slice allocator, since jemalloc already uses similar layout
// algorithms, and using a sub-allocator tends to increase fragmentation.
// This must be done before g_thread_init() is called.
Added: branches/experimental/www/seamonkey/files/patch-bug779847
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-bug779847 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,28 @@
+--- mozilla/gfx/ycbcr/Makefile.in
++++ mozilla/gfx/ycbcr/Makefile.in
+@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \
+ $(NULL)
+ endif
+ else
+-ifeq ($(OS_ARCH),Linux)
+-CPPSRCS += yuv_row_posix.cpp \
+- $(NULL)
+-else
+-ifeq ($(OS_ARCH),SunOS)
+-CPPSRCS += yuv_row_posix.cpp \
+- $(NULL)
+-else
+-ifeq ($(OS_ARCH),Darwin)
++ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH)))
+ CPPSRCS += yuv_row_posix.cpp \
+ $(NULL)
+ else
+ CPPSRCS += yuv_row_other.cpp \
+ $(NULL)
+-endif # Darwin
+-endif # SunOS
+-endif # linux
++endif # posix
+ endif # windows
+
+ ifeq (arm,$(findstring arm,$(OS_TEST)))
Copied and modified: branches/experimental/www/seamonkey/files/patch-bug781457 (from r955, branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-base-nsStackWalk.cpp)
==============================================================================
Copied and modified: branches/experimental/www/seamonkey/files/patch-bug781474 (from r955, branches/experimental/www/seamonkey/files/patch-mozilla__content__base__public__nsContentUtils.h)
==============================================================================
Added: branches/experimental/www/seamonkey/files/patch-bug783463
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-bug783463 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,34 @@
+--- mozilla/gfx/skia/Makefile.in~
++++ mozilla/gfx/skia/Makefile.in
+@@ -339,10 +339,9 @@ CPPSRCS += \
+ SkMMapStream.cpp \
+ SkOSFile.cpp \
+ $(NULL)
+-ifeq (Linux,$(OS_TARGET))
++ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET))))
+ CPPSRCS += \
+ SkFontHost_linux.cpp \
+- SkFontHost_tables.cpp \
+ SkTime_Unix.cpp \
+ $(NULL)
+ endif
+--- mozilla/widget/qt/nsNativeThemeQt.cpp~
++++ mozilla/widget/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,6 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
+-#include <malloc.h>
+
+
+ #include "gfxASurface.h"
+--- mozilla/widget/qt/nsSound.cpp~
++++ mozilla/widget/qt/nsSound.cpp
+@@ -40,6 +40,7 @@
+ #include <QSound>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include "nscore.h"
+ #include "plstr.h"
Added: branches/experimental/www/seamonkey/files/patch-bug785638
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-bug785638 Tue Aug 28 15:25:15 2012 (r956)
@@ -0,0 +1,168 @@
+diff --git configure.in configure.in
+index cef992b..3bd39ca 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -5353,22 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+
+ dnl See if we have assembly on this platform.
+ case "$OS_ARCH:$CPU_ARCH" in
+- Linux:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86)
+- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+- VPX_X86_ASM=1
+- ;;
+- SunOS:x86_64)
+- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+- VPX_X86_ASM=1
+- ;;
+ Darwin:x86)
+ VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC"
+ VPX_X86_ASM=1
+@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
+ VPX_ASM_SUFFIX="$ASM_SUFFIX"
+ VPX_ARM_ASM=1
+ fi
++ ;;
++ *:x86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
++ VPX_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
++ VPX_X86_ASM=1
++ fi
++ ;;
+ esac
+
+ if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then
+@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+
+ dnl Do we support libjpeg-turbo on this platform?
+ case "$OS_ARCH:$OS_TEST" in
+- Linux:x86|Linux:i?86)
+- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+- LIBJPEG_TURBO_X86_ASM=1
+- ;;
+- Linux:x86_64)
+- 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
+- ;;
+- SunOS:x86_64)
+- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+- LIBJPEG_TURBO_X64_ASM=1
+- ;;
+ Darwin:i?86)
+ LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO"
+ LIBJPEG_TURBO_X86_ASM=1
+@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+ LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon"
+ LIBJPEG_TURBO_ARM_ASM=1
+ ;;
++ *:x86|*:i?86)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++ LIBJPEG_TURBO_X86_ASM=1
++ fi
++ ;;
++ *:x86_64)
++ if $CC -E -dM -</dev/null | grep -q __ELF__; then
++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++ LIBJPEG_TURBO_X64_ASM=1
++ fi
++ ;;
+ esac
+
+ fi
+diff --git media/libvpx/update.sh media/libvpx/update.sh
+index 79e0fb1..51956af 100755
+--- mozilla/media/libvpx/update.sh
++++ mozilla/media/libvpx/update.sh
+@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h
+ # Should be same for all platforms...
+ cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h
+
+-# Config files for x86-linux-gcc and Solaris x86
++# Config files for x86-linux-gcc and other x86 elf platforms
+ cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c
+ cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm
+ cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h
+
+-# Config files for x86_64-linux-gcc and Solaris x86_64
++# Config files for x86_64-linux-gcc and other x86_64 elf platforms
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm
+ cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h
+diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h
+index 55433f3..36e1780 100644
+--- mozilla/media/libvpx/vpx_config.h
++++ mozilla/media/libvpx/vpx_config.h
+@@ -16,20 +16,12 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.h"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.h"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.h"
+
+ #else
+diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c
+index eedd515..c8b5375 100644
+--- mozilla/media/libvpx/vpx_config_c.c
++++ mozilla/media/libvpx/vpx_config_c.c
+@@ -15,22 +15,14 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.c"
+
+-#elif defined(__linux__) && defined(__i386__)
+-/* 32 bit Linux. */
++#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
++/* 32 bit ELF platforms. */
+ #include "vpx_config_x86-linux-gcc.c"
+
+-#elif defined(__linux__) && defined(__x86_64__)
+-/* 64 bit Linux. */
++#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
++/* 64 bit ELF platforms. */
+ #include "vpx_config_x86_64-linux-gcc.c"
+
+-#elif defined(__sun) && defined(__i386)
+-/* 32 bit Solaris. */
+-#include "vpx_config_x86-linux-gcc.h"
+-
+-#elif defined(__sun) && defined(__x86_64)
+-/* 64 bit Solaris. */
+-#include "vpx_config_x86_64-linux-gcc.h"
+-
+ #else
+ #error VPX_X86_ASM is defined, but assembly not supported on this platform!
+ #endif
Deleted: branches/experimental/www/seamonkey/files/patch-gfx-skia-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-gfx-skia-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/gfx/skia/Makefile.in~
-+++ mozilla/gfx/skia/Makefile.in
-@@ -339,7 +339,7 @@ CPPSRCS += \
- SkMMapStream.cpp \
- SkOSFile.cpp \
- $(NULL)
--ifeq (Linux,$(OS_TARGET))
-+ifneq (,$(MOZ_X11))
- CPPSRCS += \
- SkFontHost_linux.cpp \
- SkFontHost_tables.cpp \
Modified: branches/experimental/www/seamonkey/files/patch-mozilla-configure.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Tue Aug 28 15:24:27 2012 (r955)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Tue Aug 28 15:25:15 2012 (r956)
@@ -23,33 +23,3 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -5903,6 +5903,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:x86_64)
-+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
-+ VPX_X86_ASM=1
-+ ;;
- SunOS:x86)
- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
- VPX_X86_ASM=1
-@@ -6297,6 +6305,14 @@
- 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:x86_64)
-+ 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
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,76 +0,0 @@
-commit f0a73aa
-Author: Paul Adenot <paul@paul.cx>
-Date: Thu Jun 21 20:44:39 2012 -0400
-
- Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik
----
- content/media/gstreamer/nsGStreamerReader.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 06a09b5..c48f92e 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- * stream but that are otherwise decodeable.
- */
- guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
-- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
-+ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
- guint default_flags, current_flags;
- g_object_get(mPlayBin, "flags", &default_flags, NULL);
-
-commit 667daed
-Author: Stephen Moehle <stephen.moehle@gmail.com>
-Date: Tue Jun 5 11:32:36 2012 +1200
-
- Bug 760899 - Fix debug builds with gstreamer enabled - r=kinetik
-
- --HG--
- extra : rebase_source : 22598bc470d35d94991ea9f1b14df11ba19a461a
----
- content/media/gstreamer/nsGStreamerReader.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 6a50e09..164fb2e 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -278,7 +278,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
- &format, &duration) && format == GST_FORMAT_TIME) {
- ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-- LOG(PR_LOG_DEBUG, ("returning duration %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("returning duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration)));
- duration = GST_TIME_AS_USECONDS (duration);
- mDecoder->GetStateMachine()->SetDuration(duration);
-@@ -422,8 +422,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
- nextTimestamp += gst_util_uint64_scale(GST_USECOND, fpsNum, fpsDen);
-
- if (timestamp < aTimeThreshold) {
-- LOG(PR_LOG_DEBUG, ("skipping frame %"GST_TIME_FORMAT
-- " threshold %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("skipping frame %" GST_TIME_FORMAT
-+ " threshold %" GST_TIME_FORMAT,
- GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold)));
- gst_buffer_unref(buffer);
- buffer = NULL;
-@@ -489,7 +489,7 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget,
- NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
-
- gint64 seekPos = aTarget * GST_USECOND;
-- LOG(PR_LOG_DEBUG, ("%p About to seek to %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("%p About to seek to %" GST_TIME_FORMAT,
- mDecoder, GST_TIME_ARGS(seekPos)));
-
- if (!gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME,
-@@ -592,7 +592,7 @@ PRInt64 nsGStreamerReader::QueryDuration()
- if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
- &format, &duration)) {
- if (format == GST_FORMAT_TIME) {
-- LOG(PR_LOG_DEBUG, ("pipeline duration %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("pipeline duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration)));
- duration = GST_TIME_AS_USECONDS (duration);
- }
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,34 +0,0 @@
---- mozilla/gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000
-+++ mozilla/gfx/thebes/gfxPlatform.cpp 2012-02-07 13:06:01.084668445 +0000
-@@ -446,6 +446,7 @@
- static_cast<SourceSurface*>(srcBuffer)->Release();
- }
-
-+#ifdef MOZ_TREE_CAIRO
- void SourceSnapshotDetached(cairo_surface_t *nullSurf)
- {
- gfxImageSurface* origSurf =
-@@ -453,6 +454,7 @@
-
- origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
-+#endif
-
- RefPtr<SourceSurface>
- gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
-@@ -522,6 +524,7 @@
- imgSurface->Stride(),
- format);
-
-+ #ifdef MOZ_TREE_CAIRO
- cairo_surface_t *nullSurf =
- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
- cairo_surface_set_user_data(nullSurf,
-@@ -530,6 +533,7 @@
- NULL);
- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
- cairo_surface_destroy(nullSurf);
-+ #endif
- }
-
- srcBuffer->AddRef();
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-gfx-ycbcr-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-gfx-ycbcr-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- mozilla/gfx/ycbcr/Makefile.in~
-+++ mozilla/gfx/ycbcr/Makefile.in
-@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
- else
-+ifeq ($(OS_ARCH),FreeBSD)
-+CPPSRCS += yuv_row_posix.cpp \
-+ $(NULL)
-+else
- ifeq ($(OS_ARCH),SunOS)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
-@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \
- $(NULL)
- endif # Darwin
- endif # SunOS
-+endif # FreeBSD
- endif # linux
- endif # windows
-
\ No newline at end of file
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-gc-Memory.cpp
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-gc-Memory.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- mozilla/js/src/gc/Memory.cpp~
-+++ mozilla/js/src/gc/Memory.cpp
-@@ -292,9 +292,9 @@ GetPageFaultCount()
- #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN)
-
- #include <sys/mman.h>
--#include <unistd.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-+#include <unistd.h>
-
- void
- InitMemorySubsystem()
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- 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"
-
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- 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"
-
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- mozilla/memory/mozalloc/mozalloc.cpp~
-+++ mozilla/memory/mozalloc/mozalloc.cpp
-@@ -19,6 +19,9 @@
- #if defined(XP_UNIX)
- # include <unistd.h> // for valloc on *BSD
- #endif //if defined(XP_UNIX)
-+#ifdef __FreeBSD__
-+# include <malloc_np.h> // for malloc_usable_size
-+#endif
-
- #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
- # define MOZALLOC_EXPORT __declspec(dllexport)
-@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr)
-
- #if defined(XP_MACOSX)
- return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
-+#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
- // Android bionic libc doesn't have malloc_usable_size.
- return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/toolkit/xre/nsAppRunner.cpp~
-+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -3819,7 +3819,7 @@ XREMain::XRE_main(int argc, char* argv[]
- ScopedLogging log;
-
- #if defined(MOZ_WIDGET_GTK2)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- mozilla/widget/qt/nsNativeThemeQt.cpp~
-+++ mozilla/widget/qt/nsNativeThemeQt.cpp
-@@ -25,7 +25,9 @@
- #include "nsThemeConstants.h"
- #include "nsIServiceManager.h"
- #include "nsIDOMHTMLInputElement.h"
-+#ifdef __GLIBC__
- #include <malloc.h>
-+#endif
-
-
- #include "gfxASurface.h"
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsSound.cpp
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsSound.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- mozilla/widget/qt/nsSound.cpp~
-+++ mozilla/widget/qt/nsSound.cpp
-@@ -40,6 +40,7 @@
- #include <QSound>
-
- #include <string.h>
-+#include <unistd.h>
-
- #include "nscore.h"
- #include "plstr.h"
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- 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>
-
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,38 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200
-@@ -70,7 +70,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
-@@ -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
-@@ -350,7 +365,7 @@
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -350,7 +350,7 @@
- #
- # OpenBSD/SPARC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
- ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
- endif
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla__content__base__public__nsContentUtils.h
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla__content__base__public__nsContentUtils.h Tue Aug 28 15:25:15 2012 (r955)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200
-+++ mozilla/content/base/public/nsContentUtils.h 2011-07-07 10:46:12.000000000 +0200
-@@ -54,7 +54,7 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
-+#if !defined(__amd64__) && !defined(__i386__)
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #else
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208281525.q7SFPFlR092239>