X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=XOrg%2Flib%2Fpango%2FMakefile;h=c071e13a1d6051beebeb9e4bd04f0859adf8664a;hp=a4cc9c54e69cde0a802dbfe40c55969beefab68e;hb=76fe8b390e3d92912de83f65fe3b5dd65053f8a7;hpb=fab4b2d9918e2cafdce7287233d93b3f3f8940be

diff --git a/XOrg/lib/pango/Makefile b/XOrg/lib/pango/Makefile
index a4cc9c54e6..c071e13a1d 100644
--- 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))