svn commit: r463681 - in branches/2018Q1/www/waterfox: . files
Jan Beich
jbeich at FreeBSD.org
Tue Mar 6 01:01:06 UTC 2018
Author: jbeich
Date: Tue Mar 6 01:01:05 2018
New Revision: 463681
URL: https://svnweb.freebsd.org/changeset/ports/463681
Log:
MFH: r463613 r463676
www/waterfox: update to 56.0.4.36
- Apply some FF59 fixes
Changes: https://github.com/MrAlex94/Waterfox/compare/e03e284b083d...79492ecca478
Approved by: ports-secteam blanket
Added:
branches/2018Q1/www/waterfox/files/patch-bug1434384
- copied unchanged from r463613, head/www/waterfox/files/patch-bug1434384
branches/2018Q1/www/waterfox/files/patch-bug1440943
- copied unchanged from r463613, head/www/waterfox/files/patch-bug1440943
branches/2018Q1/www/waterfox/files/patch-bug1442504
- copied unchanged from r463613, head/www/waterfox/files/patch-bug1442504
Modified:
branches/2018Q1/www/waterfox/Makefile
branches/2018Q1/www/waterfox/distinfo
Directory Properties:
branches/2018Q1/ (props changed)
Modified: branches/2018Q1/www/waterfox/Makefile
==============================================================================
--- branches/2018Q1/www/waterfox/Makefile Tue Mar 6 00:59:22 2018 (r463680)
+++ branches/2018Q1/www/waterfox/Makefile Tue Mar 6 01:01:05 2018 (r463681)
@@ -1,9 +1,8 @@
# $FreeBSD$
PORTNAME= waterfox
-DISTVERSION= 56.0.4-20
-DISTVERSIONSUFFIX= -ge03e284b083d
-PORTREVISION= 3
+DISTVERSION= 56.0.4-36
+DISTVERSIONSUFFIX= -g79492ecca478
CATEGORIES= www ipv6
MAINTAINER= jbeich at FreeBSD.org
Modified: branches/2018Q1/www/waterfox/distinfo
==============================================================================
--- branches/2018Q1/www/waterfox/distinfo Tue Mar 6 00:59:22 2018 (r463680)
+++ branches/2018Q1/www/waterfox/distinfo Tue Mar 6 01:01:05 2018 (r463681)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519322366
-SHA256 (MrAlex94-Waterfox-56.0.4-20-ge03e284b083d_GH0.tar.gz) = f8103fee10acf9e32fc8d9ea8fca6418a557888a2bda781a92e96beb305c8c4e
-SIZE (MrAlex94-Waterfox-56.0.4-20-ge03e284b083d_GH0.tar.gz) = 394048388
+TIMESTAMP = 1520292096
+SHA256 (MrAlex94-Waterfox-56.0.4-36-g79492ecca478_GH0.tar.gz) = c2cf8dc823e9c66976fd4abaa6a308b605706f3b0b740474a65802fe587ea90e
+SIZE (MrAlex94-Waterfox-56.0.4-36-g79492ecca478_GH0.tar.gz) = 394042441
Copied: branches/2018Q1/www/waterfox/files/patch-bug1434384 (from r463613, head/www/waterfox/files/patch-bug1434384)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q1/www/waterfox/files/patch-bug1434384 Tue Mar 6 01:01:05 2018 (r463681, copy of r463613, head/www/waterfox/files/patch-bug1434384)
@@ -0,0 +1,41 @@
+commit 8143391c68e1
+Author: Steve Fink <sfink at mozilla.com>
+Date: Fri Jan 5 14:37:47 2018 -0800
+
+ Bug 1434384 - Mark v1 structured clone data as cross-process. r=jorendorff, a=RyanVM
+
+ --HG--
+ extra : source : d85679eb427513cb18650f3d4e7d37a6ccbefbab
+---
+ js/src/vm/StructuredClone.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git js/src/vm/StructuredClone.cpp js/src/vm/StructuredClone.cpp
+index 55b7fd76ea2d..f595132256e0 100644
+--- js/src/vm/StructuredClone.cpp
++++ js/src/vm/StructuredClone.cpp
+@@ -2374,12 +2374,14 @@ JSStructuredCloneReader::readHeader()
+ return in.reportTruncated();
+
+ if (tag != SCTAG_HEADER) {
+- // Old structured clone buffer. We must have read it from disk or
+- // somewhere, so we can assume it's scope-compatible.
++ // Old structured clone buffer. We must have read it from disk.
++ storedScope = JS::StructuredCloneScope::DifferentProcess;
+ return true;
+ }
+
+ MOZ_ALWAYS_TRUE(in.readPair(&tag, &data));
++ storedScope = JS::StructuredCloneScope(data);
++
+ if (data != uint32_t(JS::StructuredCloneScope::SameProcessSameThread) &&
+ data != uint32_t(JS::StructuredCloneScope::SameProcessDifferentThread) &&
+ data != uint32_t(JS::StructuredCloneScope::DifferentProcess))
+@@ -2388,7 +2390,6 @@ JSStructuredCloneReader::readHeader()
+ "invalid structured clone scope");
+ return false;
+ }
+- storedScope = JS::StructuredCloneScope(data);
+ if (storedScope < allowedScope) {
+ JS_ReportErrorNumberASCII(context(), GetErrorMessage, nullptr, JSMSG_SC_BAD_SERIALIZED_DATA,
+ "incompatible structured clone scope");
Copied: branches/2018Q1/www/waterfox/files/patch-bug1440943 (from r463613, head/www/waterfox/files/patch-bug1440943)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q1/www/waterfox/files/patch-bug1440943 Tue Mar 6 01:01:05 2018 (r463681, copy of r463613, head/www/waterfox/files/patch-bug1440943)
@@ -0,0 +1,60 @@
+commit 00e6df2e9693
+Author: Jonathan Kew <jkew at mozilla.com>
+Date: Tue Feb 27 10:34:25 2018 +0000
+
+ Bug 1440943 - Make GetScriptTagForCode safely return UNKNOWN tag if called with a script code that is out of range for the system ICU version. r=m_kato, a=RyanVM
+
+ --HG--
+ extra : source : 03a12246dd84ae384f973e148cec64662383e588
+---
+ intl/unicharutil/util/nsUnicodeProperties.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git intl/unicharutil/util/nsUnicodeProperties.h intl/unicharutil/util/nsUnicodeProperties.h
+index e2ee2a99bfe4..57cff6bc5562 100644
+--- intl/unicharutil/util/nsUnicodeProperties.h
++++ intl/unicharutil/util/nsUnicodeProperties.h
+@@ -119,7 +119,11 @@ inline uint32_t
+ GetScriptTagForCode(Script aScriptCode)
+ {
+ const char* tag = uscript_getShortName(UScriptCode(aScriptCode));
+- return HB_TAG(tag[0], tag[1], tag[2], tag[3]);
++ if (tag) {
++ return HB_TAG(tag[0], tag[1], tag[2], tag[3]);
++ }
++ // return UNKNOWN script tag (running with older ICU?)
++ return HB_SCRIPT_UNKNOWN;
+ }
+
+ inline PairedBracketType
+commit 412f5f20ada0
+Author: Jonathan Kew <jkew at mozilla.com>
+Date: Tue Feb 27 10:34:25 2018 +0000
+
+ Bug 1440943 - Ensure we don't try to look up script tags for codes that are not supported by the system ICU version. r=m_kato, a=RyanVM
+
+ --HG--
+ extra : source : 34d3a58cafc25d01d081195d2a396bc77342bf2c
+---
+ gfx/thebes/gfxFont.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git gfx/thebes/gfxFont.cpp gfx/thebes/gfxFont.cpp
+index 1409cb087514..e4d04ffd48f5 100644
+--- gfx/thebes/gfxFont.cpp
++++ gfx/thebes/gfxFont.cpp
+@@ -1193,7 +1193,13 @@ gfxFont::CheckForFeaturesInvolvingSpace()
+ new nsDataHashtable<nsUint32HashKey,
+ Script>(size_t(Script::NUM_SCRIPT_CODES));
+ sScriptTagToCode->Put(HB_TAG('D','F','L','T'), Script::COMMON);
+- for (Script s = Script::ARABIC; s < Script::NUM_SCRIPT_CODES;
++ // Ensure that we don't try to look at script codes beyond what the
++ // current version of ICU (at runtime -- in case of system ICU)
++ // knows about.
++ Script scriptCount =
++ Script(std::min<int>(u_getIntPropertyMaxValue(UCHAR_SCRIPT) + 1,
++ int(Script::NUM_SCRIPT_CODES)));
++ for (Script s = Script::ARABIC; s < scriptCount;
+ s = Script(static_cast<int>(s) + 1)) {
+ hb_script_t scriptTag = hb_script_t(GetScriptTagForCode(s));
+ hb_tag_t s1, s2;
Copied: branches/2018Q1/www/waterfox/files/patch-bug1442504 (from r463613, head/www/waterfox/files/patch-bug1442504)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q1/www/waterfox/files/patch-bug1442504 Tue Mar 6 01:01:05 2018 (r463681, copy of r463613, head/www/waterfox/files/patch-bug1442504)
@@ -0,0 +1,50 @@
+commit a5cc1f334aca
+Author: Jeff Gilbert <jgilbert at mozilla.com>
+Date: Sat Mar 3 00:50:10 2018 +0200
+
+ Bug 1442504 - Disable disjoint timer queries. r=milan, a=RyanVM
+
+ MozReview-Commit-ID: IurPcGHzAoQ
+
+ --HG--
+ extra : source : bef3db82d7ca31a188f902e317713c88001938ed
+---
+ dom/canvas/WebGLContextExtensions.cpp | 4 ++--
+ dom/canvas/test/webgl-mochitest/mochitest.ini | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git dom/canvas/WebGLContextExtensions.cpp dom/canvas/WebGLContextExtensions.cpp
+index 120ca85a01a2..04cbbbe6b31d 100644
+--- dom/canvas/WebGLContextExtensions.cpp
++++ dom/canvas/WebGLContextExtensions.cpp
+@@ -93,6 +93,8 @@ bool WebGLContext::IsExtensionSupported(dom::CallerType callerType,
+
+ if (allowPrivilegedExts) {
+ switch (ext) {
++ case WebGLExtensionID::EXT_disjoint_timer_query:
++ return WebGLExtensionDisjointTimerQuery::IsSupported(this);
+ case WebGLExtensionID::MOZ_debug:
+ return true;
+ case WebGLExtensionID::WEBGL_debug_renderer_info:
+@@ -118,8 +120,6 @@ WebGLContext::IsExtensionSupported(WebGLExtensionID ext) const
+ switch (ext) {
+ // In alphabetical order
+ // EXT_
+- case WebGLExtensionID::EXT_disjoint_timer_query:
+- return WebGLExtensionDisjointTimerQuery::IsSupported(this);
+ case WebGLExtensionID::EXT_texture_filter_anisotropic:
+ return gl->IsExtensionSupported(gl::GLContext::EXT_texture_filter_anisotropic);
+
+diff --git dom/canvas/test/webgl-mochitest/mochitest.ini dom/canvas/test/webgl-mochitest/mochitest.ini
+index d36e66b7cdbd..08e2dd335dce 100644
+--- dom/canvas/test/webgl-mochitest/mochitest.ini
++++ dom/canvas/test/webgl-mochitest/mochitest.ini
+@@ -19,7 +19,7 @@ fail-if = (os == 'android')
+ [ensure-exts/test_EXT_color_buffer_half_float.html]
+ fail-if = (os == 'android')
+ [ensure-exts/test_EXT_disjoint_timer_query.html]
+-fail-if = (os == 'android') || (os == 'mac') || (os == 'win' && os_version == '5.1')
++fail-if = 1
+ [ensure-exts/test_EXT_frag_depth.html]
+ fail-if = (os == 'android')
+ [ensure-exts/test_EXT_sRGB.html]
More information about the svn-ports-branches
mailing list