#
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-# $Id: Makefile 12846 2008-10-03 22:38:55Z lars $
include $(TOPDIR)/rules.mk
PKG_NAME:=gtk2
-PKG_VERSION:=2.14.4
-PKG_RELEASE:=5
+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
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/ \
- -L$(STAGING_DIR)/usr/lib/
+ -L$(STAGING_DIR)/usr/lib/libiconv/lib/
-STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk-cups2)
+STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk2-cups)
define Package/gtk2
SECTION:=xorg-framework
--disable-xinerama \
--without-libjasper \
--with-xinput \
- $(if $(CONFIG_PACKAGE_gtk2-cups),--enable-cups,--disable-cups), \
+ $(if $(CONFIG_PACKAGE_gtk2-cups),--enable-cups=auto,--disable-cups), \
gio_can_sniff=no \
)
endef
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/include/* $(1)/usr/include/
- $(INSTALL_DATA) \
+ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
$(1)/usr/lib/
$(1)/etc/gtk-2.0/
$(INSTALL_DIR) $(1)/usr/lib
- $(INSTALL_DATA) \
+ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/*.so* \
$(1)/usr/lib/
$(eval $(call BuildPackage,gtk2))
$(eval $(call BuildPackage,gtk2-cups))
-$(eval $(call RequireCommand,gdk-pixbuf-csource, \
- Please install gtk2.0-dev \
-))
+