diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-08-12 11:51:33 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-08-12 11:51:33 +0800 |
| commit | ca247792fefa1ecc065cd45f279c0d1b7d57547f (patch) | |
| tree | 8edaf695f5cdd8eab70d67067cdd79abf1f0a49a | |
| parent | 9284f33beeac134c5e21505d40a124520fdf5764 (diff) | |
| download | freebsd-ports-ca247792fefa1ecc065cd45f279c0d1b7d57547f.tar.gz freebsd-ports-ca247792fefa1ecc065cd45f279c0d1b7d57547f.tar.zst freebsd-ports-ca247792fefa1ecc065cd45f279c0d1b7d57547f.zip | |
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
| -rw-r--r-- | www/firefox/files/patch-bug1144632 | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/www/firefox/files/patch-bug1144632 b/www/firefox/files/patch-bug1144632 new file mode 100644 index 000000000000..f6416f85589e --- /dev/null +++ b/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> 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 |