Update pango to 1.20.5 and add init script which calls pango-querymodules on the

target system.

SVN-Revision: 12474

diff --git a/XOrg/lib/pango/Makefile b/XOrg/lib/pango/Makefile
index a4cc9c54e69cde0a802dbfe40c55969beefab68e..c071e13a1d6051beebeb9e4bd04f0859adf8664a 100644 (file)
--- a/XOrg/lib/pango/Makefile
+++ b/XOrg/lib/pango/Makefile
@@ -9,16 +9,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pango
-PKG_VERSION:=1.19.4
-PKG_RELEASE:=1
+PKG_VERSION:=1.20.5
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.gnome.org/pub/gnome/sources/pango/1.19/
+PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/1.20/
+PKG_MD5SUM:=052b60a12f6b2eb4f251ab961f2b2b84
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_LDFLAGS:=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib/ -L$(STAGING_DIR)/usr/lib/libintl/lib/
+EXTRA_LDFLAGS:=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+               -L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
+                          -L$(STAGING_DIR)/usr/lib/libintl/lib/ 
 
 define Package/pango
   SECTION:=xorg-libs
@@ -28,16 +31,12 @@ define Package/pango
   DEPENDS:=+xorg-server-essentials +cairo +glib2
 endef
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-               if [ -x $(CONFIGURE_CMD) ]; then \
-                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-                       $(CONFIGURE_VARS) \
-                       $(CONFIGURE_CMD) \
-                       $(CONFIGURE_ARGS_XTRA) \
-                       $(CONFIGURE_ARGS) ;\
-               fi \
-       )
+define Package/pango/description
+Pango is a library for layout and rendering of text, with an emphasis
+on internationalization. Pango can be used anywhere that text layout
+is needed; however, most of the work on Pango so far has been done using
+the GTK+ widget toolkit as a test platform. Pango forms the core of text
+and font handling for GTK+-2.x.
 endef
 
 define Build/Compile
@@ -59,7 +58,7 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pango/ $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-       $(SED)  's,Libs:,Libs: -L${libdir}/libiconv/lib/ -L${libdir}/libintl/lib/ ,g' $(1)/usr/lib/pkgconfig/pango*.pc
+       $(SED) 's,Libs:,Libs: -L$$$${libdir}/libiconv/lib/ -L$$$${libdir}/libintl/lib/ ,g' $(1)/usr/lib/pkgconfig/pango*.pc
 endef
 
 define Package/pango/install
@@ -67,6 +66,8 @@ define Package/pango/install
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
        $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/pango/ $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/etc/init.d/
+       $(INSTALL_BIN) ./files/pango-querymodules.init $(1)/etc/init.d/pango-querymodules
 endef
 
 $(eval $(call BuildPackage,pango))

diff --git a/XOrg/lib/pango/files/pango-querymodules.init b/XOrg/lib/pango/files/pango-querymodules.init
new file mode 100755 (executable)
index 0000000..f7f56e5
--- /dev/null
+++ b/XOrg/lib/pango/files/pango-querymodules.init
@@ -0,0 +1,12 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2007 OpenWrt.org
+
+START=99
+FILE=/etc/pango/pango.modules
+
+start() {
+    if [ ! -e ${FILE} ]; then
+        mkdir -p $(dirname ${FILE})
+        pango-querymodules > ${FILE}
+    fi
+}