From 0a07bd62de2c948c382e89bec9666fb9cf52a1f8 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 4 Oct 2012 18:20:57 -0700
Subject: [PATCH] Fix linux build

---
 src/rust-azure                               | 2 +-
 src/servo/text/font_cache.rs                 | 2 +-
 src/servo/text/native_font/ft_native_font.rs | 5 +++--
 src/sharegl                                  | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/rust-azure b/src/rust-azure
index c201bc1f2c6..5b57a6efee7 160000
--- a/src/rust-azure
+++ b/src/rust-azure
@@ -1 +1 @@
-Subproject commit c201bc1f2c6cb38d7a81647516f3f55892c8d89d
+Subproject commit 5b57a6efee711ed399d9c0d158a86857d0b96060
diff --git a/src/servo/text/font_cache.rs b/src/servo/text/font_cache.rs
index 24d1ded682b..87c0f9a6f0f 100644
--- a/src/servo/text/font_cache.rs
+++ b/src/servo/text/font_cache.rs
@@ -60,7 +60,7 @@ pub mod native {
 
     pub fn create_native_lib() -> NativeFontCache {
         let lib: FT_Library = null();
-        let res = FT_Init_FreeType(addr_of(lib));
+        let res = FT_Init_FreeType(addr_of(&lib));
         // FIXME: error handling
         assert res == 0 as FT_Error;
         return lib;
diff --git a/src/servo/text/native_font/ft_native_font.rs b/src/servo/text/native_font/ft_native_font.rs
index 3b481afc692..cf7e660a73c 100644
--- a/src/servo/text/native_font/ft_native_font.rs
+++ b/src/servo/text/native_font/ft_native_font.rs
@@ -1,3 +1,4 @@
+#[legacy_exports];
 export FreeTypeNativeFont, with_test_native_font, create;
 
 use vec_as_buf = vec::as_imm_buf;
@@ -89,7 +90,7 @@ pub fn create(lib: &FT_Library, buf: @~[u8]) -> Result<FreeTypeNativeFont, ()> {
     let face: FT_Face = null();
     return vec_as_buf(*buf, |cbuf, _len| {
            if FT_New_Memory_Face(*lib, cbuf, (*buf).len() as FT_Long,
-                                 0 as FT_Long, addr_of(face)).succeeded() {
+                                 0 as FT_Long, addr_of(&face)).succeeded() {
                // FIXME: These values are placeholders
                let res = FT_Set_Char_Size(face, 0, 20*64, 0, 72);
                if !res.succeeded() { fail ~"unable to set font char size" }
@@ -121,7 +122,7 @@ fn with_test_native_font(f: fn@(nf: &NativeFont)) {
 
 fn with_lib(f: fn@((&FT_Library))) {
     let lib: FT_Library = null();
-    assert FT_Init_FreeType(addr_of(lib)).succeeded();
+    assert FT_Init_FreeType(addr_of(&lib)).succeeded();
     f(&lib);
     FT_Done_FreeType(lib);
 }
diff --git a/src/sharegl b/src/sharegl
index 01e76b4ec3e..26ddabc2021 160000
--- a/src/sharegl
+++ b/src/sharegl
@@ -1 +1 @@
-Subproject commit 01e76b4ec3eaf5fe2e29513667e601bb2a3c70b5
+Subproject commit 26ddabc20216428b66e182795dbcd5782d0e9d4f