From a12590a8196fa3045cd7ed5e96f9f7091903f46d Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Wed, 2 Oct 2019 20:15:33 -0600
Subject: [PATCH] Remove atty and libc patch, fix rust-cairo-demo
---
.cargo/config | 2 --
recipes/rust-cairo-demo/recipe.sh | 12 +++++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.cargo/config b/.cargo/config
index c6052f61b..24060f491 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,6 +1,4 @@
paths = [
- "patches/atty",
- "patches/libc",
"patches/mio",
"patches/nix",
"patches/tokio/tokio",
diff --git a/recipes/rust-cairo-demo/recipe.sh b/recipes/rust-cairo-demo/recipe.sh
index 9abd33d87..3b2aff834 100644
--- a/recipes/rust-cairo-demo/recipe.sh
+++ b/recipes/rust-cairo-demo/recipe.sh
@@ -1,5 +1,5 @@
GIT=https://gitlab.redox-os.org/redox-os/rust-cairo-demo.git
-BUILD_DEPENDS=(cairo zlib pixman freetype libpng)
+BUILD_DEPENDS=(cairo expat fontconfig freetype libpng pixman zlib)
function recipe_build {
sysroot="$(realpath ../sysroot)"
@@ -8,10 +8,12 @@ function recipe_build {
-- \
-L "${sysroot}/lib" \
-l cairo \
- -l pixman-1 \
- -l freetype \
- -l png \
- -l z
+ -l fontconfig \
+ -l expat \
+ -l pixman-1 \
+ -l freetype \
+ -l png \
+ -l z
skip=1
}
--
GitLab