From owner-svn-ports-all@freebsd.org Sat Aug 12 03:51:34 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD4DFDDE9D2; Sat, 12 Aug 2017 03:51:34 +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 mx1.freebsd.org (Postfix) with ESMTPS id 9ACD4715CC; Sat, 12 Aug 2017 03:51:34 +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 v7C3pXEA055358; Sat, 12 Aug 2017 03:51:33 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7C3pXAQ055357; Sat, 12 Aug 2017 03:51:33 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201708120351.v7C3pXAQ055357@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 12 Aug 2017 03:51:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r447815 - branches/2017Q3/www/firefox/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2017Q3/www/firefox/files X-SVN-Commit-Revision: 447815 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.23 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: Sat, 12 Aug 2017 03:51:35 -0000 Author: jbeich Date: Sat Aug 12 03:51:33 2017 New Revision: 447815 URL: https://svnweb.freebsd.org/changeset/ports/447815 Log: MFH: r447814 www/firefox: unbreak on big-endians (e.g. powerpc*, sparc64) ERROR: --disable-skia is not supported anymore In file included from objdir/gfx/2d/Unified_cpp_gfx_2d1.cpp:101: gfx/2d/ScaledFontBase.cpp:217:39: error: use of undeclared identifier 'PathSkia' RefPtr path = MakeAndAddRef(skPath, FillRule::FILL_WINDING); ^ Approved by: ports-secteam blanket Added: branches/2017Q3/www/firefox/files/patch-bug1144632 - copied unchanged from r447814, head/www/firefox/files/patch-bug1144632 Modified: Directory Properties: branches/2017Q3/ (props changed) Copied: branches/2017Q3/www/firefox/files/patch-bug1144632 (from r447814, head/www/firefox/files/patch-bug1144632) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/www/firefox/files/patch-bug1144632 Sat Aug 12 03:51:33 2017 (r447815, copy of r447814, head/www/firefox/files/patch-bug1144632) @@ -0,0 +1,41 @@ +Revert bug 1323303 to unbreak build on big-endian architectures. + +--- toolkit/moz.configure.orig 2017-07-31 16:20:54 UTC ++++ toolkit/moz.configure +@@ -771,11 +771,11 @@ + # ============================================================== + option('--disable-skia', help='Disable use of Skia') + +-@depends('--disable-skia') +-def skia(value): +- if not value: +- die('--disable-skia is not supported anymore') +- else: ++@depends('--disable-skia', target) ++def skia(value, target): ++ if value.origin == 'default' and target.endianness == 'big': ++ return None ++ if value: + return True + + set_config('MOZ_ENABLE_SKIA', skia) +--- gfx/2d/ScaledFontBase.cpp.orig 2017-07-31 16:20:54 UTC ++++ gfx/2d/ScaledFontBase.cpp +@@ -212,14 +212,16 @@ ScaledFontBase::CopyGlyphsToBuilder(const GlyphBuffer + cairoPath->AppendPathToBuilder(builder); + return; + } ++#endif ++#ifdef USE_SKIA + if (backendType == BackendType::RECORDING) { + SkPath skPath = GetSkiaPathForGlyphs(aBuffer); + RefPtr path = MakeAndAddRef(skPath, FillRule::FILL_WINDING); + path->StreamToSink(aBuilder); + return; + } +- MOZ_ASSERT(false, "Path not being copied"); + #endif ++ MOZ_ASSERT(false, "Path not being copied"); + } + + void