From c170892d5432efa3ea651a710c2fe827815a0dd9 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 14 Jun 2012 12:18:45 -0700
Subject: [PATCH] Add rust-geom and a bunch of compile fixes

---
 Makefile.in              | 18 +++++++++++++++++-
 configure.in             |  2 ++
 src/rust-geom            |  1 +
 src/servo/text/shaper.rs |  5 +++--
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 160000 src/rust-geom

diff --git a/Makefile.in b/Makefile.in
index 3ea31fca4b6..0bd9ca7b00e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,6 +20,7 @@ RUSTFLAGS += \
 	-L src/rust-sdl \
 	-L src/rust-cocoa \
 	-L src/rust-stb-image \
+	-L src/rust-geom \
 	$(NULL)
 
 RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@@ -47,6 +48,7 @@ SERVO_DEPS += \
 	src/rust-azure/libazure.dummy \
 	src/rust-sdl/libsdl.dummy \
 	src/rust-stb-image/libstb-image.dummy \
+	src/rust-geom/libgeom.dummy \
 	$(NULL)
 
 CHECK_DEPS += \
@@ -55,6 +57,7 @@ CHECK_DEPS += \
 	check-rust-sdl \
 	check-rust-azure \
 	check-rust-stb-image \
+	check-rust-geom \
 	check-servo \
 	$(NULL)
 
@@ -66,6 +69,7 @@ CLEAN_DEPS += \
 	clean-rust-sdl \
 	clean-rust-azure \
 	clean-rust-stb-image \
+	clean-rust-geom \
 	clean-servo \
 	$(NULL)
 
@@ -91,7 +95,8 @@ src/rust-harfbuzz/libharfbuzz.dummy: src/harfbuzz/src/.libs/libharfbuzz.a
 	$(MAKE) -C src/rust-harfbuzz RUSTFLAGS="-L ../harfbuzz/src/.libs/"
 
 src/rust-mozjs/libmozjs.dummy: src/mozjs/libjs_static.a
-	$(MAKE) -C src/rust-mozjs RUSTFLAGS="-L ../mozjs/"
+	$(MAKE) -C src/rust-mozjs \
+		RUSTFLAGS="-L ../mozjs/" CFLAGS="-I../mozjs/dist/include"
 
 src/rust-azure/libazure.dummy: $(AZURE_DEPS)
 	RUSTFLAGS="-L ../rust-cocoa" $(MAKE) -C src/rust-azure
@@ -105,6 +110,9 @@ src/rust-cocoa/libcocoa.dummy:
 src/rust-stb-image/libstb-image.dummy:
 	$(MAKE) -C src/rust-stb-image
 
+src/rust-geom/libgeom.dummy:
+	$(MAKE) -C src/rust-geom
+
 check: $(CHECK_DEPS)
 
 check-servo: servo-test
@@ -134,6 +142,10 @@ check-rust-cocoa:
 check-rust-stb-image:
 	$(MAKE) check -C src/rust-stb-image
 
+.PHONY: check-geom
+check-geom:
+	$(MAKE) check -C src/rust-geom
+
 .PHONY:	clean
 clean: $(CLEAN_DEPS)
 
@@ -169,6 +181,10 @@ clean-rust-cocoa:
 clean-rust-stb-image:
 	$(MAKE) clean -C src/rust-stb-image
 
+.PHONY: clean-rust-geom
+clean-rust-geom:
+	$(MAKE) clean -C src/rust-geom
+
 .PHONY: clean-servo
 clean-servo:
 	rm -f servo servo-test
diff --git a/configure.in b/configure.in
index bcc011c37da..23fe065528f 100755
--- a/configure.in
+++ b/configure.in
@@ -12,6 +12,7 @@ mkdir -p src/rust-sdl || exit $?
 mkdir -p src/rust-azure || exit $?
 mkdir -p src/rust-cocoa || exit $?
 mkdir -p src/rust-stb-image || exit $?
+mkdir -p src/rust-geom || exit $?
 
 (cd src/ragel && sh ${SRCDIR}/src/ragel/configure) || exit $?
 (cd src/harfbuzz && sh ${SRCDIR}/src/harfbuzz/configure --enable-static) || exit $?
@@ -22,3 +23,4 @@ mkdir -p src/rust-stb-image || exit $?
 (cd src/rust-azure && sh ${SRCDIR}/src/rust-azure/configure) || exit $?
 (cd src/rust-cocoa && sh ${SRCDIR}/src/rust-cocoa/configure) || exit $?
 (cd src/rust-stb-image && sh ${SRCDIR}/src/rust-stb-image/configure) || exit $?
+(cd src/rust-geom && sh ${SRCDIR}/src/rust-geom/configure) || exit $?
diff --git a/src/rust-geom b/src/rust-geom
new file mode 160000
index 00000000000..5141a7ff6c2
--- /dev/null
+++ b/src/rust-geom
@@ -0,0 +1 @@
+Subproject commit 5141a7ff6c225f8265eecff496988efcbe41004b
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);