Update gtk2 package to 2.14.3.

[openwrt/svn-archive/archive.git] / XOrg / lib / gtk2 / Makefile

diff --git a/XOrg/lib/gtk2/Makefile b/XOrg/lib/gtk2/Makefile
index a80095710e688860e537554e14ac8630cac0a438..4f799fccb5ceb93df0a06f3c8f69a1708236ba9b 100644 (file)
--- a/XOrg/lib/gtk2/Makefile
+++ b/XOrg/lib/gtk2/Makefile
@@ -1,53 +1,123 @@
-# 
+#
 # Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gtk2
-PKG_VERSION:=2.10.14
-PKG_RELEASE:=1
+PKG_VERSION:=2.14.3
+PKG_RELEASE:=3
 
 PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:= http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/
-PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-2.10.14
-PKG_MD5SUM:=018d7dd0fa7de01cfdb77c7c55e7ba26
+PKG_SOURCE_URL:=@GNOME/gtk+/2.14
+PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-$(PKG_VERSION)
+PKG_MD5SUM:=359e44c8e47dfe04a09ac09b8e015e58
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+PKG_INSTALL:=1
+
+TARGET_CFLAGS+=\
+       -I$(STAGING_DIR)/usr/lib/libintl/include/
+
+EXTRA_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/
 
-EXTRA_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/
+STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk-cups2)
 
 define Package/gtk2
   SECTION:=xorg-framework
   CATEGORY:=Xorg
   SUBMENU:=framework
-  TITLE:=GTK+ 2.10.14 package
-  DEPENDS:=+cairo +pango +libjpeg +atk +libtiff +pixman @DISPLAY_SUPPORT
+  TITLE:=GTK+-2.0
+  DEPENDS:=+cairo +pango +libpng +libjpeg +atk +libtiff +libX11
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
+define Package/gtk2-cups
+  SECTION:=xorg-framework
+  CATEGORY:=Xorg
+  SUBMENU:=framework
+  TITLE:=CUPS print backend for GTK+-2.0
+  DEPENDS:=gtk2 +cups
+endef
+
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --disable-glibtest \
+               --disable-gdiplus \
+               --without-libjasper \
+               $(if $(CONFIG_PACKAGE_gtk2-cups),--enable-cups=auto,--disable-cups), \
+               gio_can_sniff=no \
+       )
 endef
 
 define Build/InstallDev
-       $(INSTALL_DIR)  $(1)/usr/{lib/pkgconfig,include}
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/include/* $(1)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*,so} $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include}
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/include/* $(1)/usr/include/
+
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{la,so*} \
+               $(1)/usr/lib/
+
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/gtk2/install
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DIR) $(1)/etc/gtk-2.0
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/etc/gtk-2.0/* \
+               $(1)/etc/gtk-2.0/
+
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \
+               $(1)/usr/lib/
+
+       $(foreach d,engines immodules loaders, \
+               $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/$(d); \
+               $(INSTALL_DATA) \
+                       $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/$(d)/*.{so,a} \
+                       $(1)/usr/lib/gtk-2.0/2.10.0/$(d)/;\
+       )
+       $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-{file,lpr}.{so,a} \
+               $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/
+
+       $(INSTALL_DIR) $(1)/usr/bin/
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/bin/{gdk-pixbuf-query-loaders,gtk-query-immodules-2.0,gtk-update-icon-cache} \
+               $(1)/usr/bin/
+
+       $(INSTALL_DIR) $(1)/usr/share/themes/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/share/themes/* \
+               $(1)/usr/share/themes/
+
+       $(INSTALL_DIR) $(1)/etc/init.d/
+       $(INSTALL_BIN) ./files/gdk-pixbuf-query-loaders.init $(1)/etc/init.d/gdk-pixbuf-query-loaders
+endef
+
+define Package/gtk2-cups/install
+       $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.{so,a} \
+               $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/
 endef
 
 $(eval $(call BuildPackage,gtk2))
+$(eval $(call BuildPackage,gtk2-cups))
 $(eval $(call RequireCommand,gdk-pixbuf-csource, \
        Please install gtk2.0-dev \
 ))