Issue #80 - De-unify gfx/harfbuzz

1 files changed, 8 insertions, 11 deletions

diff --git a/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build
index 7ed39aa104..4dd18d2541 100644
--- a/gfx/harfbuzz/src/moz.build
+++ b/gfx/harfbuzz/src/moz.build
@@ -26,35 +26,32 @@ EXPORTS.harfbuzz += [
 ]
 
 SOURCES += [
-    'hb-blob.cc', # error: use of undeclared identifier 'snprintf' (FreeBSD)
-    'hb-common.cc', # error: use of undeclared identifier 'strdup'
-    'hb-ot-math.cc', # conflict with hb-ot-layout.cc
-    'hb-ot-shape-complex-hangul.cc', # error: redefinition of enumerator 'NONE'
-    'hb-ot-shape-complex-indic.cc', # error: redefinition of enumerator 'INIT'
-    'hb-ot-shape-complex-use.cc', # error: redefinition of 'basic_features'
-    'hb-ot-shape.cc', # error: functions that differ only in their return type cannot be overloaded
-    'hb-shape-plan.cc', # error: redefinition of 'hb_ot_shaper_face_data_ensure'
-]
-
-UNIFIED_SOURCES += [
+    'hb-blob.cc',
     'hb-buffer.cc',
+    'hb-common.cc',
     'hb-face.cc',
     'hb-fallback-shape.cc',
     'hb-font.cc',
     'hb-ot-layout.cc',
     'hb-ot-map.cc',
+    'hb-ot-math.cc',
     'hb-ot-shape-complex-arabic.cc',
     'hb-ot-shape-complex-default.cc',
+    'hb-ot-shape-complex-hangul.cc',
     'hb-ot-shape-complex-hebrew.cc',
     'hb-ot-shape-complex-indic-table.cc',
+    'hb-ot-shape-complex-indic.cc',
     'hb-ot-shape-complex-myanmar.cc',
     'hb-ot-shape-complex-thai.cc',
     'hb-ot-shape-complex-tibetan.cc',
     'hb-ot-shape-complex-use-table.cc',
+    'hb-ot-shape-complex-use.cc',
     'hb-ot-shape-fallback.cc',
     'hb-ot-shape-normalize.cc',
+    'hb-ot-shape.cc',
     'hb-ot-tag.cc',
     'hb-set.cc',
+    'hb-shape-plan.cc',
     'hb-shape.cc',
     'hb-shaper.cc',
     'hb-unicode.cc',