Date: Tue, 4 Sep 2012 04:48:43 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r979 - in trunk: 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: <201209040448.q844mh0S008427@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Sep 4 04:48:43 2012
New Revision: 979
Log:
rename a few more patches
Added:
trunk/mail/thunderbird-esr/files/patch-bug351181
- copied, changed from r978, trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp
trunk/mail/thunderbird-esr/files/patch-bug543241
- copied, changed from r978, trunk/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
trunk/mail/thunderbird-esr/files/patch-bug653551
trunk/mail/thunderbird-esr/files/patch-bug728968
trunk/mail/thunderbird-esr/files/patch-bug788039
trunk/mail/thunderbird/files/patch-bug351181
- copied, changed from r978, trunk/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp
trunk/mail/thunderbird/files/patch-bug543241
- copied, changed from r978, trunk/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
trunk/mail/thunderbird/files/patch-bug732340
- copied, changed from r978, trunk/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc
trunk/mail/thunderbird/files/patch-bug788039
trunk/mail/thunderbird3/files/patch-bug351181
- copied, changed from r978, trunk/mail/thunderbird3/files/patch-mozilla-js-src-jsnum.cpp
trunk/mail/thunderbird3/files/patch-bug653551
trunk/www/firefox-esr/files/patch-bug351181
- copied, changed from r978, trunk/www/firefox-esr/files/patch-js_src_jsnum.cpp
trunk/www/firefox-esr/files/patch-bug543241
- copied, changed from r978, trunk/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp
trunk/www/firefox-esr/files/patch-bug653551
trunk/www/firefox-esr/files/patch-bug728968
trunk/www/firefox-esr/files/patch-bug788039
trunk/www/firefox-nightly/files/patch-bug543241
- copied, changed from r978, trunk/www/firefox-nightly/files/patch-xpcom__threads__nsThreadManager.cpp
trunk/www/firefox-nightly/files/patch-bug732340
- copied, changed from r978, trunk/www/firefox/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc
trunk/www/firefox-nightly/files/patch-bug788039
trunk/www/firefox/files/patch-bug351181
- copied, changed from r978, trunk/www/firefox/files/patch-js_src_jsnum.cpp
trunk/www/firefox/files/patch-bug543241
- copied, changed from r978, trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp
trunk/www/firefox/files/patch-bug732340
- copied, changed from r978, trunk/www/firefox-nightly/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc
trunk/www/firefox/files/patch-bug788039
trunk/www/firefox36/files/patch-bug351181
- copied, changed from r978, trunk/www/firefox36/files/patch-js_src_jsnum.cpp
trunk/www/firefox36/files/patch-bug653551
trunk/www/libxul/files/patch-bug351181
- copied, changed from r978, trunk/www/libxul/files/patch-js_src_jsnum.cpp
trunk/www/libxul/files/patch-bug543241
- copied, changed from r978, trunk/www/libxul/files/patch-xpcom__threads__nsThreadManager.cpp
trunk/www/libxul/files/patch-bug653551
trunk/www/libxul/files/patch-bug728968
trunk/www/libxul/files/patch-bug788039
trunk/www/libxul19/files/patch-bug351181
- copied, changed from r978, trunk/www/libxul19/files/patch-js_src_jsnum.cpp
trunk/www/libxul19/files/patch-bug653551
trunk/www/seamonkey/files/patch-bug351181
- copied, changed from r978, trunk/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp
trunk/www/seamonkey/files/patch-bug543241
- copied, changed from r978, trunk/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
trunk/www/seamonkey/files/patch-bug732340
- copied, changed from r978, trunk/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc
trunk/www/seamonkey/files/patch-bug788039
Deleted:
trunk/mail/thunderbird-esr/files/patch-mozilla-configure.in
trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp
trunk/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
trunk/mail/thunderbird/files/patch-mozilla-configure.in
trunk/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc
trunk/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp
trunk/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
trunk/mail/thunderbird3/files/patch-mozilla-js-src-configure.in
trunk/mail/thunderbird3/files/patch-mozilla-js-src-jsnum.cpp
trunk/www/firefox-esr/files/patch-configure.in
trunk/www/firefox-esr/files/patch-js_src_jsnum.cpp
trunk/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp
trunk/www/firefox-nightly/files/patch-configure.in
trunk/www/firefox-nightly/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc
trunk/www/firefox-nightly/files/patch-xpcom__threads__nsThreadManager.cpp
trunk/www/firefox/files/patch-configure.in
trunk/www/firefox/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc
trunk/www/firefox/files/patch-js_src_jsnum.cpp
trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp
trunk/www/firefox36/files/patch-js-src-configure.in
trunk/www/firefox36/files/patch-js_src_jsnum.cpp
trunk/www/libxul/files/patch-configure.in
trunk/www/libxul/files/patch-js_src_jsnum.cpp
trunk/www/libxul/files/patch-xpcom__threads__nsThreadManager.cpp
trunk/www/libxul19/files/patch-js-src-configure.in
trunk/www/libxul19/files/patch-js_src_jsnum.cpp
trunk/www/seamonkey/files/patch-mozilla-configure.in
trunk/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc
trunk/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp
trunk/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
Modified:
trunk/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in
trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in
trunk/www/firefox-esr/files/patch-ipc-chromium-Makefile.in
trunk/www/firefox-esr/files/patch-js-src-configure.in
trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in
trunk/www/firefox/files/patch-ipc-chromium-Makefile.in
trunk/www/libxul/files/patch-ipc-chromium-Makefile.in
trunk/www/libxul/files/patch-js-src-configure.in
trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in
Copied and modified: trunk/mail/thunderbird-esr/files/patch-bug351181 (from r978, trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp)
==============================================================================
Copied and modified: trunk/mail/thunderbird-esr/files/patch-bug543241 (from r978, trunk/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp)
==============================================================================
Added: trunk/mail/thunderbird-esr/files/patch-bug653551
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird-esr/files/patch-bug653551 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,29 @@
+commit 47ea30f
+Author: Landry Breuil <landry@openbsd.org>
+Date: Thu Feb 2 15:31:56 2012 +0900
+
+ Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha
+---
+ js/src/configure.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git mozilla/js/src/configure.in mozilla/js/src/configure.in
+index 84390cf..d663c46 100644
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -2806,13 +2806,15 @@ arm*-*)
+ AC_DEFINE(JS_NUNBOX32)
+ ;;
+ sparc*-*)
++ if test ! "$HAVE_64BIT_OS" ; then
+ NANOJIT_ARCH=Sparc
+ ENABLE_METHODJIT=1
+ ENABLE_MONOIC=1
+ ENABLE_POLYIC=1
+ ENABLE_METHODJIT_TYPED_ARRAY=1
+ AC_DEFINE(JS_CPU_SPARC)
+ AC_DEFINE(JS_NUNBOX32)
++ fi
+ ;;
+ mips*-*)
+ ENABLE_METHODJIT=1
Added: trunk/mail/thunderbird-esr/files/patch-bug728968
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird-esr/files/patch-bug728968 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,50 @@
+commit 4075972
+Author: Mike Hommey <mh+mozilla@glandium.org>
+Date: Thu Feb 23 11:00:46 2012 +0100
+
+ Bug 728968 - Detect clock_gettime when it's not in -lrt. r=khuey
+---
+ configure.in | 29 ++++++++++++++++-------------
+ 1 file changed, 16 insertions(+), 13 deletions(-)
+
+diff --git mozilla/configure.in mozilla/configure.in
+index 3ba7e2f..3d0614c 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -3728,20 +3728,23 @@ AC_CHECK_FUNCS(random strerror lchown fchmod snprintf statvfs memmove rint stat6
+ AC_CHECK_FUNCS(flockfile getpagesize)
+ AC_CHECK_FUNCS(localtime_r strtok_r)
+
+-dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt
+-_SAVE_LDFLAGS=$LDFLAGS
+-LDFLAGS="$LDFLAGS -lrt"
+-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt,
+- ac_cv_have_clock_monotonic,
+- [AC_TRY_LINK([#include <time.h>],
+- [ struct timespec ts;
+- clock_gettime(CLOCK_MONOTONIC, &ts); ],
+- ac_cv_have_clock_monotonic=yes,
+- ac_cv_have_clock_monotonic=no)])
+-LDFLAGS=$_SAVE_LDFLAGS
+-if test "$ac_cv_have_clock_monotonic" = "yes"; then
++dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
++ ac_cv_clock_monotonic,
++ [for libs in "" -lrt; do
++ _SAVE_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS $libs"
++ AC_TRY_LINK([#include <time.h>],
++ [ struct timespec ts;
++ clock_gettime(CLOCK_MONOTONIC, &ts); ],
++ ac_cv_clock_monotonic=$libs
++ break,
++ ac_cv_clock_monotonic=no)
++ LDFLAGS="$_SAVE_LDFLAGS"
++ done])
++if test "$ac_cv_clock_monotonic" != "no"; then
+ HAVE_CLOCK_MONOTONIC=1
+- REALTIME_LIBS=-lrt
++ REALTIME_LIBS=$ac_cv_clock_monotonic
+ AC_DEFINE(HAVE_CLOCK_MONOTONIC)
+ AC_SUBST(HAVE_CLOCK_MONOTONIC)
+ AC_SUBST(REALTIME_LIBS)
Added: trunk/mail/thunderbird-esr/files/patch-bug788039
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird-esr/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,53 @@
+# Bug 788039 - Also use pkg-config when searching for libevent.
+
+--- mozilla/config/autoconf.mk.in~
++++ mozilla/config/autoconf.mk.in
+@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
+
+ MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
+ MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
+-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
+
+ MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
+ MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
+--- mozilla/configure.in~
++++ mozilla/configure.in
+@@ -3854,7 +3854,7 @@ fi
+ dnl system libevent Support
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(system-libevent,
+-[ --with-system-libevent=[PFX]
++[ --with-system-libevent[=PFX]
+ Use system libevent [installed at prefix PFX]],
+ LIBEVENT_DIR=$withval)
+
+@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -3876,16 +3877,16 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+-fi
++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
++fi])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+
+ AC_SUBST(MOZ_NATIVE_LIBEVENT)
+-AC_SUBST(MOZ_LIBEVENT_INCLUDES)
++AC_SUBST(MOZ_LIBEVENT_CFLAGS)
+ AC_SUBST(MOZ_LIBEVENT_LIBS)
+
+ dnl ========================================================
Deleted: trunk/mail/thunderbird-esr/files/patch-mozilla-configure.in
==============================================================================
--- trunk/mail/thunderbird-esr/files/patch-mozilla-configure.in Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,52 +0,0 @@
---- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100
-+++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100
-@@ -3803,19 +3803,21 @@
- AC_CHECK_FUNCS(localtime_r strtok_r)
-
- dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt
--_SAVE_LDFLAGS=$LDFLAGS
--LDFLAGS="$LDFLAGS -lrt"
--AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt,
-+_SAVE_LIBS=$LIBS
-+AC_SEARCH_LIBS(clock_gettime, rt)
-+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
- ac_cv_have_clock_monotonic,
- [AC_TRY_LINK([#include <time.h>],
- [ struct timespec ts;
- clock_gettime(CLOCK_MONOTONIC, &ts); ],
- ac_cv_have_clock_monotonic=yes,
- ac_cv_have_clock_monotonic=no)])
--LDFLAGS=$_SAVE_LDFLAGS
-+LIBS=$_SAVE_LIBS
- if test "$ac_cv_have_clock_monotonic" = "yes"; then
- HAVE_CLOCK_MONOTONIC=1
-- REALTIME_LIBS=-lrt
-+ if test "$ac_cv_search_clock_gettime" != "none required"; then
-+ REALTIME_LIBS=$ac_cv_search_clock_gettime
-+ fi
- AC_DEFINE(HAVE_CLOCK_MONOTONIC)
- AC_SUBST(HAVE_CLOCK_MONOTONIC)
- AC_SUBST(REALTIME_LIBS)
-@@ -4230,6 +4233,9 @@
- if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
- MOZ_NATIVE_LIBEVENT=
- else
-+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
-+ [MOZ_NATIVE_LIBEVENT=1
-+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
-@@ -4242,10 +4248,11 @@ else
- AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
- AC_CHECK_LIB(event, event_init,
- [MOZ_NATIVE_LIBEVENT=1
-- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
-+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
- MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
- fi
-+])
- CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
Modified: trunk/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in
==============================================================================
--- trunk/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978)
+++ trunk/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979)
@@ -22,7 +22,7 @@
-# message_pump_libevent.cc includes third_party/libevent/event.h,
-# which we put in $(DIST), see export rule below
-LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES))
++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
endif # }
vpath %.cc \
Modified: trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
==============================================================================
--- trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in Mon Sep 3 23:18:55 2012 (r978)
+++ trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in Tue Sep 4 04:48:43 2012 (r979)
@@ -1,21 +1,5 @@
--- mozilla/js/src/configure.in.orig 2012-01-29 15:44:24.000000000 +0100
+++ mozilla/js/src/configure.in 2012-01-30 23:37:46.541060008 +0100
-@@ -2732,6 +2742,7 @@
- AC_DEFINE(JS_NUNBOX32)
- ;;
- sparc*-*)
-+ if test ! "$HAVE_64BIT_OS" ; then
- NANOJIT_ARCH=Sparc
- ENABLE_METHODJIT=1
- ENABLE_MONOIC=1
-@@ -2739,6 +2750,7 @@
- ENABLE_METHODJIT_TYPED_ARRAY=1
- AC_DEFINE(JS_CPU_SPARC)
- AC_DEFINE(JS_NUNBOX32)
-+ fi
- ;;
- esac
-
@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
* C++ implementations should define these macros only when __STDC_LIMIT_MACROS
* is defined before <stdint.h> is included. */
Deleted: trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp
==============================================================================
--- trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,28 +0,0 @@
---- mozilla/js/src/jsnum.cpp.orig Sun Nov 5 18:37:07 2006
-+++ mozilla/js/src/jsnum.cpp Sun Nov 5 18:42:31 2006
-@@ -45,6 +45,9 @@
- #if defined(XP_WIN) || defined(XP_OS2)
- #include <float.h>
- #endif
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #include <locale.h>
- #include <limits.h>
- #include <math.h>
-@@ -532,7 +535,15 @@ static jsdouble NaN;
-
- #else
-
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
-+#include <fenv.h>
-+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
-+
-+#else
-+
- #define FIX_FPU() ((void)0)
-+
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
-
- #endif
-
Deleted: trunk/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
==============================================================================
--- trunk/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
---- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
-+++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
-@@ -89,6 +89,11 @@
- nsresult
- nsThreadManager::Init()
- {
-+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
-+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
-+ if (!gTLSThreadID)
-+ gTLSThreadID = mozilla::threads::Generic;
-+#endif
- if (!mThreadsByPRThread.Init())
- return NS_ERROR_OUT_OF_MEMORY;
-
Copied and modified: trunk/mail/thunderbird/files/patch-bug351181 (from r978, trunk/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp)
==============================================================================
Copied and modified: trunk/mail/thunderbird/files/patch-bug543241 (from r978, trunk/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp)
==============================================================================
Copied and modified: trunk/mail/thunderbird/files/patch-bug732340 (from r978, trunk/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc)
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc Mon Sep 3 23:18:55 2012 (r978, copy source)
+++ trunk/mail/thunderbird/files/patch-bug732340 Tue Sep 4 04:48:43 2012 (r979)
@@ -1,11 +1,14 @@
--- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400
+++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400
-@@ -540,4 +540,8 @@
+@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t
GPOS::position_finish (buffer);
}
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
+template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const;
+template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const;
+template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
+template int SortedArrayOf<RangeRecord>::search<unsigned int>(unsigned int const &) const;
++#endif
+
Added: trunk/mail/thunderbird/files/patch-bug788039
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,53 @@
+# Bug 788039 - Also use pkg-config when searching for libevent.
+
+--- mozilla/config/autoconf.mk.in~
++++ mozilla/config/autoconf.mk.in
+@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
+
+ MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
+ MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
+-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
+
+ MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
+ MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
+--- mozilla/configure.in~
++++ mozilla/configure.in
+@@ -3854,7 +3854,7 @@ fi
+ dnl system libevent Support
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(system-libevent,
+-[ --with-system-libevent=[PFX]
++[ --with-system-libevent[=PFX]
+ Use system libevent [installed at prefix PFX]],
+ LIBEVENT_DIR=$withval)
+
+@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -3876,16 +3877,16 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+-fi
++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
++fi])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+
+ AC_SUBST(MOZ_NATIVE_LIBEVENT)
+-AC_SUBST(MOZ_LIBEVENT_INCLUDES)
++AC_SUBST(MOZ_LIBEVENT_CFLAGS)
+ AC_SUBST(MOZ_LIBEVENT_LIBS)
+
+ dnl ========================================================
Deleted: trunk/mail/thunderbird/files/patch-mozilla-configure.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-configure.in Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,25 +0,0 @@
---- mozilla/configure.in.orig 2012-05-23 20:56:34.000000000 +0200
-+++ mozilla/configure.in 2012-05-27 18:18:25.000000000 +0200
-@@ -4230,6 +4233,9 @@
- if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
- MOZ_NATIVE_LIBEVENT=
- else
-+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
-+ [MOZ_NATIVE_LIBEVENT=1
-+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
-@@ -4242,10 +4248,11 @@ else
- AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
- AC_CHECK_LIB(event, event_init,
- [MOZ_NATIVE_LIBEVENT=1
-- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
-+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
- MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
- fi
-+])
- CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
Deleted: trunk/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400
-+++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400
-@@ -540,4 +540,8 @@
- GPOS::position_finish (buffer);
- }
-
-+template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<RangeRecord>::search<unsigned int>(unsigned int const &) const;
-
Modified: trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978)
+++ trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979)
@@ -22,7 +22,7 @@
-# message_pump_libevent.cc includes third_party/libevent/event.h,
-# which we put in $(DIST), see export rule below
-LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES))
++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
endif # }
vpath %.cc \
Deleted: trunk/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,31 +0,0 @@
---- mozilla/js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500
-+++ mozilla/js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500
-@@ -49,6 +49,9 @@
- // Avoid warnings about ASSERT being defined by the assembler as well.
- #undef ASSERT
-
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #ifdef XP_OS2
- #define _PC_53 PC_53
- #define _MCW_EM MCW_EM
-@@ -691,8 +694,18 @@
-
- #else
-
-+#if defined(__FreeBSD__)
-+#if __BSD_VISIBLE == 0
-+#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
-+#endif
-+#include <fenv.h>
-+#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT))
-+#else
-+
- #define FIX_FPU() ((void)0)
-
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
-+
- #endif
-
- JSBool
Deleted: trunk/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
---- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
-+++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
-@@ -57,6 +57,11 @@
- nsresult
- nsThreadManager::Init()
- {
-+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
-+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
-+ if (!gTLSThreadID)
-+ gTLSThreadID = mozilla::threads::Generic;
-+#endif
- mThreadsByPRThread.Init();
-
- if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE)
Copied and modified: trunk/mail/thunderbird3/files/patch-bug351181 (from r978, trunk/mail/thunderbird3/files/patch-mozilla-js-src-jsnum.cpp)
==============================================================================
Added: trunk/mail/thunderbird3/files/patch-bug653551
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird3/files/patch-bug653551 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,24 @@
+commit 47ea30f
+Author: Landry Breuil <landry@openbsd.org>
+Date: Thu Feb 2 15:31:56 2012 +0900
+
+ Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha
+---
+ js/src/configure.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git mozilla/js/src/configure.in mozilla/js/src/configure.in
+index 84390cf..d663c46 100644
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -2471,8 +2471,10 @@ arm*-*)
+ NANOJIT_ARCH=ARM
+ ;;
+ sparc*-*)
++ if test ! "$HAVE_64BIT_OS" ; then
+ ENABLE_JIT=1
+ NANOJIT_ARCH=Sparc
++ fi
+ ;;
+ esac
+
Deleted: trunk/mail/thunderbird3/files/patch-mozilla-js-src-configure.in
==============================================================================
--- trunk/mail/thunderbird3/files/patch-mozilla-js-src-configure.in Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- mozilla/js/src/configure.in.orig 2010-05-12 21:05:58.000000000 +0200
-+++ mozilla/js/src/configure.in 2010-06-22 16:17:20.000000000 +0200
-@@ -2466,10 +2466,6 @@
- ENABLE_JIT=1
- NANOJIT_ARCH=ARM
- ;;
--sparc*-*)
-- ENABLE_JIT=1
-- NANOJIT_ARCH=Sparc
-- ;;
- esac
-
- MOZ_ARG_DISABLE_BOOL(jit,
Deleted: trunk/mail/thunderbird3/files/patch-mozilla-js-src-jsnum.cpp
==============================================================================
--- trunk/mail/thunderbird3/files/patch-mozilla-js-src-jsnum.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,28 +0,0 @@
---- mozilla/js/src/jsnum.cpp.orig Sun Nov 5 18:37:07 2006
-+++ mozilla/js/src/jsnum.cpp Sun Nov 5 18:42:31 2006
-@@ -45,6 +45,9 @@
- #if defined(XP_WIN) || defined(XP_OS2)
- #include <float.h>
- #endif
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #include <locale.h>
- #include <limits.h>
- #include <math.h>
-@@ -532,7 +535,15 @@ static jsdouble NaN;
-
- #else
-
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
-+#include <fenv.h>
-+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
-+
-+#else
-+
- #define FIX_FPU() ((void)0)
-+
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
-
- #endif
-
Copied and modified: trunk/www/firefox-esr/files/patch-bug351181 (from r978, trunk/www/firefox-esr/files/patch-js_src_jsnum.cpp)
==============================================================================
Copied and modified: trunk/www/firefox-esr/files/patch-bug543241 (from r978, trunk/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp)
==============================================================================
Added: trunk/www/firefox-esr/files/patch-bug653551
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-esr/files/patch-bug653551 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,29 @@
+commit 47ea30f
+Author: Landry Breuil <landry@openbsd.org>
+Date: Thu Feb 2 15:31:56 2012 +0900
+
+ Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha
+---
+ js/src/configure.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git js/src/configure.in js/src/configure.in
+index 84390cf..d663c46 100644
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -2806,13 +2806,15 @@ arm*-*)
+ AC_DEFINE(JS_NUNBOX32)
+ ;;
+ sparc*-*)
++ if test ! "$HAVE_64BIT_OS" ; then
+ NANOJIT_ARCH=Sparc
+ ENABLE_METHODJIT=1
+ ENABLE_MONOIC=1
+ ENABLE_POLYIC=1
+ ENABLE_METHODJIT_TYPED_ARRAY=1
+ AC_DEFINE(JS_CPU_SPARC)
+ AC_DEFINE(JS_NUNBOX32)
++ fi
+ ;;
+ mips*-*)
+ ENABLE_METHODJIT=1
Added: trunk/www/firefox-esr/files/patch-bug728968
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-esr/files/patch-bug728968 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,50 @@
+commit 4075972
+Author: Mike Hommey <mh+mozilla@glandium.org>
+Date: Thu Feb 23 11:00:46 2012 +0100
+
+ Bug 728968 - Detect clock_gettime when it's not in -lrt. r=khuey
+---
+ configure.in | 29 ++++++++++++++++-------------
+ 1 file changed, 16 insertions(+), 13 deletions(-)
+
+diff --git configure.in configure.in
+index 3ba7e2f..3d0614c 100644
+--- configure.in
++++ configure.in
+@@ -3728,20 +3728,23 @@ AC_CHECK_FUNCS(random strerror lchown fchmod snprintf statvfs memmove rint stat6
+ AC_CHECK_FUNCS(flockfile getpagesize)
+ AC_CHECK_FUNCS(localtime_r strtok_r)
+
+-dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt
+-_SAVE_LDFLAGS=$LDFLAGS
+-LDFLAGS="$LDFLAGS -lrt"
+-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt,
+- ac_cv_have_clock_monotonic,
+- [AC_TRY_LINK([#include <time.h>],
+- [ struct timespec ts;
+- clock_gettime(CLOCK_MONOTONIC, &ts); ],
+- ac_cv_have_clock_monotonic=yes,
+- ac_cv_have_clock_monotonic=no)])
+-LDFLAGS=$_SAVE_LDFLAGS
+-if test "$ac_cv_have_clock_monotonic" = "yes"; then
++dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
++ ac_cv_clock_monotonic,
++ [for libs in "" -lrt; do
++ _SAVE_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS $libs"
++ AC_TRY_LINK([#include <time.h>],
++ [ struct timespec ts;
++ clock_gettime(CLOCK_MONOTONIC, &ts); ],
++ ac_cv_clock_monotonic=$libs
++ break,
++ ac_cv_clock_monotonic=no)
++ LDFLAGS="$_SAVE_LDFLAGS"
++ done])
++if test "$ac_cv_clock_monotonic" != "no"; then
+ HAVE_CLOCK_MONOTONIC=1
+- REALTIME_LIBS=-lrt
++ REALTIME_LIBS=$ac_cv_clock_monotonic
+ AC_DEFINE(HAVE_CLOCK_MONOTONIC)
+ AC_SUBST(HAVE_CLOCK_MONOTONIC)
+ AC_SUBST(REALTIME_LIBS)
Added: trunk/www/firefox-esr/files/patch-bug788039
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-esr/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,53 @@
+# Bug 788039 - Also use pkg-config when searching for libevent.
+
+--- config/autoconf.mk.in~
++++ config/autoconf.mk.in
+@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
+
+ MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
+ MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
+-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
+
+ MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
+ MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
+--- configure.in~
++++ configure.in
+@@ -3854,7 +3854,7 @@ fi
+ dnl system libevent Support
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(system-libevent,
+-[ --with-system-libevent=[PFX]
++[ --with-system-libevent[=PFX]
+ Use system libevent [installed at prefix PFX]],
+ LIBEVENT_DIR=$withval)
+
+@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -3876,16 +3877,16 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+-fi
++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
++fi])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+
+ AC_SUBST(MOZ_NATIVE_LIBEVENT)
+-AC_SUBST(MOZ_LIBEVENT_INCLUDES)
++AC_SUBST(MOZ_LIBEVENT_CFLAGS)
+ AC_SUBST(MOZ_LIBEVENT_LIBS)
+
+ dnl ========================================================
Deleted: trunk/www/firefox-esr/files/patch-configure.in
==============================================================================
--- trunk/www/firefox-esr/files/patch-configure.in Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,52 +0,0 @@
---- configure.in.orig 2010-11-04 21:05:18.000000000 +0100
-+++ configure.in 2010-11-09 12:59:28.000000000 +0100
-@@ -3803,19 +3803,21 @@
- AC_CHECK_FUNCS(localtime_r strtok_r)
-
- dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt
--_SAVE_LDFLAGS=$LDFLAGS
--LDFLAGS="$LDFLAGS -lrt"
--AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt,
-+_SAVE_LIBS=$LIBS
-+AC_SEARCH_LIBS(clock_gettime, rt)
-+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
- ac_cv_have_clock_monotonic,
- [AC_TRY_LINK([#include <time.h>],
- [ struct timespec ts;
- clock_gettime(CLOCK_MONOTONIC, &ts); ],
- ac_cv_have_clock_monotonic=yes,
- ac_cv_have_clock_monotonic=no)])
--LDFLAGS=$_SAVE_LDFLAGS
-+LIBS=$_SAVE_LIBS
- if test "$ac_cv_have_clock_monotonic" = "yes"; then
- HAVE_CLOCK_MONOTONIC=1
-- REALTIME_LIBS=-lrt
-+ if test "$ac_cv_search_clock_gettime" != "none required"; then
-+ REALTIME_LIBS=$ac_cv_search_clock_gettime
-+ fi
- AC_DEFINE(HAVE_CLOCK_MONOTONIC)
- AC_SUBST(HAVE_CLOCK_MONOTONIC)
- AC_SUBST(REALTIME_LIBS)
-@@ -4230,6 +4233,9 @@
- if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
- MOZ_NATIVE_LIBEVENT=
- else
-+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
-+ [MOZ_NATIVE_LIBEVENT=1
-+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
-@@ -4242,10 +4248,11 @@ else
- AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
- AC_CHECK_LIB(event, event_init,
- [MOZ_NATIVE_LIBEVENT=1
-- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
-+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
- MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
- fi
-+])
- CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
Modified: trunk/www/firefox-esr/files/patch-ipc-chromium-Makefile.in
==============================================================================
--- trunk/www/firefox-esr/files/patch-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978)
+++ trunk/www/firefox-esr/files/patch-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979)
@@ -22,7 +22,7 @@
-# message_pump_libevent.cc includes third_party/libevent/event.h,
-# which we put in $(DIST), see export rule below
-LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES))
++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
endif # }
vpath %.cc \
Modified: trunk/www/firefox-esr/files/patch-js-src-configure.in
==============================================================================
--- trunk/www/firefox-esr/files/patch-js-src-configure.in Mon Sep 3 23:18:55 2012 (r978)
+++ trunk/www/firefox-esr/files/patch-js-src-configure.in Tue Sep 4 04:48:43 2012 (r979)
@@ -1,21 +1,5 @@
--- js/src/configure.in.orig 2012-01-29 11:24:33.000000000 +0100
+++ js/src/configure.in 2012-01-30 23:30:02.051087215 +0100
-@@ -2732,6 +2742,7 @@
- AC_DEFINE(JS_NUNBOX32)
- ;;
- sparc*-*)
-+ if test ! "$HAVE_64BIT_OS" ; then
- NANOJIT_ARCH=Sparc
- ENABLE_METHODJIT=1
- ENABLE_MONOIC=1
-@@ -2739,6 +2750,7 @@
- ENABLE_METHODJIT_TYPED_ARRAY=1
- AC_DEFINE(JS_CPU_SPARC)
- AC_DEFINE(JS_NUNBOX32)
-+ fi
- ;;
- esac
-
@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
* C++ implementations should define these macros only when __STDC_LIMIT_MACROS
* is defined before <stdint.h> is included. */
Deleted: trunk/www/firefox-esr/files/patch-js_src_jsnum.cpp
==============================================================================
--- trunk/www/firefox-esr/files/patch-js_src_jsnum.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,31 +0,0 @@
---- js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500
-+++ js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500
-@@ -43,6 +43,9 @@
- /*
- * JS number type and wrapper class.
- */
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #ifdef XP_OS2
- #define _PC_53 PC_53
- #define _MCW_EM MCW_EM
-@@ -691,8 +694,18 @@
-
- #else
-
-+#if defined(__FreeBSD__)
-+#if __BSD_VISIBLE == 0
-+#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
-+#endif
-+#include <fenv.h>
-+#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT))
-+#else
-+
- #define FIX_FPU() ((void)0)
-
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
-+
- #endif
-
- JSBool
Deleted: trunk/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp
==============================================================================
--- trunk/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
---- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
-+++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
-@@ -89,6 +89,11 @@
- nsresult
- nsThreadManager::Init()
- {
-+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
-+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
-+ if (!gTLSThreadID)
-+ gTLSThreadID = mozilla::threads::Generic;
-+#endif
- if (!mThreadsByPRThread.Init())
- return NS_ERROR_OUT_OF_MEMORY;
-
Copied and modified: trunk/www/firefox-nightly/files/patch-bug543241 (from r978, trunk/www/firefox-nightly/files/patch-xpcom__threads__nsThreadManager.cpp)
==============================================================================
Copied and modified: trunk/www/firefox-nightly/files/patch-bug732340 (from r978, trunk/www/firefox/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc)
==============================================================================
--- trunk/www/firefox/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc Mon Sep 3 23:18:55 2012 (r978, copy source)
+++ trunk/www/firefox-nightly/files/patch-bug732340 Tue Sep 4 04:48:43 2012 (r979)
@@ -1,10 +1,13 @@
--- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400
+++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400
-@@ -540,4 +540,8 @@
- GPOS::position_finish (buffer);
+@@ -484,3 +484,10 @@ hb_ot_layout_position_finish (hb_font_t
+ {
+ GPOS::position_finish (font, buffer, zero_width_attached_marks);
}
-
++
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
+template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const;
+template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const;
+template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
+template int SortedArrayOf<RangeRecord>::search<unsigned int>(unsigned int const &) const;
++#endif
Added: trunk/www/firefox-nightly/files/patch-bug788039
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,42 @@
+# Bug 788039 - Also use pkg-config when searching for libevent.
+
+--- configure.in
++++ configure.in
+@@ -3854,7 +3854,7 @@ fi
+ dnl system libevent Support
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(system-libevent,
+-[ --with-system-libevent=[PFX]
++[ --with-system-libevent[=PFX]
+ Use system libevent [installed at prefix PFX]],
+ LIBEVENT_DIR=$withval)
+
+@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -3876,16 +3877,16 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+-fi
++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
++fi])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+
+ AC_SUBST(MOZ_NATIVE_LIBEVENT)
+-AC_SUBST(MOZ_LIBEVENT_INCLUDES)
++AC_SUBST(MOZ_LIBEVENT_CFLAGS)
+ AC_SUBST(MOZ_LIBEVENT_LIBS)
+
+ dnl ========================================================
Deleted: trunk/www/firefox-nightly/files/patch-configure.in
==============================================================================
--- trunk/www/firefox-nightly/files/patch-configure.in Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,25 +0,0 @@
---- configure.in.orig 2010-11-04 21:05:18.000000000 +0100
-+++ configure.in 2010-11-09 12:59:28.000000000 +0100
-@@ -4230,6 +4233,9 @@
- if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
- MOZ_NATIVE_LIBEVENT=
- else
-+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
-+ [MOZ_NATIVE_LIBEVENT=1
-+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
-@@ -4242,10 +4248,11 @@ else
- AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
- AC_CHECK_LIB(event, event_init,
- [MOZ_NATIVE_LIBEVENT=1
-- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
-+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
- MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
- fi
-+])
- CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
Deleted: trunk/www/firefox-nightly/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc
==============================================================================
--- trunk/www/firefox-nightly/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400
-+++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400
-@@ -540,4 +540,8 @@
- GPOS::position_finish (buffer);
- }
-
-+template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<RangeRecord>::search<unsigned int>(unsigned int const &) const;
Modified: trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in
==============================================================================
--- trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978)
+++ trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979)
@@ -22,7 +22,7 @@
-# message_pump_libevent.cc includes third_party/libevent/event.h,
-# which we put in $(DIST), see export rule below
-LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES))
++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
endif # }
vpath %.cc \
Deleted: trunk/www/firefox-nightly/files/patch-xpcom__threads__nsThreadManager.cpp
==============================================================================
--- trunk/www/firefox-nightly/files/patch-xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
---- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
-+++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
-@@ -57,6 +57,11 @@
- nsresult
- nsThreadManager::Init()
- {
-+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
-+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
-+ if (!gTLSThreadID)
-+ gTLSThreadID = mozilla::threads::Generic;
-+#endif
- mThreadsByPRThread.Init();
-
- if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE)
Copied and modified: trunk/www/firefox/files/patch-bug351181 (from r978, trunk/www/firefox/files/patch-js_src_jsnum.cpp)
==============================================================================
Copied and modified: trunk/www/firefox/files/patch-bug543241 (from r978, trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp)
==============================================================================
Copied and modified: trunk/www/firefox/files/patch-bug732340 (from r978, trunk/www/firefox-nightly/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc)
==============================================================================
--- trunk/www/firefox-nightly/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc Mon Sep 3 23:18:55 2012 (r978, copy source)
+++ trunk/www/firefox/files/patch-bug732340 Tue Sep 4 04:48:43 2012 (r979)
@@ -1,10 +1,13 @@
--- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400
+++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400
-@@ -540,4 +540,8 @@
+@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t
GPOS::position_finish (buffer);
}
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
+template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const;
+template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const;
+template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
+template int SortedArrayOf<RangeRecord>::search<unsigned int>(unsigned int const &) const;
++#endif
+
Added: trunk/www/firefox/files/patch-bug788039
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,53 @@
+# Bug 788039 - Also use pkg-config when searching for libevent.
+
+--- config/autoconf.mk.in~
++++ config/autoconf.mk.in
+@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
+
+ MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
+ MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
+-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
+
+ MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
+ MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
+--- configure.in~
++++ configure.in
+@@ -3854,7 +3854,7 @@ fi
+ dnl system libevent Support
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(system-libevent,
+-[ --with-system-libevent=[PFX]
++[ --with-system-libevent[=PFX]
+ Use system libevent [installed at prefix PFX]],
+ LIBEVENT_DIR=$withval)
+
+@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -3876,16 +3877,16 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+-fi
++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
++fi])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+
+ AC_SUBST(MOZ_NATIVE_LIBEVENT)
+-AC_SUBST(MOZ_LIBEVENT_INCLUDES)
++AC_SUBST(MOZ_LIBEVENT_CFLAGS)
+ AC_SUBST(MOZ_LIBEVENT_LIBS)
+
+ dnl ========================================================
Deleted: trunk/www/firefox/files/patch-configure.in
==============================================================================
--- trunk/www/firefox/files/patch-configure.in Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,25 +0,0 @@
---- configure.in.orig 2012-05-23 20:56:34.000000000 +0200
-+++ configure.in 2012-05-27 18:18:25.000000000 +0200
-@@ -4230,6 +4233,9 @@
- if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
- MOZ_NATIVE_LIBEVENT=
- else
-+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
-+ [MOZ_NATIVE_LIBEVENT=1
-+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
-@@ -4242,10 +4248,11 @@ else
- AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
- AC_CHECK_LIB(event, event_init,
- [MOZ_NATIVE_LIBEVENT=1
-- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
-+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
- MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
- fi
-+])
- CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
Deleted: trunk/www/firefox/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc
==============================================================================
--- trunk/www/firefox/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400
-+++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400
-@@ -540,4 +540,8 @@
- GPOS::position_finish (buffer);
- }
-
-+template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<RangeRecord>::search<unsigned int>(unsigned int const &) const;
Modified: trunk/www/firefox/files/patch-ipc-chromium-Makefile.in
==============================================================================
--- trunk/www/firefox/files/patch-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978)
+++ trunk/www/firefox/files/patch-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979)
@@ -22,7 +22,7 @@
-# message_pump_libevent.cc includes third_party/libevent/event.h,
-# which we put in $(DIST), see export rule below
-LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES))
++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
endif # }
vpath %.cc \
Deleted: trunk/www/firefox/files/patch-js_src_jsnum.cpp
==============================================================================
--- trunk/www/firefox/files/patch-js_src_jsnum.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,31 +0,0 @@
---- js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500
-+++ js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500
-@@ -49,6 +49,9 @@
- // Avoid warnings about ASSERT being defined by the assembler as well.
- #undef ASSERT
-
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #ifdef XP_OS2
- #define _PC_53 PC_53
- #define _MCW_EM MCW_EM
-@@ -691,8 +694,18 @@
-
- #else
-
-+#if defined(__FreeBSD__)
-+#if __BSD_VISIBLE == 0
-+#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
-+#endif
-+#include <fenv.h>
-+#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT))
-+#else
-+
- #define FIX_FPU() ((void)0)
-
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
-+
- #endif
-
- JSBool
Deleted: trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp
==============================================================================
--- trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
---- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
-+++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
-@@ -57,6 +57,11 @@
- nsresult
- nsThreadManager::Init()
- {
-+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
-+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
-+ if (!gTLSThreadID)
-+ gTLSThreadID = mozilla::threads::Generic;
-+#endif
- mThreadsByPRThread.Init();
-
- if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE)
Copied and modified: trunk/www/firefox36/files/patch-bug351181 (from r978, trunk/www/firefox36/files/patch-js_src_jsnum.cpp)
==============================================================================
Added: trunk/www/firefox36/files/patch-bug653551
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox36/files/patch-bug653551 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,24 @@
+commit 47ea30f
+Author: Landry Breuil <landry@openbsd.org>
+Date: Thu Feb 2 15:31:56 2012 +0900
+
+ Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha
+---
+ js/src/configure.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git js/src/configure.in js/src/configure.in
+index 84390cf..d663c46 100644
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -2471,8 +2471,10 @@ arm*-*)
+ NANOJIT_ARCH=ARM
+ ;;
+ sparc*-*)
++ if test ! "$HAVE_64BIT_OS" ; then
+ ENABLE_JIT=1
+ NANOJIT_ARCH=Sparc
++ fi
+ ;;
+ esac
+
Deleted: trunk/www/firefox36/files/patch-js-src-configure.in
==============================================================================
--- trunk/www/firefox36/files/patch-js-src-configure.in Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- js/src/configure.in.orig 2009-09-21 00:26:58.000000000 +0200
-+++ js/src/configure.in 2009-10-08 07:00:27.000000000 +0200
-@@ -2456,10 +2456,6 @@
- ENABLE_JIT=1
- NANOJIT_ARCH=ARM
- ;;
--sparc*-*)
-- ENABLE_JIT=1
-- NANOJIT_ARCH=Sparc
-- ;;
- esac
-
- MOZ_ARG_DISABLE_BOOL(jit,
Deleted: trunk/www/firefox36/files/patch-js_src_jsnum.cpp
==============================================================================
--- trunk/www/firefox36/files/patch-js_src_jsnum.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,31 +0,0 @@
---- js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500
-+++ js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500
-@@ -43,6 +43,9 @@
- /*
- * JS number type and wrapper class.
- */
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #ifdef XP_OS2
- #define _PC_53 PC_53
- #define _MCW_EM MCW_EM
-@@ -691,8 +694,18 @@
-
- #else
-
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
-+#if __BSD_VISIBLE == 0
-+#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
-+#endif
-+#include <fenv.h>
-+#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT))
-+#else
-+
- #define FIX_FPU() ((void)0)
-
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
-+
- #endif
-
- JSBool
Copied and modified: trunk/www/libxul/files/patch-bug351181 (from r978, trunk/www/libxul/files/patch-js_src_jsnum.cpp)
==============================================================================
Copied and modified: trunk/www/libxul/files/patch-bug543241 (from r978, trunk/www/libxul/files/patch-xpcom__threads__nsThreadManager.cpp)
==============================================================================
Added: trunk/www/libxul/files/patch-bug653551
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/libxul/files/patch-bug653551 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,29 @@
+commit 47ea30f
+Author: Landry Breuil <landry@openbsd.org>
+Date: Thu Feb 2 15:31:56 2012 +0900
+
+ Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha
+---
+ js/src/configure.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git js/src/configure.in js/src/configure.in
+index 84390cf..d663c46 100644
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -2806,13 +2806,15 @@ arm*-*)
+ AC_DEFINE(JS_NUNBOX32)
+ ;;
+ sparc*-*)
++ if test ! "$HAVE_64BIT_OS" ; then
+ NANOJIT_ARCH=Sparc
+ ENABLE_METHODJIT=1
+ ENABLE_MONOIC=1
+ ENABLE_POLYIC=1
+ ENABLE_METHODJIT_TYPED_ARRAY=1
+ AC_DEFINE(JS_CPU_SPARC)
+ AC_DEFINE(JS_NUNBOX32)
++ fi
+ ;;
+ mips*-*)
+ ENABLE_METHODJIT=1
Added: trunk/www/libxul/files/patch-bug728968
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/libxul/files/patch-bug728968 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,50 @@
+commit 4075972
+Author: Mike Hommey <mh+mozilla@glandium.org>
+Date: Thu Feb 23 11:00:46 2012 +0100
+
+ Bug 728968 - Detect clock_gettime when it's not in -lrt. r=khuey
+---
+ configure.in | 29 ++++++++++++++++-------------
+ 1 file changed, 16 insertions(+), 13 deletions(-)
+
+diff --git configure.in configure.in
+index 3ba7e2f..3d0614c 100644
+--- configure.in
++++ configure.in
+@@ -3728,20 +3728,23 @@ AC_CHECK_FUNCS(random strerror lchown fchmod snprintf statvfs memmove rint stat6
+ AC_CHECK_FUNCS(flockfile getpagesize)
+ AC_CHECK_FUNCS(localtime_r strtok_r)
+
+-dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt
+-_SAVE_LDFLAGS=$LDFLAGS
+-LDFLAGS="$LDFLAGS -lrt"
+-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt,
+- ac_cv_have_clock_monotonic,
+- [AC_TRY_LINK([#include <time.h>],
+- [ struct timespec ts;
+- clock_gettime(CLOCK_MONOTONIC, &ts); ],
+- ac_cv_have_clock_monotonic=yes,
+- ac_cv_have_clock_monotonic=no)])
+-LDFLAGS=$_SAVE_LDFLAGS
+-if test "$ac_cv_have_clock_monotonic" = "yes"; then
++dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
++ ac_cv_clock_monotonic,
++ [for libs in "" -lrt; do
++ _SAVE_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS $libs"
++ AC_TRY_LINK([#include <time.h>],
++ [ struct timespec ts;
++ clock_gettime(CLOCK_MONOTONIC, &ts); ],
++ ac_cv_clock_monotonic=$libs
++ break,
++ ac_cv_clock_monotonic=no)
++ LDFLAGS="$_SAVE_LDFLAGS"
++ done])
++if test "$ac_cv_clock_monotonic" != "no"; then
+ HAVE_CLOCK_MONOTONIC=1
+- REALTIME_LIBS=-lrt
++ REALTIME_LIBS=$ac_cv_clock_monotonic
+ AC_DEFINE(HAVE_CLOCK_MONOTONIC)
+ AC_SUBST(HAVE_CLOCK_MONOTONIC)
+ AC_SUBST(REALTIME_LIBS)
Added: trunk/www/libxul/files/patch-bug788039
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/libxul/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,53 @@
+# Bug 788039 - Also use pkg-config when searching for libevent.
+
+--- config/autoconf.mk.in~
++++ config/autoconf.mk.in
+@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
+
+ MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
+ MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
+-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
+
+ MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
+ MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
+--- configure.in~
++++ configure.in
+@@ -3854,7 +3854,7 @@ fi
+ dnl system libevent Support
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(system-libevent,
+-[ --with-system-libevent=[PFX]
++[ --with-system-libevent[=PFX]
+ Use system libevent [installed at prefix PFX]],
+ LIBEVENT_DIR=$withval)
+
+@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -3876,16 +3877,16 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+-fi
++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
++fi])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+
+ AC_SUBST(MOZ_NATIVE_LIBEVENT)
+-AC_SUBST(MOZ_LIBEVENT_INCLUDES)
++AC_SUBST(MOZ_LIBEVENT_CFLAGS)
+ AC_SUBST(MOZ_LIBEVENT_LIBS)
+
+ dnl ========================================================
Deleted: trunk/www/libxul/files/patch-configure.in
==============================================================================
--- trunk/www/libxul/files/patch-configure.in Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,52 +0,0 @@
---- configure.in.orig 2010-11-04 21:05:18.000000000 +0100
-+++ configure.in 2010-11-09 12:59:28.000000000 +0100
-@@ -3803,19 +3803,21 @@
- AC_CHECK_FUNCS(localtime_r strtok_r)
-
- dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt
--_SAVE_LDFLAGS=$LDFLAGS
--LDFLAGS="$LDFLAGS -lrt"
--AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt,
-+_SAVE_LIBS=$LIBS
-+AC_SEARCH_LIBS(clock_gettime, rt)
-+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
- ac_cv_have_clock_monotonic,
- [AC_TRY_LINK([#include <time.h>],
- [ struct timespec ts;
- clock_gettime(CLOCK_MONOTONIC, &ts); ],
- ac_cv_have_clock_monotonic=yes,
- ac_cv_have_clock_monotonic=no)])
--LDFLAGS=$_SAVE_LDFLAGS
-+LIBS=$_SAVE_LIBS
- if test "$ac_cv_have_clock_monotonic" = "yes"; then
- HAVE_CLOCK_MONOTONIC=1
-- REALTIME_LIBS=-lrt
-+ if test "$ac_cv_search_clock_gettime" != "none required"; then
-+ REALTIME_LIBS=$ac_cv_search_clock_gettime
-+ fi
- AC_DEFINE(HAVE_CLOCK_MONOTONIC)
- AC_SUBST(HAVE_CLOCK_MONOTONIC)
- AC_SUBST(REALTIME_LIBS)
-@@ -4230,6 +4233,9 @@
- if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
- MOZ_NATIVE_LIBEVENT=
- else
-+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
-+ [MOZ_NATIVE_LIBEVENT=1
-+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
-@@ -4242,10 +4248,11 @@ else
- AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
- AC_CHECK_LIB(event, event_init,
- [MOZ_NATIVE_LIBEVENT=1
-- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
-+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
- MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
- fi
-+])
- CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
Modified: trunk/www/libxul/files/patch-ipc-chromium-Makefile.in
==============================================================================
--- trunk/www/libxul/files/patch-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978)
+++ trunk/www/libxul/files/patch-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979)
@@ -22,7 +22,7 @@
-# message_pump_libevent.cc includes third_party/libevent/event.h,
-# which we put in $(DIST), see export rule below
-LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES))
++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
endif # }
vpath %.cc \
Modified: trunk/www/libxul/files/patch-js-src-configure.in
==============================================================================
--- trunk/www/libxul/files/patch-js-src-configure.in Mon Sep 3 23:18:55 2012 (r978)
+++ trunk/www/libxul/files/patch-js-src-configure.in Tue Sep 4 04:48:43 2012 (r979)
@@ -1,21 +1,5 @@
--- js/src/configure.in.orig 2012-01-29 11:24:33.000000000 +0100
+++ js/src/configure.in 2012-01-30 23:30:02.051087215 +0100
-@@ -2732,6 +2742,7 @@
- AC_DEFINE(JS_NUNBOX32)
- ;;
- sparc*-*)
-+ if test ! "$HAVE_64BIT_OS" ; then
- NANOJIT_ARCH=Sparc
- ENABLE_METHODJIT=1
- ENABLE_MONOIC=1
-@@ -2739,6 +2750,7 @@
- ENABLE_METHODJIT_TYPED_ARRAY=1
- AC_DEFINE(JS_CPU_SPARC)
- AC_DEFINE(JS_NUNBOX32)
-+ fi
- ;;
- esac
-
@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
* C++ implementations should define these macros only when __STDC_LIMIT_MACROS
* is defined before <stdint.h> is included. */
Deleted: trunk/www/libxul/files/patch-js_src_jsnum.cpp
==============================================================================
--- trunk/www/libxul/files/patch-js_src_jsnum.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,31 +0,0 @@
---- js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500
-+++ js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500
-@@ -43,6 +43,9 @@
- /*
- * JS number type and wrapper class.
- */
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #ifdef XP_OS2
- #define _PC_53 PC_53
- #define _MCW_EM MCW_EM
-@@ -691,8 +694,18 @@
-
- #else
-
-+#if defined(__FreeBSD__)
-+#if __BSD_VISIBLE == 0
-+#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
-+#endif
-+#include <fenv.h>
-+#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT))
-+#else
-+
- #define FIX_FPU() ((void)0)
-
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
-+
- #endif
-
- JSBool
Deleted: trunk/www/libxul/files/patch-xpcom__threads__nsThreadManager.cpp
==============================================================================
--- trunk/www/libxul/files/patch-xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
---- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
-+++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
-@@ -89,6 +89,11 @@
- nsresult
- nsThreadManager::Init()
- {
-+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
-+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
-+ if (!gTLSThreadID)
-+ gTLSThreadID = mozilla::threads::Generic;
-+#endif
- if (!mThreadsByPRThread.Init())
- return NS_ERROR_OUT_OF_MEMORY;
-
Copied and modified: trunk/www/libxul19/files/patch-bug351181 (from r978, trunk/www/libxul19/files/patch-js_src_jsnum.cpp)
==============================================================================
Added: trunk/www/libxul19/files/patch-bug653551
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/libxul19/files/patch-bug653551 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,24 @@
+commit 47ea30f
+Author: Landry Breuil <landry@openbsd.org>
+Date: Thu Feb 2 15:31:56 2012 +0900
+
+ Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha
+---
+ js/src/configure.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git js/src/configure.in js/src/configure.in
+index 84390cf..d663c46 100644
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -2471,8 +2471,10 @@ arm*-*)
+ NANOJIT_ARCH=ARM
+ ;;
+ sparc*-*)
++ if test ! "$HAVE_64BIT_OS" ; then
+ ENABLE_JIT=1
+ NANOJIT_ARCH=Sparc
++ fi
+ ;;
+ esac
+
Deleted: trunk/www/libxul19/files/patch-js-src-configure.in
==============================================================================
--- trunk/www/libxul19/files/patch-js-src-configure.in Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- js/src/configure.in.orig 2009-09-30 21:50:26.000000000 +0200
-+++ js/src/configure.in 2009-09-30 21:50:44.000000000 +0200
-@@ -2467,10 +2467,6 @@
- ENABLE_JIT=1
- NANOJIT_ARCH=ARM
- ;;
--sparc*-*)
-- ENABLE_JIT=1
-- NANOJIT_ARCH=Sparc
-- ;;
- esac
-
- MOZ_ARG_DISABLE_BOOL(jit,
Deleted: trunk/www/libxul19/files/patch-js_src_jsnum.cpp
==============================================================================
--- trunk/www/libxul19/files/patch-js_src_jsnum.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,31 +0,0 @@
---- js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500
-+++ js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500
-@@ -43,6 +43,9 @@
- /*
- * JS number type and wrapper class.
- */
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #ifdef XP_OS2
- #define _PC_53 PC_53
- #define _MCW_EM MCW_EM
-@@ -691,8 +694,18 @@
-
- #else
-
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
-+#if __BSD_VISIBLE == 0
-+#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
-+#endif
-+#include <fenv.h>
-+#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT))
-+#else
-+
- #define FIX_FPU() ((void)0)
-
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
-+
- #endif
-
- JSBool
Copied and modified: trunk/www/seamonkey/files/patch-bug351181 (from r978, trunk/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp)
==============================================================================
Copied and modified: trunk/www/seamonkey/files/patch-bug543241 (from r978, trunk/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp)
==============================================================================
Copied and modified: trunk/www/seamonkey/files/patch-bug732340 (from r978, trunk/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc)
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc Mon Sep 3 23:18:55 2012 (r978, copy source)
+++ trunk/www/seamonkey/files/patch-bug732340 Tue Sep 4 04:48:43 2012 (r979)
@@ -1,11 +1,14 @@
--- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400
+++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400
-@@ -540,4 +540,8 @@
+@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t
GPOS::position_finish (buffer);
}
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
+template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const;
+template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const;
+template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
+template int SortedArrayOf<RangeRecord>::search<unsigned int>(unsigned int const &) const;
++#endif
+
Added: trunk/www/seamonkey/files/patch-bug788039
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979)
@@ -0,0 +1,53 @@
+# Bug 788039 - Also use pkg-config when searching for libevent.
+
+--- mozilla/config/autoconf.mk.in~
++++ mozilla/config/autoconf.mk.in
+@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
+
+ MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
+ MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
+-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
+
+ MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
+ MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
+--- mozilla/configure.in~
++++ mozilla/configure.in
+@@ -3854,7 +3854,7 @@ fi
+ dnl system libevent Support
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(system-libevent,
+-[ --with-system-libevent=[PFX]
++[ --with-system-libevent[=PFX]
+ Use system libevent [installed at prefix PFX]],
+ LIBEVENT_DIR=$withval)
+
+@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -3876,16 +3877,16 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+-fi
++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
++fi])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+
+ AC_SUBST(MOZ_NATIVE_LIBEVENT)
+-AC_SUBST(MOZ_LIBEVENT_INCLUDES)
++AC_SUBST(MOZ_LIBEVENT_CFLAGS)
+ AC_SUBST(MOZ_LIBEVENT_LIBS)
+
+ dnl ========================================================
Deleted: trunk/www/seamonkey/files/patch-mozilla-configure.in
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-configure.in Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,25 +0,0 @@
---- mozilla/configure.in.orig 2012-05-23 20:56:34.000000000 +0200
-+++ mozilla/configure.in 2012-05-27 18:18:25.000000000 +0200
-@@ -4230,6 +4233,9 @@
- if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
- MOZ_NATIVE_LIBEVENT=
- else
-+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
-+ [MOZ_NATIVE_LIBEVENT=1
-+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
-@@ -4242,10 +4248,11 @@ else
- AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
- AC_CHECK_LIB(event, event_init,
- [MOZ_NATIVE_LIBEVENT=1
-- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
-+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
- MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
- fi
-+])
- CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
Deleted: trunk/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400
-+++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400
-@@ -540,4 +540,8 @@
- GPOS::position_finish (buffer);
- }
-
-+template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<RangeRecord>::search<unsigned int>(unsigned int const &) const;
-
Modified: trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978)
+++ trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979)
@@ -22,7 +22,7 @@
-# message_pump_libevent.cc includes third_party/libevent/event.h,
-# which we put in $(DIST), see export rule below
-LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES))
++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
endif # }
vpath %.cc \
Deleted: trunk/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,31 +0,0 @@
---- mozilla/js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500
-+++ mozilla/js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500
-@@ -49,6 +49,9 @@
- // Avoid warnings about ASSERT being defined by the assembler as well.
- #undef ASSERT
-
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #ifdef XP_OS2
- #define _PC_53 PC_53
- #define _MCW_EM MCW_EM
-@@ -691,8 +694,18 @@
-
- #else
-
-+#if defined(__FreeBSD__)
-+#if __BSD_VISIBLE == 0
-+#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
-+#endif
-+#include <fenv.h>
-+#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT))
-+#else
-+
- #define FIX_FPU() ((void)0)
-
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
-+
- #endif
-
- JSBool
Deleted: trunk/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
---- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
-+++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
-@@ -57,6 +57,11 @@
- nsresult
- nsThreadManager::Init()
- {
-+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
-+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
-+ if (!gTLSThreadID)
-+ gTLSThreadID = mozilla::threads::Generic;
-+#endif
- mThreadsByPRThread.Init();
-
- if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209040448.q844mh0S008427>