Add rust-geom and a bunch of compile fixes

2 files changed, 3 insertions, 2 deletions

diff --git a/src/rust-geom b/src/rust-geom
new file mode 160000
+Subproject 5141a7ff6c225f8265eecff496988efcbe41004
diff --git a/src/servo/text/shaper.rs b/src/servo/text/shaper.rs
index ae3f8c0629b..90f2dc3ba4a 100644
--- a/src/servo/text/shaper.rs
+++ b/src/servo/text/shaper.rs
@@ -13,7 +13,8 @@ import unsafe::reinterpret_cast;
 import harfbuzz::{HB_MEMORY_MODE_READONLY,
                   HB_DIRECTION_LTR};
 import harfbuzz::{hb_blob_t, hb_face_t, hb_font_t, hb_buffer_t,
-                  hb_codepoint_t, hb_bool_t, hb_glyph_position_t};
+                  hb_codepoint_t, hb_bool_t, hb_glyph_position_t,
+				  hb_var_int_t};
 import harfbuzz::bindgen::{hb_blob_create, hb_blob_destroy,
                            hb_face_create, hb_face_destroy,
                            hb_font_create, hb_font_destroy,
@@ -44,7 +45,7 @@ fn shape_text(_font: &font, text: str) -> [glyph] {
             y_advance: 0 as int32_t,
             x_offset: cur_x as int32_t,
             y_offset: 0 as int32_t,
-            var: 0i32
+            var: 0 as hb_var_int_t
         };
 
         let pos = hb_glyph_pos_to_servo_glyph_pos(hb_pos);