Update pango to 1.20.5 and add init script which calls pango-querymodules on the
target system. git-svn-id: svn://svn.openwrt.org/openwrt/packages@12474 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
61ff59ce81
commit
6f67e425a0
@ -9,16 +9,19 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=pango
|
PKG_NAME:=pango
|
||||||
PKG_VERSION:=1.19.4
|
PKG_VERSION:=1.20.5
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
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
|
PKG_FIXUP:=libtool
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
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
|
define Package/pango
|
||||||
SECTION:=xorg-libs
|
SECTION:=xorg-libs
|
||||||
@ -28,16 +31,12 @@ define Package/pango
|
|||||||
DEPENDS:=+xorg-server-essentials +cairo +glib2
|
DEPENDS:=+xorg-server-essentials +cairo +glib2
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Configure
|
define Package/pango/description
|
||||||
(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
|
Pango is a library for layout and rendering of text, with an emphasis
|
||||||
if [ -x $(CONFIGURE_CMD) ]; then \
|
on internationalization. Pango can be used anywhere that text layout
|
||||||
$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
|
is needed; however, most of the work on Pango so far has been done using
|
||||||
$(CONFIGURE_VARS) \
|
the GTK+ widget toolkit as a test platform. Pango forms the core of text
|
||||||
$(CONFIGURE_CMD) \
|
and font handling for GTK+-2.x.
|
||||||
$(CONFIGURE_ARGS_XTRA) \
|
|
||||||
$(CONFIGURE_ARGS) ;\
|
|
||||||
fi \
|
|
||||||
)
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Compile
|
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/pango/ $(1)/usr/lib
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
|
$(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
|
endef
|
||||||
|
|
||||||
define Package/pango/install
|
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/lib/lib*so* $(1)/usr/lib/
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
|
$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
|
||||||
$(CP) -r $(PKG_INSTALL_DIR)/usr/lib/pango/ $(1)/usr/lib
|
$(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
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,pango))
|
$(eval $(call BuildPackage,pango))
|
||||||
|
12
XOrg/lib/pango/files/pango-querymodules.init
Executable file
12
XOrg/lib/pango/files/pango-querymodules.init
Executable file
@ -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
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user