Date: Wed, 17 Apr 2013 14:31:28 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1243 - in trunk: . www/firefox www/firefox-nightly www/firefox-nightly/files Message-ID: <201304171431.r3HEVSbK057174@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Apr 17 14:31:28 2013
New Revision: 1243
Log:
update
Added:
trunk/www/firefox-nightly/files/patch-bug862759
Modified:
trunk/Gecko_TODO
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox-nightly/files/patch-bug807492
trunk/www/firefox-nightly/files/patch-bug826985
trunk/www/firefox/Makefile
trunk/www/firefox/distinfo
Modified: trunk/Gecko_TODO
==============================================================================
--- trunk/Gecko_TODO Wed Apr 17 14:31:18 2013 (r1242)
+++ trunk/Gecko_TODO Wed Apr 17 14:31:28 2013 (r1243)
@@ -3,6 +3,7 @@
- xpcom/base/MapsMemoryReporter.cpp
- media/webrtc/trunk/src/system_wrappers/source/cpu.cc
- toolkit/crashreporter
+- tools/profiler
- netwerk/wifi backend can be based on
www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
- libusbhid(3) for hal/linux/LinuxGamepad.cpp
@@ -18,6 +19,9 @@
unassigned (ports):
- port libxul-1.9 consumers to libxul-10, lest they be removed
- add BlueGriffon to replace www/kompozer
+- add TorBrowserBundle:
+ * linux version requires newer glibc/gtk
+ * native needs privacy audit of our build glue
- switch to system libxul (needs slaves with common patches);
a Debian patch to reduce configure time can be useful
- move duplicated `>=' deps into bsd.gecko.mk (system libxul?)
@@ -28,6 +32,8 @@
(layers.acceleration.force-enabled -> true ?)
jbeich:
+- remove 9.0 support at esr24
+- remove WEBRTC option at 22.0 -> always build with
- switch to --ignore-unresolved-symbol (waiting for binutils 2.24)
- add Gtk3 support (not landed in m-c yet)
- move PGO to bsd.gecko.mk (blocked by USE_PYTHON_BUILD in *-esr)
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Wed Apr 17 14:31:18 2013 (r1242)
+++ trunk/www/firefox-nightly/Makefile.hgrev Wed Apr 17 14:31:28 2013 (r1243)
@@ -1 +1 @@
-HGREV= 126934:e53044984f1b
+HGREV= 128981:ef0432d35332
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Wed Apr 17 14:31:18 2013 (r1242)
+++ trunk/www/firefox-nightly/distinfo Wed Apr 17 14:31:28 2013 (r1243)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/e53044984f1b.tar.bz2) = a98e8fbb516eb49fcc545748a2f15d563eba4883f231e104337f9539488a51b9
-SIZE (firefox-nightly/e53044984f1b.tar.bz2) = 109622235
+SHA256 (firefox-nightly/ef0432d35332.tar.bz2) = 1580f476a5ceb73467649022e59d81e6f3ba1c5af960bdae9255a58e152589fd
+SIZE (firefox-nightly/ef0432d35332.tar.bz2) = 110034197
Modified: trunk/www/firefox-nightly/files/patch-bug807492
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492 Wed Apr 17 14:31:18 2013 (r1242)
+++ trunk/www/firefox-nightly/files/patch-bug807492 Wed Apr 17 14:31:28 2013 (r1243)
@@ -17,17 +17,17 @@
index c167461..8346c11 100644
--- configure.in
+++ configure.in
-@@ -5258,17 +5258,17 @@ if test -n "$MOZ_WEBRTC"; then
- *-android*|*-linuxandroid*)
- if test -n "$MOZ_B2G"; then
- MOZ_WEBRTC=1
- else
- dnl Make sure doesn't get matched by *-linux*
- MOZ_WEBRTC=
- fi
- ;;
-- *-linux*|*-mingw*|*-darwin*)
-+ *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
+@@ -5246,17 +5246,17 @@ if test "$NS_PRINTING"; then
+ AC_DEFINE(NS_PRINT_PREVIEW)
+ fi
+
+ dnl Turn off webrtc for OS's we don't handle yet, but allow
+ dnl --enable-webrtc to override. Can disable for everything in
+ dnl the master list above.
+ if test -n "$MOZ_WEBRTC"; then
+ case "$target" in
+- *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*)
++ *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
dnl Leave enabled
;;
*)
@@ -317,12 +317,12 @@
if (!(my_locale = r_strdup(setlocale(LC_CTYPE, 0))))
ABORT(R_NO_MEMORY);
-@@ -93,28 +101,28 @@ mbslen(const char *s, size_t *ncharsp)
- #else
+@@ -94,28 +102,28 @@ mbslen(const char *s, size_t *ncharsp)
/* can't count UTF-8 characters with mbrlen if the locale isn't UTF-8 */
/* null-checking setlocale is required because Android */
char *locale = setlocale(LC_CTYPE, 0);
- if (!locale || !strcasestr(locale, "UTF-8"))
+ /* some systems use "utf8" instead of "UTF-8" like Fedora 17 */
+ if (!locale || (!strcasestr(locale, "UTF-8") && !strcasestr(locale, "UTF8")))
ABORT(R_NOT_FOUND);
#endif
@@ -344,12 +344,12 @@
+#endif /* HAVE_XLOCALE */
{
if (nbytes == (size_t)-1) /* should never happen */ {
- assert(0);
ABORT(R_INTERNAL);
}
if (nbytes == (size_t)-2) /* encoding error */ {
- assert(0);
ABORT(R_BAD_DATA);
+ }
+
diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp
index 3cc8e1c..74016c6 100644
--- media/mtransport/third_party/nrappkit/nrappkit.gyp
Modified: trunk/www/firefox-nightly/files/patch-bug826985
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug826985 Wed Apr 17 14:31:18 2013 (r1242)
+++ trunk/www/firefox-nightly/files/patch-bug826985 Wed Apr 17 14:31:28 2013 (r1243)
@@ -16,16 +16,16 @@
index 55e4cd1..76567b3 100644
--- configure.in
+++ configure.in
-@@ -5294,6 +5294,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5309,6 +5309,9 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_VP8_ENCODER=1
MOZ_VP8_ERROR_CONCEALMENT=1
+ dnl with libv4l2 we can support more cameras
+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
+
- if test "$MOZ_WIDGET_TOOLKIT" != "gonk"; then
- dnl OpenSLES is only available in Android 2.3 and later; we'll change this
- dnl hard dependency to a dynamic load with graceful runtime failure before
+ dnl enable once Signaling lands
+ MOZ_WEBRTC_SIGNALING=1
+ AC_DEFINE(MOZ_WEBRTC_SIGNALING)
@@ -8981,6 +8984,10 @@ elif test "${OS_TARGET}" = "Android"; then
fi
fi
Added: trunk/www/firefox-nightly/files/patch-bug862759
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug862759 Wed Apr 17 14:31:28 2013 (r1243)
@@ -0,0 +1,10 @@
+--- js/src/frontend/ParseMaps.cpp~
++++ js/src/frontend/ParseMaps.cpp
+@@ -134,5 +134,5 @@ frontend::InitAtomMap(JSContext *cx, frontend::AtomIndexMap *indices, HeapPtrAto
+ }
+ }
+
+-template class AtomDecls<FullParseHandler>;
+-template class AtomDecls<SyntaxParseHandler>;
++template class frontend::AtomDecls<FullParseHandler>;
++template class frontend::AtomDecls<SyntaxParseHandler>;
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Wed Apr 17 14:31:18 2013 (r1242)
+++ trunk/www/firefox/Makefile Wed Apr 17 14:31:28 2013 (r1243)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $
PORTNAME= firefox
-DISTVERSION= 21.0b1
+DISTVERSION= 21.0b3
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo Wed Apr 17 14:31:18 2013 (r1242)
+++ trunk/www/firefox/distinfo Wed Apr 17 14:31:28 2013 (r1243)
@@ -1,2 +1,2 @@
-SHA256 (firefox-21.0b1.source.tar.bz2) = 74330638c18df570a70df439d8b975bbfe09b36e911be95553fa2176104caeb6
-SIZE (firefox-21.0b1.source.tar.bz2) = 105191317
+SHA256 (firefox-21.0b3.source.tar.bz2) = 7361cefa8c23a7fb2b4372afd2dcccba305e05679c4b5501b1e8cd35627d7392
+SIZE (firefox-21.0b3.source.tar.bz2) = 105415290
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304171431.r3HEVSbK057174>