X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=Xorg%2Flib%2Fgtk2%2FMakefile;h=cb96c65830ab909ff3828f9555eafd79020ca777;hp=17dd79ed5ab84e80a73f23b059ccde32a5d46b11;hb=4f1acc2a6f10ebab931e2e8ad4ec1aa5842eb02f;hpb=f03da1117dc1f2e88309b46ee3471da46d49bb9b

diff --git a/Xorg/lib/gtk2/Makefile b/Xorg/lib/gtk2/Makefile
index 17dd79ed5a..cb96c65830 100644
--- a/Xorg/lib/gtk2/Makefile
+++ b/Xorg/lib/gtk2/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gtk2
-PKG_VERSION:=2.14.4
-PKG_RELEASE:=6
+PKG_VERSION:=2.17.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@GNOME/gtk+/2.14
+PKG_SOURCE_URL:=@GNOME/gtk+/2.17
 PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-$(PKG_VERSION)
-PKG_MD5SUM:=72bf65a54d2d29a6644dc0d28313ee67
+PKG_MD5SUM:=a1a1f0b66a240c31cb2733643f9170ba
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
@@ -22,13 +22,13 @@ include $(INCLUDE_DIR)/package.mk
 PKG_INSTALL:=1
 
 TARGET_CFLAGS+=\
-	-I$(STAGING_DIR)/usr/lib/libintl/include/
+	-I$(STAGING_DIR)/usr/lib/libintl/include/ \
+	-I$(STAGING_DIR)/usr/lib/libiconv/include/
 
-EXTRA_LDFLAGS+=\
+TARGET_LDFLAGS+=\
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
 	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
-	$(TARGET_LDFLAGS)
+	-L$(STAGING_DIR)/usr/lib/libiconv/lib/
 
 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk2-cups)
 
@@ -121,10 +121,6 @@ define Package/gtk2-cups/install
 		$(1)/usr/lib/gtk-2.0/2.10.0/printbackends/
 endef
 
-$(eval $(call RequireCommand,gdk-pixbuf-csource, \
-	Please install gtk2.0-dev \
-))
-
 $(eval $(call BuildPackage,gtk2))
 $(eval $(call BuildPackage,gtk2-cups))