From 9682c0cd3a8006ead1ed277b3a6f4e0a3057c347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <ecoal95@gmail.com>
Date: Wed, 19 Oct 2016 17:25:35 +0200
Subject: [PATCH 1/3] Update mozjs_sys to expose proper locale callbacks.

Fixes #13788
---
 components/servo/Cargo.lock                   | 2 +-
 ports/cef/Cargo.lock                          | 2 +-
 tests/wpt/mozilla/tests/mozilla/interfaces.js | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 4f9bc40b6c3..6d40d9270e1 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -1358,7 +1358,7 @@ dependencies = [
 [[package]]
 name = "mozjs_sys"
 version = "0.0.0"
-source = "git+https://github.com/servo/mozjs#34c3e075138bb7eff2ed8b5924ccb9067dcd017e"
+source = "git+https://github.com/servo/mozjs#f7917c480e3378441ee54c0554f6a3af9fb57464"
 dependencies = [
  "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "libz-sys 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 06a19b61f5f..c378368ff55 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -1258,7 +1258,7 @@ dependencies = [
 [[package]]
 name = "mozjs_sys"
 version = "0.0.0"
-source = "git+https://github.com/servo/mozjs#34c3e075138bb7eff2ed8b5924ccb9067dcd017e"
+source = "git+https://github.com/servo/mozjs#f7917c480e3378441ee54c0554f6a3af9fb57464"
 dependencies = [
  "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "libz-sys 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.js b/tests/wpt/mozilla/tests/mozilla/interfaces.js
index c6eeab6bdbc..1430f8cb81c 100644
--- a/tests/wpt/mozilla/tests/mozilla/interfaces.js
+++ b/tests/wpt/mozilla/tests/mozilla/interfaces.js
@@ -20,6 +20,7 @@ function test_interfaces(interfaceNamesInGlobalScope) {
       "Int32Array",
       "Int8Array",
       "InternalError",
+      "Intl",
       "Iterator",
       "JSON",
       "Map",

From 30039f2cdc1b20f3ad4ccc54937a5cccabd6e950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <ecoal95@gmail.com>
Date: Mon, 24 Oct 2016 19:40:50 +0200
Subject: [PATCH 2/3] readme: List yasm as a build-time dependency for Servo.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d8864411a72..531f90607f2 100644
--- a/README.md
+++ b/README.md
@@ -29,13 +29,13 @@ Please select your operating system:
 #### On OS X (homebrew)
 
 ``` sh
-brew install automake pkg-config python cmake
+brew install automake pkg-config python cmake yasm
 pip install virtualenv
 ```
 #### On OS X (MacPorts)
 
 ``` sh
-sudo port install python27 py27-virtualenv cmake
+sudo port install python27 py27-virtualenv cmake yasm
 ```
 #### On OS X >= 10.11 (El Capitan), you also have to install OpenSSL
 

From 60e0ccf17d6315d5aad029f7dbe2316415f8534c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <ecoal95@gmail.com>
Date: Tue, 25 Oct 2016 12:28:36 +0200
Subject: [PATCH 3/3] Test for localeCompare.

---
 tests/wpt/mozilla/meta/MANIFEST.json               |  6 ++++++
 tests/wpt/mozilla/tests/mozilla/localeCompare.html | 10 ++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/localeCompare.html

diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 084394e7ef9..48b748bd81c 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -7094,6 +7094,12 @@
             "url": "/_mozilla/mozilla/load_event.html"
           }
         ],
+        "mozilla/localeCompare.html": [
+          {
+            "path": "mozilla/localeCompare.html",
+            "url": "/_mozilla/mozilla/localeCompare.html"
+          }
+        ],
         "mozilla/mime_sniffing_font_context.html": [
           {
             "path": "mozilla/mime_sniffing_font_context.html",
diff --git a/tests/wpt/mozilla/tests/mozilla/localeCompare.html b/tests/wpt/mozilla/tests/mozilla/localeCompare.html
new file mode 100644
index 00000000000..c6042d8739e
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/localeCompare.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>localeCompare should return the same as other browsers, even though it's implementation-dependent</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+  assert_equals("ab".localeCompare("aZ"), -1);
+})
+</script>