From: Mirko Vogt <mirko@openwrt.org>
Date: Sat, 21 Jan 2012 06:32:08 +0000 (+0000)
Subject: Revert "qt4: Add basic font dependency to qt4-gui"
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f5a55a8a0efe4b87825fec02a2803b6169a238e3;p=openwrt%2Fsvn-archive%2Ffeeds.git

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
---

diff --git a/xorg/lib/qt4/Makefile b/xorg/lib/qt4/Makefile
index 5078511..b01f13d 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)