From 09b93eb8be605b9f5c831435ce506856ce5fb2f3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 29 Aug 2019 12:44:49 +0530 Subject: [PATCH] Build against system freetype/fontconfig on linux We dont bundle those libs anyway, so we should not build against custom ones either --- bypy/linux.conf | 2 +- bypy/sources.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bypy/linux.conf b/bypy/linux.conf index 60ad3f5e9b..63fec82e33 100644 --- a/bypy/linux.conf +++ b/bypy/linux.conf @@ -1,4 +1,4 @@ image 'https://partner-images.canonical.com/core/xenial/current/ubuntu-xenial-core-cloudimg-{}-root.tar.gz' # Build time deps for Qt. See http://doc.qt.io/qt-5/linux-requirements.html and https://wiki.qt.io/Building_Qt_5_from_Git -deps 'flex bison gperf ruby libx11-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev xkb-data libglu1-mesa-dev libxkbcommon-dev libinput-dev libxkbcommon-x11-dev libgtk2.0-dev libvulkan-dev libwayland-dev libwayland-egl1-mesa libegl1-mesa-dev libxtst-dev libnss3-dev' +deps 'flex bison gperf ruby libx11-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev xkb-data libglu1-mesa-dev libxkbcommon-dev libinput-dev libxkbcommon-x11-dev libgtk2.0-dev libvulkan-dev libwayland-dev libwayland-egl1-mesa libegl1-mesa-dev libxtst-dev libnss3-dev libfreetype6-dev libfontconfig-dev' diff --git a/bypy/sources.json b/bypy/sources.json index cdafa020c8..1938e1bc3a 100644 --- a/bypy/sources.json +++ b/bypy/sources.json @@ -212,6 +212,7 @@ { "name": "freetype", + "os": "macos", "unix": { "filename": "freetype-2.10.0.tar.bz2", "hash": "sha256:fccc62928c65192fff6c98847233b28eb7ce05f12d2fea3f6cc90e8b4e5fbe06", @@ -221,7 +222,7 @@ { "name": "fontconfig", - "os": "macos, linux", + "os": "macos", "unix": { "filename": "fontconfig-2.13.1.tar.bz2", "hash": "sha256:f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741",