From c9ff3f68831c62b10067d6b5751b222584fcdee2 Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Sat, 21 Jan 2012 06:32:08 +0000 Subject: [PATCH] Revert "qt4: Add basic font dependency to qt4-gui" This reverts commit 29192. Depending on font-basic implicitly makes qt4-gui depending on FEATURE_drawing-backend_libX11 which is not set for makes qt4 on top of LinuxFB / DirectFB unusable (since unselectable). SVN-Revision: 29838 --- xorg/lib/qt4/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xorg/lib/qt4/Makefile b/xorg/lib/qt4/Makefile index 50785119ed..b01f13d6c0 100644 --- a/xorg/lib/qt4/Makefile +++ b/xorg/lib/qt4/Makefile @@ -13,7 +13,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt4 PKG_VERSION:=4.7.0 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_MD5SUM:=3a2f25b9b115037277f4fb759194a7a5 PKG_SOURCE:=qt-everywhere-opensource-src-$(PKG_VERSION).tar.gz @@ -76,7 +76,6 @@ define Package/qt4-gui $(call Package/qt4/Default) DEFAULT:= DEPENDS+=+libpng +libtiff +libjpeg +libfreetype +qt4-network \ - +font-base \ +FEATURE_drawing-backend_libX11:libX11 \ +FEATURE_drawing-backend_libX11:libXext @DISPLAY_SUPPORT TITLE+=(gui) -- 2.30.2