Date: Sat, 17 Aug 2013 02:46:35 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1319 - in trunk/www: firefox firefox-nightly firefox-nightly/files Message-ID: <201308170246.r7H2kZji052588@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Aug 17 02:46:35 2013
New Revision: 1319
Log:
update
Added:
trunk/www/firefox-nightly/files/patch-bug905920
Modified:
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox-nightly/files/patch-bug851992
trunk/www/firefox/Makefile
trunk/www/firefox/distinfo
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Fri Aug 16 00:18:38 2013 (r1318)
+++ trunk/www/firefox-nightly/Makefile.hgrev Sat Aug 17 02:46:35 2013 (r1319)
@@ -1 +1 @@
-HGREV= 142580:4930fdea3efa
+HGREV= 142904:8ad1e4c838c8
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Fri Aug 16 00:18:38 2013 (r1318)
+++ trunk/www/firefox-nightly/distinfo Sat Aug 17 02:46:35 2013 (r1319)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/4930fdea3efa.tar.bz2) = 9a6e68c278cd94bc9a85b4b9bb68b8f5c326634de53d6d5921d1d75559fe25a0
-SIZE (firefox-nightly/4930fdea3efa.tar.bz2) = 125383772
+SHA256 (firefox-nightly/8ad1e4c838c8.tar.bz2) = 28759c2261073c8ca4206006c1f1ac2106b6d308e9eab83cc1bc0d5177d2f0d7
+SIZE (firefox-nightly/8ad1e4c838c8.tar.bz2) = 125415153
Modified: trunk/www/firefox-nightly/files/patch-bug851992
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug851992 Fri Aug 16 00:18:38 2013 (r1318)
+++ trunk/www/firefox-nightly/files/patch-bug851992 Sat Aug 17 02:46:35 2013 (r1319)
@@ -1,7 +1,12 @@
+# HG changeset patch
+# User Makoto Kato <m_kato@ga2.so-net.ne.jp>
+
+Bug 851992 - Allow building against system ICU library. r=glandium f=gaston
+
diff --git a/config/Makefile.in b/config/Makefile.in
--- config/Makefile.in
+++ config/Makefile.in
-@@ -97,16 +97,17 @@ export:: $(export-preqs)
+@@ -93,16 +93,17 @@ export:: $(export-preqs)
-DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \
-DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \
-DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \
@@ -22,7 +27,7 @@
diff --git a/config/system-headers b/config/system-headers
--- config/system-headers
+++ config/system-headers
-@@ -1125,8 +1125,19 @@ gst/video/video.h
+@@ -1127,8 +1127,19 @@ gst/video/video.h
sys/msg.h
sys/ipc.h
sys/thr.h
@@ -45,7 +50,7 @@
diff --git a/configure.in b/configure.in
--- configure.in
+++ configure.in
-@@ -4134,16 +4134,32 @@ if test -n "$MOZ_NATIVE_FFI"; then
+@@ -4106,16 +4106,32 @@ if test -n "$MOZ_NATIVE_FFI"; then
PKG_CHECK_MODULES(MOZ_FFI, libffi > 3.0.9)
else
PKG_CHECK_MODULES(MOZ_FFI, libffi >= 3.0.9)
@@ -81,7 +86,7 @@
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
--- js/src/Makefile.in
+++ js/src/Makefile.in
-@@ -232,48 +232,54 @@ endif
+@@ -225,22 +225,27 @@ endif
#############################################
# BEGIN ECMAScript Internationalization API
@@ -100,6 +105,7 @@
+endif
ifdef ENABLE_INTL_API
++ifndef MOZ_NATIVE_ICU
ifeq ($(OS_ARCH),WINNT)
# Parallel gmake is buggy on Windows
@@ -108,35 +114,25 @@
# and debug libraries.
ifdef MOZ_DEBUG
ICU_LIB_SUFFIX=d
- endif
- ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\
- cp -p intl/icu/lib/s$(libname)$(ICU_LIB_SUFFIX).lib intl/icu/lib/$(libname).lib;)
- endif
-
-+ifndef MOZ_NATIVE_ICU
- # - Build ICU as part of the "export" target, so things get built
- # in the right order.
- # - ICU requires GNU make according to its readme.html. pymake can't be used
- # because it doesn't support order only dependencies.
- # - Force ICU to use the standard suffix for object files because expandlibs
- # will discard all files with a non-standard suffix (bug 857450).
- # - Options for genrb: -k strict parsing; -R omit collation tailoring rules.
+@@ -259,16 +264,17 @@ endif
export::
$(GMAKE) $(ICU_GMAKE_OPTIONS) -C intl/icu STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R'
$(ICU_LIB_RENAME)
distclean clean::
$(call SUBMAKE,$@,intl/icu)
-+endif
endif
++endif
#
# END ECMAScript Internationalization API
#############################################
-@@ -398,17 +404,21 @@ CFLAGS += $(MOZ_ZLIB_CFLAGS)
+ # The "find any vanilla new/new[] calls" script is tailored to Linux, so
+ # only run it there. That should be enough to catch any such calls that
+@@ -382,17 +388,21 @@ CFLAGS += $(MOZ_ZLIB_CFLAGS)
EXTRA_LIBS += $(MOZ_ZLIB_LIBS)
# Enable zlib usage if zlib has been located. When building the browser on
# Windows, MOZ_ZLIB_LIBS is empty because zlib is part of libmozglue. We thus
@@ -183,7 +179,7 @@
diff --git a/js/src/config/system-headers b/js/src/config/system-headers
--- js/src/config/system-headers
+++ js/src/config/system-headers
-@@ -1125,8 +1125,19 @@ gst/video/video.h
+@@ -1127,8 +1127,19 @@ gst/video/video.h
sys/msg.h
sys/ipc.h
sys/thr.h
@@ -206,7 +202,12 @@
diff --git a/js/src/configure.in b/js/src/configure.in
--- js/src/configure.in
+++ js/src/configure.in
-@@ -4254,6 +4254,16 @@ fi
+@@ -4251,16 +4251,26 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE_GTK" ; then
+ AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION)
+ AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION)
+ fi
+
+
dnl ========================================================
dnl ECMAScript Internationalization API Support (uses ICU)
dnl ========================================================
@@ -223,24 +224,34 @@
MOZ_ARG_WITH_STRING(intl-api,
[ --with-intl-api, --with-intl-api=build, --without-intl-api
-@@ -4288,37 +4298,36 @@ fi
+ Determine the status of the ECMAScript Internationalization API. The first
+ (or lack of any of these) builds and exposes the API. The second builds it
+ but doesn't use ICU or expose the API to script. The third doesn't build
+ ICU at all.],
+ _INTL_API=$withval,
+@@ -4285,47 +4295,46 @@ esac
+
+ if test -n "$EXPOSE_INTL_API"; then
+ AC_DEFINE(EXPOSE_INTL_API)
+ fi
+
dnl Settings for the implementation of the ECMAScript Internationalization API
if test -n "$ENABLE_INTL_API"; then
AC_DEFINE(ENABLE_INTL_API)
- # We build ICU as a static library.
- AC_DEFINE(U_STATIC_IMPLEMENTATION)
-
+-
- case "$OS_TARGET" in
- WINNT)
- ICU_LIB_NAMES="icuin icuuc icudt"
- ;;
-- Darwin|Linux)
+- Darwin|Linux|DragonFly|FreeBSD|NetBSD|OpenBSD)
- ICU_LIB_NAMES="icui18n icuuc icudata"
- ;;
- *)
- AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
- esac
--
+
- ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)'
-else
- ICU_LIB_NAMES=
@@ -250,7 +261,7 @@
+ WINNT)
+ ICU_LIB_NAMES="icuin icuuc icudt"
+ ;;
-+ Darwin|Linux)
++ Darwin|Linux|DragonFly|FreeBSD|NetBSD|OpenBSD)
+ ICU_LIB_NAMES="icui18n icuuc icudata"
+ ;;
+ *)
@@ -283,6 +294,11 @@
# Set ICU compile options
ICU_CPPFLAGS=""
# don't use icu namespace automatically in client code
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_USING_ICU_NAMESPACE=0"
+ # don't include obsolete header files
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
+ # remove chunks of the library that we don't need (yet)
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DUCONFIG_NO_LEGACY_CONVERSION"
diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in
--- js/src/gdb/Makefile.in
+++ js/src/gdb/Makefile.in
Added: trunk/www/firefox-nightly/files/patch-bug905920
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug905920 Sat Aug 17 02:46:35 2013 (r1319)
@@ -0,0 +1,10 @@
+--- xpcom/base/nsCycleCollector.cpp~
++++ xpcom/base/nsCycleCollector.cpp
+@@ -135,6 +135,7 @@
+ #include "mozilla/mozPoisonWrite.h"
+ #include "mozilla/Mutex.h"
+ #include "mozilla/Telemetry.h"
++#include "mozilla/ThreadLocal.h"
+
+ using namespace mozilla;
+
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Fri Aug 16 00:18:38 2013 (r1318)
+++ trunk/www/firefox/Makefile Sat Aug 17 02:46:35 2013 (r1319)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $
PORTNAME= firefox
-DISTVERSION= 24.0b2
+DISTVERSION= 24.0b3
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo Fri Aug 16 00:18:38 2013 (r1318)
+++ trunk/www/firefox/distinfo Sat Aug 17 02:46:35 2013 (r1319)
@@ -1,2 +1,2 @@
-SHA256 (firefox-24.0b2.source.tar.bz2) = 2300fb78f8ea4ef3df0c7506fcea412c07244495f6b4a2272de946a5b881edae
-SIZE (firefox-24.0b2.source.tar.bz2) = 119886288
+SHA256 (firefox-24.0b3.source.tar.bz2) = 7da063d5bcae3e92bb1c2dd084cb97d38ba9795e35d264f2c1a4f7f87a0bbefe
+SIZE (firefox-24.0b3.source.tar.bz2) = 119892674
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308170246.r7H2kZji052588>