From 7e4225e01c3c95ab5eef922ff038fc5be851a369 Mon Sep 17 00:00:00 2001 From: kyak Date: Wed, 23 Feb 2011 20:45:55 +0300 Subject: [PATCH] wqy: install a symlink so that qt sees that font Might be a temporary solution since qt fonts dir could be changed --- kinyin/Makefile | 2 +- wqy/Makefile | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/kinyin/Makefile b/kinyin/Makefile index dc4ce78..bfd96bf 100644 --- a/kinyin/Makefile +++ b/kinyin/Makefile @@ -23,7 +23,7 @@ define Package/kinyin CATEGORY:=Utilities TITLE:=kinyin URL:=http://qt-apps.org/content/show.php/kinyin?content=95926 - DEPENDS:=+qt4 +qt4-gui +dejavu-fonts-ttf + DEPENDS:=+qt4 +qt4-gui +dejavu-fonts-ttf +wqy-microhei endef TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib diff --git a/wqy/Makefile b/wqy/Makefile index 6d63d0a..4fb300c 100644 --- a/wqy/Makefile +++ b/wqy/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=font PKG_NAME:=wqy-microhei -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=0.2.0-beta PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}/ @@ -37,8 +37,9 @@ define Build/Configure endef define Package/wqy-microhei/install - $(INSTALL_DIR) $(1)/usr/share/fonts/wqy-microhei + $(INSTALL_DIR) $(1)/usr/share/fonts/wqy-microhei $(1)/usr/share/fonts/ttf-dejavu $(INSTALL_DATA) $(PKG_BUILD_DIR)/*.ttc $(1)/usr/share/fonts/wqy-microhei + ln -s /usr/share/fonts/wqy-microhei/wqy-microhei.ttc $(1)/usr/share/fonts/ttf-dejavu/wqy-microhei.ttc endef $(eval $(call BuildPackage,wqy-microhei))