From: Lars-Peter Clausen <lars@metafoo.de>
Date: Mon, 1 Sep 2008 23:29:05 +0000 (+0000)
Subject: Update gtk to 2.12.11 and add init script which calls gdk-pixbuf-query-loaders
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=659bdfcc112840b026051f18e3d80f95186c18ca;ds=sidebyside

Update gtk to 2.12.11 and add init script which calls gdk-pixbuf-query-loaders
on the target system.


SVN-Revision: 12476
---

diff --git a/XOrg/lib/gtk2/Makefile b/XOrg/lib/gtk2/Makefile
index 32ba03d2d3..da0434d2c3 100644
--- a/XOrg/lib/gtk2/Makefile
+++ b/XOrg/lib/gtk2/Makefile
@@ -8,19 +8,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gtk2
-PKG_VERSION:=2.10.14
-PKG_RELEASE:=1
+PKG_VERSION:=2.12.11
+PKG_RELEASE:=2
 
 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.12
+PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-$(PKG_VERSION)
+PKG_MD5SUM:=f7aab88e856a813386f797aade5867ad
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
 EXTRA_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/
 
 define Package/gtk2
   SECTION:=xorg-framework
@@ -30,6 +34,10 @@ define Package/gtk2
   DEPENDS:=+cairo +pango +libjpeg +atk +libtiff +pixman +libX11
 endef
 
+define Build/Configure
+	$(call Build/Configure/Default, --without-libjasper gio_can_sniff=no)
+endef
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
@@ -44,7 +52,18 @@ define Build/InstallDev
 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/
+	$(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/* $(1)/usr/lib/gtk-2.0/
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(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
 
 $(eval $(call BuildPackage,gtk2))
diff --git a/XOrg/lib/gtk2/files/gdk-pixbuf-query-loaders.init b/XOrg/lib/gtk2/files/gdk-pixbuf-query-loaders.init
new file mode 100755
index 0000000000..f4efb0ccc9
--- /dev/null
+++ b/XOrg/lib/gtk2/files/gdk-pixbuf-query-loaders.init
@@ -0,0 +1,12 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2007 OpenWrt.org
+
+START=99
+FILE=/etc/gtk-2.0/gdk-pixbuf.loaders
+
+start() {
+    if [ ! -e ${FILE} ]; then
+        mkdir -p $(dirname ${FILE})
+        gdk-pixbuf-query-loaders > ${FILE}
+    fi
+}