From 29abf25387b08f77e5eb51216dd9b786ae5b4a43 Mon Sep 17 00:00:00 2001 From: jow Date: Sun, 26 Dec 2010 03:52:33 +0000 Subject: [PATCH] [packages] gtk2: depend on glib2, remove libintl, libiconv stuff, that is glib2's business git-svn-id: svn://svn.openwrt.org/openwrt/packages@24831 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Xorg/lib/gtk2/Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Xorg/lib/gtk2/Makefile b/Xorg/lib/gtk2/Makefile index 504fa1c40..dab2e094d 100644 --- a/Xorg/lib/gtk2/Makefile +++ b/Xorg/lib/gtk2/Makefile @@ -21,14 +21,8 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -TARGET_CFLAGS+=\ - -I$(STAGING_DIR)/usr/lib/libintl/include/ \ - -I$(STAGING_DIR)/usr/lib/libiconv/include/ - TARGET_LDFLAGS+=\ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib/ \ - -L$(STAGING_DIR)/usr/lib/libiconv/lib/ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk2-cups) @@ -39,7 +33,7 @@ define Package/gtk2 CATEGORY:=Xorg SUBMENU:=framework TITLE:=GTK+-2.0 - DEPENDS:=@DISPLAY_SUPPORT +cairo +pango +libpng +libjpeg +atk +libtiff \ + DEPENDS:=@DISPLAY_SUPPORT +cairo +pango +libpng +libjpeg +atk +libtiff +glib2 \ +FEATURE_drawing-backend_DirectFB:directfb \ +FEATURE_drawing-backend_libX11:libX11 \ +FEATURE_drawing-backend_libX11:libXext \ -- 2.11.0