Index: head/www/waterfox/Makefile =================================================================== --- head/www/waterfox/Makefile (revision 471733) +++ head/www/waterfox/Makefile (revision 471734) @@ -1,78 +1,78 @@ # $FreeBSD$ PORTNAME= waterfox DISTVERSION= 56.2.0-31 DISTVERSIONSUFFIX= -gf435a827f82ac -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org COMMENT= Distilled fork of Firefox DEPRECATED= Temporary experiment EXPIRATION_DATE=2018-07-10 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" # Inconsistent fallback order (libcubeb vs. audio_device) SNDIO_PREVENTS= ${OPTIONS_MULTI_AUDIO:NSNDIO} 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: head/www/waterfox/files/patch-bug1464784 =================================================================== --- head/www/waterfox/files/patch-bug1464784 (nonexistent) +++ head/www/waterfox/files/patch-bug1464784 (revision 471734) @@ -0,0 +1,68 @@ +commit b175f5f2113b +Author: Boris Zbarsky +Date: Thu May 31 12:43:01 2018 -0400 + + Bug 1464784 - Hold a strong ref to the document in callers of ConvertNodesOrStringsIntoNode. r=smaug, a=abillings +--- + dom/base/nsINode.cpp | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git dom/base/nsINode.cpp dom/base/nsINode.cpp +index 3a649a61d0274..fbbf1efcb2dde 100644 +--- dom/base/nsINode.cpp ++++ dom/base/nsINode.cpp +@@ -1777,8 +1777,8 @@ nsINode::Before(const Sequence& aNodes, + nsCOMPtr viablePreviousSibling = + FindViablePreviousSibling(*this, aNodes); + +- nsCOMPtr node = +- ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv); ++ nsCOMPtr doc = OwnerDoc(); ++ nsCOMPtr node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv); + if (aRv.Failed()) { + return; + } +@@ -1800,8 +1800,8 @@ nsINode::After(const Sequence& aNodes, + + nsCOMPtr viableNextSibling = FindViableNextSibling(*this, aNodes); + +- nsCOMPtr node = +- ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv); ++ nsCOMPtr doc = OwnerDoc(); ++ nsCOMPtr node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv); + if (aRv.Failed()) { + return; + } +@@ -1820,8 +1820,8 @@ nsINode::ReplaceWith(const Sequence& aNodes, + + nsCOMPtr viableNextSibling = FindViableNextSibling(*this, aNodes); + +- nsCOMPtr node = +- ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv); ++ nsCOMPtr doc = OwnerDoc(); ++ nsCOMPtr node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv); + if (aRv.Failed()) { + return; + } +@@ -1880,8 +1880,8 @@ void + nsINode::Prepend(const Sequence& aNodes, + ErrorResult& aRv) + { +- nsCOMPtr node = +- ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv); ++ nsCOMPtr doc = OwnerDoc(); ++ nsCOMPtr node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv); + if (aRv.Failed()) { + return; + } +@@ -1894,8 +1894,8 @@ void + nsINode::Append(const Sequence& aNodes, + ErrorResult& aRv) + { +- nsCOMPtr node = +- ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv); ++ nsCOMPtr doc = OwnerDoc(); ++ nsCOMPtr node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv); + if (aRv.Failed()) { + return; + } Property changes on: head/www/waterfox/files/patch-bug1464784 ___________________________________________________________________ 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: head/www/waterfox/files/patch-bug1465686 =================================================================== --- head/www/waterfox/files/patch-bug1465686 (nonexistent) +++ head/www/waterfox/files/patch-bug1465686 (revision 471734) @@ -0,0 +1,52 @@ +commit e963f75ef278 +Author: Lee Salzman +Date: Fri Jun 1 15:52:26 2018 -0400 + + Bug 1465686 - Validate SkArenaAlloc sizes. r=rhunt, a=RyanVM + + MozReview-Commit-ID: Cc4cxKeF4xn + + --HG-- + extra : source : 9019db1eaddb79dbfd1d4c357765599499eb02b4 +--- + gfx/skia/skia/src/core/SkArenaAlloc.h | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git gfx/skia/skia/src/core/SkArenaAlloc.h gfx/skia/skia/src/core/SkArenaAlloc.h +index c9e7274e63ded..b93054cff0177 100644 +--- gfx/skia/skia/src/core/SkArenaAlloc.h ++++ gfx/skia/skia/src/core/SkArenaAlloc.h +@@ -112,9 +112,14 @@ public: + return sk_sp(SkRef(this->make(std::forward(args)...))); + } + ++ uint32_t safeU32(size_t n) { ++ SkASSERT_RELEASE(SkTFitsIn(n)); ++ return uint32_t(n); ++ } ++ + template + T* makeArrayDefault(size_t count) { +- uint32_t safeCount = SkTo(count); ++ uint32_t safeCount = safeU32(count); + T* array = (T*)this->commonArrayAlloc(safeCount); + + // If T is primitive then no initialization takes place. +@@ -126,7 +131,7 @@ public: + + template + T* makeArray(size_t count) { +- uint32_t safeCount = SkTo(count); ++ uint32_t safeCount = safeU32(count); + T* array = (T*)this->commonArrayAlloc(safeCount); + + // If T is primitive then the memory is initialized. For example, an array of chars will +@@ -139,7 +144,7 @@ public: + + // Only use makeBytesAlignedTo if none of the typed variants are impractical to use. + void* makeBytesAlignedTo(size_t size, size_t align) { +- auto objStart = this->allocObject(SkTo(size), SkTo(align)); ++ auto objStart = this->allocObject(safeU32(size), safeU32(align)); + fCursor = objStart + size; + return objStart; + } Property changes on: head/www/waterfox/files/patch-bug1465686 ___________________________________________________________________ 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