Index: branches/2018Q1/www/waterfox/Makefile =================================================================== --- branches/2018Q1/www/waterfox/Makefile (revision 463680) +++ branches/2018Q1/www/waterfox/Makefile (revision 463681) @@ -1,75 +1,74 @@ # $FreeBSD$ PORTNAME= waterfox -DISTVERSION= 56.0.4-20 -DISTVERSIONSUFFIX= -ge03e284b083d -PORTREVISION= 3 +DISTVERSION= 56.0.4-36 +DISTVERSIONSUFFIX= -g79492ecca478 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org COMMENT= Distilled fork of Firefox DEPRECATED= Temporary experiment EXPIRATION_DATE=2018-03-20 BUILD_DEPENDS= nspr>=4.16:devel/nspr \ nss>=3.32.1:security/nss \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=1.4.7:print/harfbuzz \ graphite2>=1.3.10:graphics/graphite2 \ png>=1.6.31:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.19.3:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip # soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l USE_GITHUB= yes GH_ACCOUNT= MrAlex94 GH_PROJECT= Waterfox USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -soundtouch MOZILLA_NAME= Waterfox USE_GL= gl WATERFOX_ICON= ${MOZILLA}.png WATERFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default256.png WATERFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop MOZ_OPTIONS= --enable-application=browser \ --with-app-name=${MOZILLA} \ --with-app-basename=${MOZILLA_NAME} \ --with-distribution-id=org.${MOZILLA}project OPTIONS_DEFAULT= BUNDLED_CAIRO .include "${.CURDIR}/../../www/firefox/Makefile.options" post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e 's/firefox/${MOZILLA}/' \ -e 's/Firefox/${MOZILLA_NAME}/' \ ${WATERFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${WATERFOX_DESKTOP} \ ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${WATERFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${WATERFOX_ICON} .include Index: branches/2018Q1/www/waterfox/distinfo =================================================================== --- branches/2018Q1/www/waterfox/distinfo (revision 463680) +++ branches/2018Q1/www/waterfox/distinfo (revision 463681) @@ -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 Index: branches/2018Q1/www/waterfox/files/patch-bug1434384 =================================================================== --- branches/2018Q1/www/waterfox/files/patch-bug1434384 (nonexistent) +++ branches/2018Q1/www/waterfox/files/patch-bug1434384 (revision 463681) @@ -0,0 +1,41 @@ +commit 8143391c68e1 +Author: Steve Fink +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"); Property changes on: branches/2018Q1/www/waterfox/files/patch-bug1434384 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/www/waterfox/files/patch-bug1440943 =================================================================== --- branches/2018Q1/www/waterfox/files/patch-bug1440943 (nonexistent) +++ branches/2018Q1/www/waterfox/files/patch-bug1440943 (revision 463681) @@ -0,0 +1,60 @@ +commit 00e6df2e9693 +Author: Jonathan Kew +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 +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(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(u_getIntPropertyMaxValue(UCHAR_SCRIPT) + 1, ++ int(Script::NUM_SCRIPT_CODES))); ++ for (Script s = Script::ARABIC; s < scriptCount; + s = Script(static_cast(s) + 1)) { + hb_script_t scriptTag = hb_script_t(GetScriptTagForCode(s)); + hb_tag_t s1, s2; Property changes on: branches/2018Q1/www/waterfox/files/patch-bug1440943 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/www/waterfox/files/patch-bug1442504 =================================================================== --- branches/2018Q1/www/waterfox/files/patch-bug1442504 (nonexistent) +++ branches/2018Q1/www/waterfox/files/patch-bug1442504 (revision 463681) @@ -0,0 +1,50 @@ +commit a5cc1f334aca +Author: Jeff Gilbert +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] Property changes on: branches/2018Q1/www/waterfox/files/patch-bug1442504 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1 =================================================================== --- branches/2018Q1 (revision 463680) +++ branches/2018Q1 (revision 463681) Property changes on: branches/2018Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r463613,463676