From owner-svn-ports-all@freebsd.org Thu Jun 21 00:16:00 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 872E01015250; Thu, 21 Jun 2018 00:16:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 385EE7B1D2; Thu, 21 Jun 2018 00:16:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 164AB194B; Thu, 21 Jun 2018 00:16:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5L0Fxj7005167; Thu, 21 Jun 2018 00:15:59 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5L0FxeQ005165; Thu, 21 Jun 2018 00:15:59 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201806210015.w5L0FxeQ005165@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 21 Jun 2018 00:15:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472942 - in head/www/waterfox: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/www/waterfox: . files X-SVN-Commit-Revision: 472942 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jun 2018 00:16:00 -0000 Author: jbeich Date: Thu Jun 21 00:15:59 2018 New Revision: 472942 URL: https://svnweb.freebsd.org/changeset/ports/472942 Log: www/waterfox: apply some FF61 fix Modified: head/www/waterfox/Makefile (contents, props changed) head/www/waterfox/files/patch-bug1464039 (contents, props changed) Modified: head/www/waterfox/Makefile ============================================================================== --- head/www/waterfox/Makefile Wed Jun 20 22:36:45 2018 (r472941) +++ head/www/waterfox/Makefile Thu Jun 21 00:15:59 2018 (r472942) @@ -3,6 +3,7 @@ PORTNAME= waterfox DISTVERSION= 56.2.1-19 DISTVERSIONSUFFIX= -gff88ad0b627dc +PORTREVISION= 1 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Modified: head/www/waterfox/files/patch-bug1464039 ============================================================================== --- head/www/waterfox/files/patch-bug1464039 Wed Jun 20 22:36:45 2018 (r472941) +++ head/www/waterfox/files/patch-bug1464039 Thu Jun 21 00:15:59 2018 (r472942) @@ -25,3 +25,63 @@ index e382fbe001422..2b0e707c443c4 100644 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;