diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2015-08-12 22:49:21 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2015-08-12 22:49:21 +0000 |
| commit | 8680f01155a1ab9f9ed0fed3ddba1bbebd805c43 (patch) | |
| tree | 2e808d5b40504ca4ebb27f25d39c390a62635ffe /mail/thunderbird/files/patch-bug847568 | |
| parent | kvasd should have been in LINUXBASE not LOCALBASE (diff) | |
Move graphite2 buildfix to where it belongs
Diffstat (limited to 'mail/thunderbird/files/patch-bug847568')
| -rw-r--r-- | mail/thunderbird/files/patch-bug847568 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mail/thunderbird/files/patch-bug847568 b/mail/thunderbird/files/patch-bug847568 index 411d21636663..ec922c871c02 100644 --- a/mail/thunderbird/files/patch-bug847568 +++ b/mail/thunderbird/files/patch-bug847568 @@ -188,19 +188,21 @@ diff --git gfx/thebes/moz.build gfx/thebes/moz.build index d5852fa..aeeab25 100644 --- mozilla/gfx/thebes/moz.build +++ mozilla/gfx/thebes/moz.build -@@ -278,6 +278,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS'] - CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] - CFLAGS += CONFIG['TK_CFLAGS'] +@@ -294,7 +294,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'): + CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] +-DEFINES['GRAPHITE2_STATIC'] = True +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + +if CONFIG['MOZ_NATIVE_GRAPHITE2']: + CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] -+ - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'): - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] ++else: ++ DEFINES['GRAPHITE2_STATIC'] = True + if CONFIG['GKMEDIAS_SHARED_LIBRARY']: + DEFINES['OTS_DLL'] = True diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build index d736943..41a931f 100644 --- mozilla/intl/unicharutil/util/moz.build |