From owner-freebsd-gecko@FreeBSD.ORG Fri Jan 25 12:02:31 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2EF1C7C7 for ; Fri, 25 Jan 2013 12:02:31 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id C7CEB646 for ; Fri, 25 Jan 2013 12:02:30 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0PC2N5o032148 for ; Fri, 25 Jan 2013 12:02:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0PC2I6o030299 for freebsd-gecko@freebsd.org; Fri, 25 Jan 2013 12:02:18 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 25 Jan 2013 12:02:18 GMT Message-Id: <201301251202.r0PC2I6o030299@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1148 - in trunk: mail/thunderbird www/firefox www/firefox-nightly www/firefox-nightly/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jan 2013 12:02:31 -0000 Author: jbeich Date: Fri Jan 25 12:02:18 2013 New Revision: 1148 Log: update, GNOMEVFS2 no longer fails on Nightly Modified: trunk/mail/thunderbird/Makefile trunk/mail/thunderbird/distinfo 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/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Thu Jan 24 23:37:58 2013 (r1147) +++ trunk/mail/thunderbird/Makefile Fri Jan 25 12:02:18 2013 (r1148) @@ -2,16 +2,12 @@ # $FreeBSD: head/mail/thunderbird/Makefile 310165 2013-01-09 23:28:19Z flo $ PORTNAME= thunderbird -PORTVERSION= 19.0.b1 -DISTVERSION= 2.16b1 +DISTVERSION= 19.0b1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source -DISTFILES= seamonkey-${DISTVERSION}.source${EXTRACT_SUFX} -EXTRACT_ONLY= seamonkey-${DISTVERSION}.source${EXTRACT_SUFX} -#MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -#DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} -#EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} +MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source +DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above Modified: trunk/mail/thunderbird/distinfo ============================================================================== --- trunk/mail/thunderbird/distinfo Thu Jan 24 23:37:58 2013 (r1147) +++ trunk/mail/thunderbird/distinfo Fri Jan 25 12:02:18 2013 (r1148) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.16b1.source.tar.bz2) = 4feabd38674595c839e689142106bb1428dcdc1d5575e02ad5375039e1d047e7 -SIZE (seamonkey-2.16b1.source.tar.bz2) = 122349139 +SHA256 (thunderbird-19.0b1.source.tar.bz2) = e200382789f1af417065a0f523902b660e1b7e03e31e3059adcc98db827df158 +SIZE (thunderbird-19.0b1.source.tar.bz2) = 121440940 SHA256 (enigmail-1.5.0.tar.gz) = 51f55573448586718c8d7e664329d519b02c4b28af4910bcb550961ace9a9e71 SIZE (enigmail-1.5.0.tar.gz) = 1216071 Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Thu Jan 24 23:37:58 2013 (r1147) +++ trunk/www/firefox-nightly/Makefile.hgrev Fri Jan 25 12:02:18 2013 (r1148) @@ -1 +1 @@ -HGREV= 119127:b52c02f77cf5 +HGREV= 119809:a207f33adc1a Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Thu Jan 24 23:37:58 2013 (r1147) +++ trunk/www/firefox-nightly/distinfo Fri Jan 25 12:02:18 2013 (r1148) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/b52c02f77cf5.tar.bz2) = 1e64e6907fbaf4b72cacf91a40143c24ba128733d9d26fa2781decdf42d261e8 -SIZE (firefox-nightly/b52c02f77cf5.tar.bz2) = 98505599 +SHA256 (firefox-nightly/a207f33adc1a.tar.bz2) = 32e3bbb22685d8c75e4af8d387151f5a3999800486362c2d732f0352c0bc2148 +SIZE (firefox-nightly/a207f33adc1a.tar.bz2) = 100615158 Modified: trunk/www/firefox-nightly/files/patch-bug807492 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug807492 Thu Jan 24 23:37:58 2013 (r1147) +++ trunk/www/firefox-nightly/files/patch-bug807492 Fri Jan 25 12:02:18 2013 (r1148) @@ -39,20 +39,20 @@ + # Turn on GNU-specific warnings: # -Wall - turn on a lot of warnings - # -pedantic - this is turned on below - # -Wpointer-arith - enabled with -pedantic, but good to have even if not + # -Wpointer-arith - good to have # -Wdeclaration-after-statement - MSVC doesn't like these # -Werror=return-type - catches missing returns, zero false positives # -Wtype-limits - catches overflow bugs, few false positives # -Wempty-body - catches bugs, e.g. "if (c); foo();", few false positives -@@ -5232,17 +5243,17 @@ 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 + # +@@ -5211,17 +5222,17 @@ if test -n "$MOZ_WEBRTC"; then *-android*|*-linuxandroid*) - dnl Make sure doesn't get matched by *-linux* - MOZ_WEBRTC= + 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*) @@ -64,12 +64,12 @@ ;; esac fi -@@ -9032,16 +9043,21 @@ elif test "${OS_TARGET}" = "Android"; th - EXTRA_GYP_DEFINES="-D gtest_target_type=executable -D android_toolchain=${android_toolchain} -G os=android " +@@ -9004,16 +9015,21 @@ elif test "${OS_TARGET}" = "Android"; th + fi if test -n "$ARM_ARCH" && test "$ARM_ARCH" -lt 7; then - EXTRA_GYP_DEFINES+=" -D armv7=0 " + EXTRA_GYP_DEFINES="${EXTRA_GYP_DEFINES} -D armv7=0 " else - EXTRA_GYP_DEFINES+=" -D armv7=1 " + EXTRA_GYP_DEFINES="${EXTRA_GYP_DEFINES} -D armv7=1 " fi fi @@ -81,11 +81,11 @@ if test -n "$MOZ_WEBRTC"; then AC_MSG_RESULT("generating WebRTC Makefiles...") - dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries - dnl so that regeneration via dependencies works correctly - WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi" - - GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} -D target_arch=${WEBRTC_TARGET_ARCH} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}" + if test "${MOZ_WIDGET_TOOLKIT}" = "gonk"; then + EXTRA_GYP_DEFINES="${EXTRA_GYP_DEFINES} -D moz_widget_toolkit_gonk=1" + else + EXTRA_GYP_DEFINES="${EXTRA_GYP_DEFINES} -D moz_widget_toolkit_gonk=0" + fi diff --git js/src/config/system-headers js/src/config/system-headers index 9bd1efa..1095a01 100644 --- js/src/config/system-headers @@ -1742,7 +1742,7 @@ WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, "Available number of cores:%d", _numberOfCores); - #elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) + #elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK) _numberOfCores = get_nprocs(); WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, "Available number of cores:%d", _numberOfCores); Modified: trunk/www/firefox-nightly/files/patch-bug826985 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug826985 Thu Jan 24 23:37:58 2013 (r1147) +++ trunk/www/firefox-nightly/files/patch-bug826985 Fri Jan 25 12:02:18 2013 (r1148) @@ -15,9 +15,14 @@ index 6d05f9c..297615f 100644 --- configure.in +++ configure.in -@@ -5279,6 +5279,18 @@ if test -n "$MOZ_WEBRTC"; then - MOZ_VP8_ENCODER=1 - MOZ_VP8_ERROR_CONCEALMENT=1 +@@ -5256,16 +5267,28 @@ if test -n "$MOZ_WEBRTC"; then + fi + case "$target" in + *-android*|*-linuxandroid*) + LDFLAGS="$LDFLAGS -lOpenSLES" + ;; + esac + fi + dnl use libv4l on Linux to support more cameras + case "$target" in @@ -31,9 +36,14 @@ + ;; + esac + - 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 we make --enable-webrtc on by default in Android (bug 815905) + dnl enable once Signaling lands + MOZ_WEBRTC_SIGNALING=1 + AC_DEFINE(MOZ_WEBRTC_SIGNALING) + if test "${OS_TARGET}" = "WINNT"; then + MOZ_WEBRTC_IN_LIBXUL=1 + fi + dnl enable once PeerConnection lands + MOZ_PEERCONNECTION=1 @@ -5311,6 +5323,7 @@ AC_SUBST(MOZ_WEBRTC) AC_SUBST(MOZ_WEBRTC_LEAKING_TESTS) AC_SUBST(MOZ_WEBRTC_SIGNALING) Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Thu Jan 24 23:37:58 2013 (r1147) +++ trunk/www/firefox/Makefile Fri Jan 25 12:02:18 2013 (r1148) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $ PORTNAME= firefox -DISTVERSION= 19.0b2 +DISTVERSION= 19.0b3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Thu Jan 24 23:37:58 2013 (r1147) +++ trunk/www/firefox/distinfo Fri Jan 25 12:02:18 2013 (r1148) @@ -1,2 +1,2 @@ -SHA256 (firefox-19.0b2.source.tar.bz2) = 2430d20cbc23d2c7483757cc7bbd7303cd12d8fe749bd6a7e6069bb69f7cb6fe -SIZE (firefox-19.0b2.source.tar.bz2) = 98893896 +SHA256 (firefox-19.0b3.source.tar.bz2) = 6bae086fba574fd7afde3ce48eacb253bf5f74ac4fbd7962fac5dc9598395365 +SIZE (firefox-19.0b3.source.tar.bz2) = 98935380