Date: Mon, 19 Nov 2012 21:01:48 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1099 - in trunk: mail/thunderbird www/firefox www/firefox-nightly www/firefox-nightly/files www/seamonkey Message-ID: <201211192101.qAJL1mGL026639@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Nov 19 21:01:48 2012
New Revision: 1099
Log:
update
Added:
trunk/www/firefox-nightly/files/patch-xpcom-base-AvailableMemoryTracker.cpp
Modified:
trunk/mail/thunderbird/Makefile
trunk/mail/thunderbird/distinfo
trunk/www/firefox-nightly/Makefile
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox-nightly/files/patch-bug685258
trunk/www/firefox-nightly/files/patch-bug807492
trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp
trunk/www/firefox/Makefile
trunk/www/firefox/distinfo
trunk/www/seamonkey/Makefile
trunk/www/seamonkey/distinfo
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Mon Nov 19 21:01:38 2012 (r1098)
+++ trunk/mail/thunderbird/Makefile Mon Nov 19 21:01:48 2012 (r1099)
@@ -6,7 +6,7 @@
#
PORTNAME= thunderbird
-DISTVERSION= 17.0b2
+DISTVERSION= 17.0b3
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
Modified: trunk/mail/thunderbird/distinfo
==============================================================================
--- trunk/mail/thunderbird/distinfo Mon Nov 19 21:01:38 2012 (r1098)
+++ trunk/mail/thunderbird/distinfo Mon Nov 19 21:01:48 2012 (r1099)
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-17.0b2.source.tar.bz2) = 32e22234d87541483e22e1bc6725b8da570fcc69a281d473be8470769e6aaf28
-SIZE (thunderbird-17.0b2.source.tar.bz2) = 113367956
+SHA256 (thunderbird-17.0b3.source.tar.bz2) = b0c1ddd077be9f1dbf7d57c89389b01fdd53fca44248d0c632cf3c37a8c0ec37
+SIZE (thunderbird-17.0b3.source.tar.bz2) = 113429937
SHA256 (enigmail-1.4.6.tar.gz) = f3771d1faa26676818bab5e2c50dce85013b9de30b82de526159eaa7ca34f036
SIZE (enigmail-1.4.6.tar.gz) = 1262280
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Mon Nov 19 21:01:38 2012 (r1098)
+++ trunk/www/firefox-nightly/Makefile Mon Nov 19 21:01:48 2012 (r1099)
@@ -17,8 +17,7 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
-BUILD_DEPENDS= nspr>=4.9.3:${PORTSDIR}/devel/nspr \
- nss>=3.14:${PORTSDIR}/security/nss \
+BUILD_DEPENDS= 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 \
@@ -29,7 +28,7 @@
OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= # empty
+USE_MOZILLA= -nspr
MOZILLA_NAME= Nightly
MOZILLA_SUFX= -nightly
MOZILLA= ${PORTNAME}${MOZILLA_SUFX}
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Mon Nov 19 21:01:38 2012 (r1098)
+++ trunk/www/firefox-nightly/Makefile.hgrev Mon Nov 19 21:01:48 2012 (r1099)
@@ -1 +1 @@
-HGREV= 112977:b2bdbfe06b10
+HGREV= 113670:258292c9c929
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Mon Nov 19 21:01:38 2012 (r1098)
+++ trunk/www/firefox-nightly/distinfo Mon Nov 19 21:01:48 2012 (r1099)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/b2bdbfe06b10.tar.bz2) = 11e40fbc9a927f1199e981a5d89c1e68c2b49b602bd99e008cee42c311b5b360
-SIZE (firefox-nightly/b2bdbfe06b10.tar.bz2) = 97034747
+SHA256 (firefox-nightly/258292c9c929.tar.bz2) = cbdffcd5d88a2106ec036d8bd88ef24b9735062f8660c2456830dead4ad7729e
+SIZE (firefox-nightly/258292c9c929.tar.bz2) = 96806280
Modified: trunk/www/firefox-nightly/files/patch-bug685258
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug685258 Mon Nov 19 21:01:38 2012 (r1098)
+++ trunk/www/firefox-nightly/files/patch-bug685258 Mon Nov 19 21:01:48 2012 (r1099)
@@ -3,9 +3,9 @@
# Parent a2291c212856ad27622416e83c8311b6a33b52f1
Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf
-diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
---- content/media/nsAudioStream.cpp
-+++ content/media/nsAudioStream.cpp
+diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp
+--- content/media/AudioStream.cpp
++++ content/media/AudioStream.cpp
@@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo
mFormat = aFormat;
Modified: trunk/www/firefox-nightly/files/patch-bug807492
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492 Mon Nov 19 21:01:38 2012 (r1098)
+++ trunk/www/firefox-nightly/files/patch-bug807492 Mon Nov 19 21:01:48 2012 (r1099)
@@ -1152,7 +1152,7 @@
{
namespace videocapturemodule
diff --git media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc
-index c395fa7..d128d1d 100644
+index 12df1b3..424ea0a 100644
--- media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc
+++ media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc
@@ -7,22 +7,30 @@
@@ -1179,7 +1179,6 @@
+#include <linux/videodev2.h>
+#endif
+
- #include <iostream>
#include <new>
#include "ref_count.h"
@@ -1187,6 +1186,7 @@
#include "thread_wrapper.h"
#include "critical_section_wrapper.h"
#include "video_capture_linux.h"
+
diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
index e3f7bb5..882cede 100644
--- media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
@@ -2055,10 +2055,29 @@
if not prefix:
return
diff --git media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
-index 338d0b7..a509baf 100644
+index 338d0b7..2241d41 100644
--- media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
+++ media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
-@@ -112,24 +112,29 @@ endif
+@@ -4,16 +4,17 @@
+
+ # Python 2.5 needs this for the with statement.
+ from __future__ import with_statement
+
+ import collections
+ import gyp
+ import gyp.common
+ import sys
++import platform
+ import os
+ import re
+ import shlex
+
+ generator_wants_sorted_dependencies = True
+
+ generator_default_variables = {
+ }
+@@ -111,30 +112,44 @@ endif
+
def ensure_directory_exists(path):
dir = os.path.dirname(path)
if dir and not os.path.exists(dir):
@@ -2066,31 +2085,47 @@
def GetFlavor(params):
"""Returns |params.flavor| if it's set, the system's default flavor else."""
++ system = platform.system().lower()
flavors = {
- 'win32': 'win',
-+ 'cygwin': 'win',
- 'darwin': 'mac',
+- 'darwin': 'mac',
- 'sunos5': 'solaris',
- 'freebsd7': 'freebsd',
- 'freebsd8': 'freebsd',
-+ 'sunos': 'solaris',
++ 'microsoft': 'win',
++ 'windows' : 'win',
++ 'darwin' : 'mac',
++ 'sunos' : 'solaris',
++ 'dragonfly': 'bsd',
++ 'freebsd' : 'bsd',
++ 'netbsd' : 'bsd',
++ 'openbsd' : 'bsd',
}
- flavor = flavors.get(sys.platform, 'linux')
- return params.get('flavor', flavor)
-+ # strip major version or '32' from win32
-+ platform = sys.platform.rstrip('0123456789')
+
+ if 'flavor' in params:
+ return params['flavor']
-+ if platform in flavors:
-+ return flavors[platform]
++ if system.startswith('cygwin'):
++ return 'win'
++ if system in flavors:
++ return flavors[system]
+
-+ return platform
++ return 'linux'
def CalculateVariables(default_variables, params):
++ flavor = GetFlavor(params)
++ if flavor == 'bsd':
++ flavor = platform.system().lower()
generator_flags = params.get('generator_flags', {})
- default_variables['OS'] = generator_flags.get('os', GetFlavor(params))
+- default_variables['OS'] = generator_flags.get('os', GetFlavor(params))
++ default_variables['OS'] = generator_flags.get('os', flavor)
def CalculateGeneratorInputInfo(params):
+ """Calculate the generator specific info that gets fed to input (called by
+ gyp)."""
+ generator_flags = params.get('generator_flags', {})
+ if generator_flags.get('adjust_static_libraries', False):
+ global generator_wants_static_library_dependencies_adjusted
Modified: trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp
==============================================================================
--- trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp Mon Nov 19 21:01:38 2012 (r1098)
+++ trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp Mon Nov 19 21:01:48 2012 (r1099)
@@ -1,5 +1,5 @@
---- content/media/nsAudioStream.cpp~
-+++ content/media/nsAudioStream.cpp
+--- content/media/AudioStream.cpp~
++++ content/media/AudioStream.cpp
@@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure)
gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr));
}
Added: trunk/www/firefox-nightly/files/patch-xpcom-base-AvailableMemoryTracker.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-xpcom-base-AvailableMemoryTracker.cpp Mon Nov 19 21:01:48 2012 (r1099)
@@ -0,0 +1,10 @@
+--- 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 Mon Nov 19 21:01:38 2012 (r1098)
+++ trunk/www/firefox/Makefile Mon Nov 19 21:01:48 2012 (r1099)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 17.0b5
+DISTVERSION= 17.0b6
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo Mon Nov 19 21:01:38 2012 (r1098)
+++ trunk/www/firefox/distinfo Mon Nov 19 21:01:48 2012 (r1099)
@@ -1,2 +1,2 @@
-SHA256 (firefox-17.0b5.source.tar.bz2) = 2bdbb72da5a9bf06f1f2814d47f3d0939c61acf5a3cc1cfe0e7a629a58500d14
-SIZE (firefox-17.0b5.source.tar.bz2) = 90948814
+SHA256 (firefox-17.0b6.source.tar.bz2) = 60a720114e3302daa5fbf9c9114ce60ed88e9c4f8d52b289bb75878cf5d4d122
+SIZE (firefox-17.0b6.source.tar.bz2) = 90956559
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Mon Nov 19 21:01:38 2012 (r1098)
+++ trunk/www/seamonkey/Makefile Mon Nov 19 21:01:48 2012 (r1099)
@@ -6,7 +6,7 @@
#
PORTNAME= seamonkey
-DISTVERSION= 2.14b4
+DISTVERSION= 2.14b5
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 Mon Nov 19 21:01:38 2012 (r1098)
+++ trunk/www/seamonkey/distinfo Mon Nov 19 21:01:48 2012 (r1099)
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.14b4.source.tar.bz2) = 0f551c680d1b75f78d94defabb3c029ece8cf215be3c5424f06d7928af4e0f34
-SIZE (seamonkey-2.14b4.source.tar.bz2) = 114095816
+SHA256 (seamonkey-2.14b5.source.tar.bz2) = f071c4c51ab5980e97ea07d1105d7c8d97c47e7cd0431681f8747a741e83e3f0
+SIZE (seamonkey-2.14b5.source.tar.bz2) = 114087777
SHA256 (enigmail-1.4.6.tar.gz) = f3771d1faa26676818bab5e2c50dce85013b9de30b82de526159eaa7ca34f036
SIZE (enigmail-1.4.6.tar.gz) = 1262280
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211192101.qAJL1mGL026639>