diff --git a/.gitmodules b/.gitmodules index 5bee9a152ed..e091eecd603 100644 --- a/.gitmodules +++ b/.gitmodules @@ -70,3 +70,6 @@ [submodule "src/rust-freetype"] path = src/rust-freetype url = git://github.com/mozilla-servo/rust-freetype.git +[submodule "src/rust-fontconfig"] + path = src/rust-fontconfig + url = git://github.com/mozilla-servo/rust-fontconfig.git diff --git a/configure b/configure index 003c2c52950..34c78af3116 100755 --- a/configure +++ b/configure @@ -353,7 +353,7 @@ fi if [ $CFG_OSTYPE = "linux" ] then -CFG_SUBMODULES="rust-freetype ${CFG_SUBMODULES}" +CFG_SUBMODULES="rust-freetype rust-fontconfig ${CFG_SUBMODULES}" fi step_msg "making build directories" diff --git a/mk/sub.mk b/mk/sub.mk index 315825b433e..67dd7e9e24d 100644 --- a/mk/sub.mk +++ b/mk/sub.mk @@ -69,10 +69,11 @@ endif ifeq ($(CFG_OSTYPE),linux) DEPS_rust-azure += \ - rust-freetype + rust-freetype \ + rust-fontconfig # See note at top of file DEPS_rust-layers += \ - rust-freetype - -endif \ No newline at end of file + rust-freetype \ + rust-fontconfig +endif diff --git a/src/rust-azure b/src/rust-azure index ec3f31b7f36..8ba49fef417 160000 --- a/src/rust-azure +++ b/src/rust-azure @@ -1 +1 @@ -Subproject commit ec3f31b7f360d2f78343aec074b700ff2c8c3b3d +Subproject commit 8ba49fef417cb1b4da053d762dd3a683b9239c85 diff --git a/src/rust-fontconfig b/src/rust-fontconfig new file mode 160000 index 00000000000..fde18fa1c78 --- /dev/null +++ b/src/rust-fontconfig @@ -0,0 +1 @@ +Subproject commit fde18fa1c789cf9f747486e307f695790895267a