[SVN-Commit] r1123 - in trunk: . Mk www/firefox www/firefox-nightly www/firefox-nightly/files www/seamonkey

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Fri Dec 14 04:17:51 UTC 2012 

Author: jbeich
Date: Fri Dec 14 04:17:44 2012
New Revision: 1123

Log:
update

Deleted:
   trunk/www/firefox-nightly/files/patch-xpcom-base-AvailableMemoryTracker.cpp
Modified:
   trunk/Gecko_ChangeLog
   trunk/Gecko_TODO
   trunk/Mk/bsd.gecko.mk
   trunk/www/firefox-nightly/Makefile
   trunk/www/firefox-nightly/Makefile.hgrev
   trunk/www/firefox-nightly/distinfo
   trunk/www/firefox-nightly/files/patch-bug807492
   trunk/www/firefox/Makefile
   trunk/www/firefox/distinfo
   trunk/www/seamonkey/Makefile
   trunk/www/seamonkey/distinfo

Modified: trunk/Gecko_ChangeLog
==============================================================================
--- trunk/Gecko_ChangeLog	Fri Dec 14 04:17:34 2012	(r1122)
+++ trunk/Gecko_ChangeLog	Fri Dec 14 04:17:44 2012	(r1123)
@@ -1,5 +1,3 @@
-17.0:
-- support more h264 codecs when using GSTREAMER with YouTube
-- unbreak build for -esr on -CURRENT after clang became default [1]
-
-PR:	ports/173679 [1]
+18.0:
+- remove QT4 option to avoid confusion
+- add WEBRTC option, untested with cameras

Modified: trunk/Gecko_TODO
==============================================================================
--- trunk/Gecko_TODO	Fri Dec 14 04:17:34 2012	(r1122)
+++ trunk/Gecko_TODO	Fri Dec 14 04:17:44 2012	(r1123)
@@ -1,6 +1,11 @@
 unassigned (upstream):
+- xpcom/base/nsMemoryInfoDumper.cpp
+- xpcom/base/MapsMemoryReporter.cpp
+- media/webrtc/trunk/src/system_wrappers/source/cpu.cc
 - toolkit/crashreporter
-- OSS or GStreamer for media/libcubeb
+- OSS or GStreamer for
+  * media/libcubeb
+  * media/webrtc/trunk/src/modules/audio_device
 - pmc(3) for js/src/perf
   https://developer.mozilla.org/en-US/docs/Performance/JS::PerfMeasurement
 - mozboot (ex.: bug 790750)
@@ -23,5 +28,5 @@
 jbeich:
 - webrtc (testing?)
 - switch to --ignore-unresolved-symbol (waiting for binutils 2.24)
-- add Gtk3 support (waiting for upstream)
+- add Gtk3 support (not landed in m-c yet)
 - move PGO to bsd.gecko.mk (blocked by USE_PYTHON_BUILD in *-esr)

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Fri Dec 14 04:17:34 2012	(r1122)
+++ trunk/Mk/bsd.gecko.mk	Fri Dec 14 04:17:44 2012	(r1123)
@@ -554,10 +554,10 @@
 .if ${MOZILLA_VER:R:R} >= 16 || exists(${.CURDIR}/files/patch-bug788955)
 .if ${OSVERSION} > 1000011
 # use jemalloc 3.0.0 API in libc
-MOZ_EXPORT+=	MOZ_JEMALLOC=1
+MOZ_EXPORT+=	MOZ_JEMALLOC=1 MOZ_JEMALLOC3=1
 .elif ${OSVERSION} > 701106
 MOZ_OPTIONS+=	--enable-jemalloc
-MOZ_EXPORT+=	MOZ_JEMALLOC=1
+MOZ_EXPORT+=	MOZ_JEMALLOC=1 MOZ_JEMALLOC3=1
 .endif
 .endif
 

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Fri Dec 14 04:17:34 2012	(r1122)
+++ trunk/www/firefox-nightly/Makefile	Fri Dec 14 04:17:44 2012	(r1123)
@@ -18,18 +18,18 @@
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.9.4:${PORTSDIR}/devel/nspr \
-		nss>=3.14:${PORTSDIR}/security/nss \
 		sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
 		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
 		unzip:${PORTSDIR}/archivers/unzip
+#		nss>=3.14.1:${PORTSDIR}/security/nss \
 
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
 OBJDIR_BUILD=	# in-tree build broken after bug 789837
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	# empty
+USE_MOZILLA=	-nss
 MOZILLA_NAME=	Nightly
 MOZILLA_SUFX=	-nightly
 MOZILLA=	${PORTNAME}${MOZILLA_SUFX}

Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev	Fri Dec 14 04:17:34 2012	(r1122)
+++ trunk/www/firefox-nightly/Makefile.hgrev	Fri Dec 14 04:17:44 2012	(r1123)
@@ -1 +1 @@
-HGREV=		114744:d9020fa719c5
+HGREV=		115909:8a72b2a22450

Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo	Fri Dec 14 04:17:34 2012	(r1122)
+++ trunk/www/firefox-nightly/distinfo	Fri Dec 14 04:17:44 2012	(r1123)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/d9020fa719c5.tar.bz2) = db96af57c138017acc10af48105bb4e05a9576aac55dbc505c3fd91be43d1afb
-SIZE (firefox-nightly/d9020fa719c5.tar.bz2) = 97741462
+SHA256 (firefox-nightly/8a72b2a22450.tar.bz2) = 44890b65e04452ad4941be406f2515cc61487892972d263c0ca788a600c3a535
+SIZE (firefox-nightly/8a72b2a22450.tar.bz2) = 97468989

