Index: branches/2018Q2/www/waterfox/Makefile =================================================================== --- branches/2018Q2/www/waterfox/Makefile (revision 472946) +++ branches/2018Q2/www/waterfox/Makefile (revision 472947) @@ -1,77 +1,78 @@ # $FreeBSD$ PORTNAME= waterfox DISTVERSION= 56.2.1-19 DISTVERSIONSUFFIX= -gff88ad0b627dc +PORTREVISION= 1 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: branches/2018Q2/www/waterfox/files/patch-bug1464039 =================================================================== --- branches/2018Q2/www/waterfox/files/patch-bug1464039 (revision 472946) +++ branches/2018Q2/www/waterfox/files/patch-bug1464039 (revision 472947) @@ -1,27 +1,87 @@ commit 0a234825c39a Author: Nicolas Silva Date: Fri Jun 15 14:01:07 2018 -0700 Bug 1464039 - Reject some invalid transforms in qcms. r=mwoodrow, a=RyanVM --HG-- extra : source : dfcc5301e87235818394a46f80dc1c164c2ca4b3 --- gfx/qcms/chain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git gfx/qcms/chain.c gfx/qcms/chain.c index e382fbe001422..2b0e707c443c4 100644 --- gfx/qcms/chain.c +++ gfx/qcms/chain.c @@ -972,6 +972,10 @@ static float* qcms_modular_transform_data(struct qcms_modular_transform *transfo assert(0 && "Unsupported transform module"); return NULL; } + if (transform->grid_size <= 0) { + assert(0 && "Invalid transform"); + return NULL; + } transform->transform_module_fn(transform,src,dest,len); dest = src; src = new_src; +commit 223a7e0a67fd +Author: Nicolas Silva +Date: Tue Jun 19 15:32:29 2018 +0200 + + Bug 1464039 - Only reject qcms transform with invalid grid size if the transform function uses the grid size. r=Bas, a=jcristau + + --HG-- + extra : source : 8dde5c1d895e4c063d5bda39029c9a01a178ebba + extra : intermediate-source : a64fb8de655dc28efd0b7de94b6f0008b08ae0ae +--- + gfx/qcms/chain.c | 4 +++- + gfx/thebes/gfxPlatform.cpp | 6 +++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git gfx/qcms/chain.c gfx/qcms/chain.c +index 2b0e707c443c4..dbae183789e79 100644 +--- gfx/qcms/chain.c ++++ gfx/qcms/chain.c +@@ -972,7 +972,9 @@ static float* qcms_modular_transform_data(struct qcms_modular_transform *transfo + assert(0 && "Unsupported transform module"); + return NULL; + } +- if (transform->grid_size <= 0) { ++ if (transform->grid_size <= 0 && ++ (transform_fn == qcms_transform_module_clut || ++ transform_fn == qcms_transform_module_clut_only)) { + assert(0 && "Invalid transform"); + return NULL; + } +diff --git gfx/thebes/gfxPlatform.cpp gfx/thebes/gfxPlatform.cpp +index d7c966ea1bcc2..278a609817d9e 100644 +--- gfx/thebes/gfxPlatform.cpp ++++ gfx/thebes/gfxPlatform.cpp +@@ -160,6 +160,7 @@ static Mutex* gGfxPlatformPrefsLock = nullptr; + static qcms_profile *gCMSOutputProfile = nullptr; + static qcms_profile *gCMSsRGBProfile = nullptr; + ++static bool gCMSRGBTransformFailed = false; + static qcms_transform *gCMSRGBTransform = nullptr; + static qcms_transform *gCMSInverseRGBTransform = nullptr; + static qcms_transform *gCMSRGBATransform = nullptr; +@@ -2068,7 +2069,7 @@ gfxPlatform::GetCMSsRGBProfile() + qcms_transform * + gfxPlatform::GetCMSRGBTransform() + { +- if (!gCMSRGBTransform) { ++ if (!gCMSRGBTransform && !gCMSRGBTransformFailed) { + qcms_profile *inProfile, *outProfile; + outProfile = GetCMSOutputProfile(); + inProfile = GetCMSsRGBProfile(); +@@ -2079,6 +2080,9 @@ gfxPlatform::GetCMSRGBTransform() + gCMSRGBTransform = qcms_transform_create(inProfile, QCMS_DATA_RGB_8, + outProfile, QCMS_DATA_RGB_8, + QCMS_INTENT_PERCEPTUAL); ++ if (!gCMSRGBTransform) { ++ gCMSRGBTransformFailed = true; ++ } + } + + return gCMSRGBTransform; Index: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 472946) +++ branches/2018Q2 (revision 472947) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r472942