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 /www/libxul | |
| parent | eb55af03b7c8a5fd9d8950407506449621a816d2 (diff) | |
| download | ports-8680f01155a1ab9f9ed0fed3ddba1bbebd805c43.tar.gz ports-8680f01155a1ab9f9ed0fed3ddba1bbebd805c43.zip | |
Move graphite2 buildfix to where it belongs
Notes
Notes:
svn path=/head/; revision=394045
Diffstat (limited to 'www/libxul')
| -rw-r--r-- | www/libxul/files/patch-bug847568 | 14 | ||||
| -rw-r--r-- | www/libxul/files/patch-gfx-thebes-moz.build | 10 |
2 files changed, 8 insertions, 16 deletions
diff --git a/www/libxul/files/patch-bug847568 b/www/libxul/files/patch-bug847568 index 59bef6d9651a..cfd44a71c5f4 100644 --- a/www/libxul/files/patch-bug847568 +++ b/www/libxul/files/patch-bug847568 @@ -188,19 +188,21 @@ diff --git gfx/thebes/moz.build gfx/thebes/moz.build index d5852fa..aeeab25 100644 --- gfx/thebes/moz.build +++ 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 --- intl/unicharutil/util/moz.build diff --git a/www/libxul/files/patch-gfx-thebes-moz.build b/www/libxul/files/patch-gfx-thebes-moz.build deleted file mode 100644 index 59adf72aeeb6..000000000000 --- a/www/libxul/files/patch-gfx-thebes-moz.build +++ /dev/null @@ -1,10 +0,0 @@ ---- gfx/thebes/moz.build.orig 2015-08-06 13:40:59.000000000 -0400 -+++ gfx/thebes/moz.build 2015-08-11 19:26:38.799990000 -0400 -@@ -304,7 +304,5 @@ - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] - --DEFINES['GRAPHITE2_STATIC'] = True -- - if CONFIG['GKMEDIAS_SHARED_LIBRARY']: - DEFINES['OTS_DLL'] = True |