From d6917435b54dce1503c7d4d5b585b96b952b6fd7 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 21 Sep 2018 22:55:45 +0300
Subject: [PATCH] qt5-base: depend on ttf-dejavu

---
 x11-packages/qt5-base/build.sh |  4 ++--
 x11-packages/qt5-base/postinst | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/x11-packages/qt5-base/build.sh b/x11-packages/qt5-base/build.sh
index a155173d6..e99d6849a 100644
--- a/x11-packages/qt5-base/build.sh
+++ b/x11-packages/qt5-base/build.sh
@@ -12,10 +12,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=http://qt-project.org/
 TERMUX_PKG_DESCRIPTION="A cross-platform application and UI framework"
 TERMUX_PKG_VERSION=5.11.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL="http://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/single/qt-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=c6104b840b6caee596fa9a35bc5f57f67ed5a99d6a36497b6fe66f990a53ca81
-TERMUX_PKG_DEPENDS="harfbuzz, libandroid-support, libandroid-shmem, libc++, libice, libicu, libjpeg-turbo, libpng, libsm, libuuid, libx11, libxcb, libxi, libxkbcommon, openssl, pcre2, xcb-util-image, xcb-util-keysyms, xcb-util-renderutil, xcb-util-wm"
+TERMUX_PKG_DEPENDS="harfbuzz, libandroid-support, libandroid-shmem, libc++, libice, libicu, libjpeg-turbo, libpng, libsm, libuuid, libx11, libxcb, libxi, libxkbcommon, openssl, pcre2, ttf-dejavu, xcb-util-image, xcb-util-keysyms, xcb-util-renderutil, xcb-util-wm"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="
diff --git a/x11-packages/qt5-base/postinst b/x11-packages/qt5-base/postinst
index 06b02c3fa..0ee099056 100755
--- a/x11-packages/qt5-base/postinst
+++ b/x11-packages/qt5-base/postinst
@@ -1,7 +1,14 @@
 #!/data/data/com.termux/files/usr/bin/sh
 
-if [ ! -e "/data/data/com.termux/files/usr/lib/fonts" ]; then
-    if [ -d "/system/fonts" ]; then
-        ln -sf /system/fonts /data/data/com.termux/files/usr/lib/fonts
+PREFIX="/data/data/com.termux/files/usr"
+
+if [ ! -e "${PREFIX}/lib/fonts" ]; then
+    ln -sf "${PREFIX}/share/fonts" "${PREFIX}/lib/fonts"
+else
+    ## In previous versions we used '/system/fonts' as
+    ## font source.
+    if [ -h "${PREFIX}/lib/fonts" ]; then
+        rm -f "${PREFIX}/lib/fonts"
+        ln -sf "${PREFIX}/share/fonts" "${PREFIX}/lib/fonts"
     fi
 fi