Mercurial > mxe-octave

changeset 4487:7b73612f57b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qtbase: Optionally depend on X11 and fontconfig libraries.
author John W. Eaton <jwe@octave.org>
date Thu, 05 Oct 2017 07:57:25 -0400
parents 7467937cb7bf
children 8f9bee27223f
files src/qtbase.mk
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/qtbase.mk	Thu Oct 05 10:34:32 2017 -0400
+++ b/src/qtbase.mk	Thu Oct 05 07:57:25 2017 -0400
@@ -9,6 +9,14 @@
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := dbus freetds freetype fontconfig jpeg libpng pcre postgresql sqlite zlib
+ifeq ($(USE_SYSTEM_FONTCONFIG),no)
+  $(PKG)_FONTCONFIG := fontconfig
+endif
+ifeq ($(MXE_WINDOWS_BUILD),no)
+  ifeq ($(USE_SYSTEM_X11_LIBS),no)
+    $(PKG)_DEPS += x11 xext xfixes xdmcp xrender xfixes xdamage xt xxf86vm
+  endif
+endif
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/5.5/ | \