servo: Merge #18552 - Update osmesa-src to support building with mach (from servo:machless); r=nox
authorSimon Sapin <simon.sapin@exyr.org>
Mon, 18 Sep 2017 11:46:45 -0500
changeset 381556 4d4527934c6c9dbf9c181ed3db74b070440aaf33
parent 381555 bc0b0b1a63fe06543b8a22dc75d5cf5ba79be390
child 381557 fa80123d276ebd0a9612bbef8fea193341e5179d
push id95157
push userarchaeopteryx@coole-files.de
push dateTue, 19 Sep 2017 09:15:33 +0000
treeherdermozilla-inbound@db7b879601c6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnox
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #18552 - Update osmesa-src to support building with mach (from servo:machless); r=nox E.g. `cargo +nightly build -p servo` at the repo’s top-level Source-Repo: https://github.com/servo/servo Source-Revision: 0ed54b039a932f8293f8bec4ac8f6b7a6f54be5c
servo/Cargo.lock
servo/Cargo.toml
servo/python/requirements.txt
servo/python/servo/package_commands.py
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -2190,17 +2190,17 @@ source = "registry+https://github.com/ru
 dependencies = [
  "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "osmesa-src"
 version = "17.2.0-devel"
-source = "git+https://github.com/servo/osmesa-src#fe47d99acf27a9620c521d576d26dbfa1cf29372"
+source = "git+https://github.com/servo/osmesa-src#206464252f31583c2338393f8b6da99780a1ebdf"
 
 [[package]]
 name = "osmesa-sys"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
--- a/servo/Cargo.toml
+++ b/servo/Cargo.toml
@@ -14,8 +14,13 @@ opt-level = 3
 # debug = true
 # lto = false
 
 [patch.crates-io]
 # If you need to temporarily test Servo with a local fork of some upstream
 # crate, add that here. Use the form:
 #
 #     <crate> = { path = "/path/to/local/checkout" }
+#
+# Or for a git dependency:
+#
+#     [patch."https://github.com/servo/<repository>"]
+#     <crate> = { path = "/path/to/local/checkout" }
--- a/servo/python/requirements.txt
+++ b/servo/python/requirements.txt
@@ -3,17 +3,16 @@
 
 blessings == 1.6
 mach == 0.6.0
 mozdebug == 0.1
 mozinfo == 0.8
 mozlog == 3.3
 setuptools == 18.5
 toml == 0.9.2
-Mako == 1.0.4
 
 # For Python linting
 flake8 == 2.4.1
 pep8 == 1.5.7
 pyflakes == 0.8.1
 
 # For buildbot checking
 PyYAML == 3.12
--- a/servo/python/servo/package_commands.py
+++ b/servo/python/servo/package_commands.py
@@ -21,16 +21,18 @@ import tempfile
 
 from mach.decorators import (
     CommandArgument,
     CommandProvider,
     Command,
 )
 from mach.registrar import Registrar
 # Note: mako cannot be imported at the top level because it breaks mach bootstrap
+sys.path.append(path.join(path.dirname(__file__), "..", "..",
+                          "components", "style", "properties", "Mako-0.9.1.zip"))
 
 from servo.command_base import (
     archive_deterministically,
     BuildNotFound,
     cd,
     CommandBase,
     is_macosx,
     is_windows,