Modified: trunk/www/firefox-nightly/files/patch-bug807492
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492	Fri Dec 14 04:17:34 2012	(r1122)
+++ trunk/www/firefox-nightly/files/patch-bug807492	Fri Dec 14 04:17:44 2012	(r1123)
@@ -64,13 +64,13 @@
          ;;
      esac
  fi
-@@ -8865,16 +8876,21 @@ if test "${OS_TARGET}" = "WINNT"; then
-    if test "$HAVE_64BIT_OS"; then
-       OS_BITS=64
+@@ -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 "
+    if test -n "$ARM_ARCH" && test "$ARM_ARCH" -lt 7; then
+       EXTRA_GYP_DEFINES+=" -D armv7=0 "
     else
-       OS_BITS=32
+       EXTRA_GYP_DEFINES+=" -D armv7=1 "
     fi
-    EXTRA_GYP_DEFINES="-D MSVS_VERSION=${_MSVS_VERSION} -D MSVS_OS_BITS=${OS_BITS}"
  fi
  
 +# Don't try to compile sse4.1 code if toolchain doesn't support
@@ -85,7 +85,7 @@
  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} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}"
+    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}"
 diff --git js/src/config/system-headers js/src/config/system-headers
 index 9bd1efa..1095a01 100644
 --- js/src/config/system-headers
@@ -114,20 +114,20 @@
   -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/event \
   $(NULL)
  
--ifeq ($(OS_ARCH), Darwin)
+-ifeq ($(OS_TARGET), Darwin)
 +ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
  LOCAL_INCLUDES += \
    -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include \
    -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \
    $(NULL)
-+ifeq ($(OS_ARCH), Darwin)
++ifeq ($(OS_TARGET), Darwin)
  DEFINES += -DDARWIN
 +else
 +DEFINES += -DBSD
 +endif
  endif
  
- ifeq ($(OS_ARCH), Linux)
+ ifeq ($(OS_TARGET), Linux)
  LOCAL_INCLUDES += \
    -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include \
    -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \

Deleted: trunk/www/firefox-nightly/files/patch-xpcom-base-AvailableMemoryTracker.cpp
==============================================================================
--- trunk/www/firefox-nightly/files/patch-xpcom-base-AvailableMemoryTracker.cpp	Fri Dec 14 04:17:44 2012	(r1122)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- xpcom/base/AvailableMemoryTracker.cpp~
-+++ xpcom/base/AvailableMemoryTracker.cpp
-@@ -499,6 +499,6 @@ nsJemallocFreeDirtyPagesRunnable::Run()
-   MOZ_ASSERT(NS_IsMainThread());
- 
- #if defined(MOZ_JEMALLOC)
--  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
-+//  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
- #elif defined(MOZ_MEMORY)
-   jemalloc_free_dirty_pages();

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Fri Dec 14 04:17:34 2012	(r1122)
+++ trunk/www/firefox/Makefile	Fri Dec 14 04:17:44 2012	(r1123)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	18.0b2
+DISTVERSION=	18.0b4
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -17,11 +17,11 @@
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.9:${PORTSDIR}/devel/nspr \
-		nss>=3.13.6_1:${PORTSDIR}/security/nss \
 		sqlite3>=3.7.12.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
 		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
 		unzip:${PORTSDIR}/archivers/unzip
+#		nss>=3.14.1:${PORTSDIR}/security/nss \
 
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
@@ -29,7 +29,7 @@
 USE_GECKO=	gecko
 CONFLICTS=	firefox-1[07].*
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	# empty
+USE_MOZILLA=	-nss
 MOZILLA_NAME=	Firefox
 
 MAKE_JOBS_SAFE=	yes

Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo	Fri Dec 14 04:17:34 2012	(r1122)
+++ trunk/www/firefox/distinfo	Fri Dec 14 04:17:44 2012	(r1123)
@@ -1,2 +1,2 @@
-SHA256 (firefox-18.0b2.source.tar.bz2) = d6fcb337889810436936a5dc0dac8936029bb4011afe8a0956ee4e1f09773bdb
-SIZE (firefox-18.0b2.source.tar.bz2) = 96713768
+SHA256 (firefox-18.0b4.source.tar.bz2) = 5b0a3eb952171b4bdf78b80e1b18f5cf6c31cdeb8bedc3aebd090a91abfb041b
+SIZE (firefox-18.0b4.source.tar.bz2) = 96916801

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Fri Dec 14 04:17:34 2012	(r1122)
+++ trunk/www/seamonkey/Makefile	Fri Dec 14 04:17:44 2012	(r1123)
@@ -2,7 +2,7 @@
 # $FreeBSD: ports/www/seamonkey/Makefile,v 1.326 2012/06/01 05:25:02 dinoex Exp $
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.15b2
+DISTVERSION=	2.15b3
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source

Modified: trunk/www/seamonkey/distinfo
==============================================================================
--- trunk/www/seamonkey/distinfo	Fri Dec 14 04:17:34 2012	(r1122)
+++ trunk/www/seamonkey/distinfo	Fri Dec 14 04:17:44 2012	(r1123)
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.15b2.source.tar.bz2) = e89a28463bb52d73550ff11766a87abdba3f86aeefacd98e161562e7c6e4703c
-SIZE (seamonkey-2.15b2.source.tar.bz2) = 120021742
+SHA256 (seamonkey-2.15b3.source.tar.bz2) = 87be84196bbf86039a6bc2773919ff42af1f56f673e8b1cedd8caa8b5b5b2eb9
+SIZE (seamonkey-2.15b3.source.tar.bz2) = 120120509
 SHA256 (enigmail-1.4.6.tar.gz) = f3771d1faa26676818bab5e2c50dce85013b9de30b82de526159eaa7ca34f036
 SIZE (enigmail-1.4.6.tar.gz) = 1262280

More information about the freebsd-gecko mailing list