svn commit: r447815 - branches/2017Q3/www/firefox/files

[Jan Beich]

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> path = MakeAndAddRef<PathSkia>(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')
+ 
+- at depends('--disable-skia')
+-def skia(value):
+-    if not value:
+-        die('--disable-skia is not supported anymore')
+-    else:
++ at 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> path = MakeAndAddRef<PathSkia>(skPath, FillRule::FILL_WINDING);
+     path->StreamToSink(aBuilder);
+     return;
+   }
+-  MOZ_ASSERT(false, "Path not being copied");
+ #endif
++  MOZ_ASSERT(false, "Path not being copied");
+ }
+ 
+ void