diff options
Diffstat (limited to 'mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build')
| -rw-r--r-- | mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build b/mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build index a34e0f29f6a..4362989dd6f 100644 --- a/mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build @@ -1,25 +1,19 @@ -$NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.3 2016/04/17 18:33:50 ryoon Exp $ +$NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.4 2017/04/27 13:32:40 ryoon Exp $ ---- mozilla/gfx/thebes/moz.build.orig 2016-04-07 21:33:15.000000000 +0000 +--- mozilla/gfx/thebes/moz.build.orig 2017-04-14 04:53:09.000000000 +0000 +++ mozilla/gfx/thebes/moz.build -@@ -293,6 +293,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS'] - CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] - CFLAGS += CONFIG['TK_CFLAGS'] +@@ -266,7 +266,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk + LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] + LOCAL_INCLUDES += ['/media/libyuv/include'] -+if CONFIG['MOZ_NATIVE_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ -+if CONFIG['MOZ_NATIVE_GRAPHITE2']: +-DEFINES['GRAPHITE2_STATIC'] = True ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: + CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] ++else: ++ DEFINES['GRAPHITE2_STATIC'] = True + - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'): - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] - -@@ -306,7 +312,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk - - LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] --DEFINES['GRAPHITE2_STATIC'] = True -- - if CONFIG['OS_ARCH'] == 'WINNT': - del DEFINES['UNICODE'] + if CONFIG['CLANG_CXX']: + # Suppress warnings from Skia header files. |