[oe-commits] Jonathan Liu : ttf-wqy-zenhei: update to 0.9.45

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 85a3207b4df85edfd1d7e262a422f0d55d2d2def
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=85a3207b4df85edfd1d7e262a422f0d55d2d2def

Author: Jonathan Liu <net147 at gmail.com>
Date:   Wed Jul  1 16:43:30 2015 +1000

ttf-wqy-zenhei: update to 0.9.45

Signed-off-by: Jonathan Liu <net147 at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../ttf-fonts/ttf-wqy-zenhei_0.6.26.bb             | 25 --------------------
 .../ttf-fonts/ttf-wqy-zenhei_0.9.45.bb             | 27 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb
deleted file mode 100644
index 30ad91a..0000000
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require ttf.inc
-
-SUMMARY = "WenQuanYi Zen Hei - A Hei-Ti Style Chinese font"
-AUTHOR = "Qianqian Fang and The WenQuanYi Project Contributors"
-HOMEPAGE = "http://wqy.sourceforge.net/en/"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cf540fc7d35b5777e36051280b3a911c"
-PR = "r4"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/wqy/wqy-zenhei-${PV}-0.tar.gz"
-S = "${WORKDIR}/wqy-zenhei"
-
-do_install_append () { 
-    install -d ${D}${sysconfdir}/fonts/conf.d/
-    install -m 0644 ${S}/44-wqy-zenhei.conf ${D}${sysconfdir}/fonts/conf.d/
-    install -m 0644 ${S}/66-wqy-zenhei-sharp.conf ${D}${sysconfdir}/fonts/conf.d/
-}
-
-PACKAGES = "${PN}"
-FONT_PACKAGES = "${PN}"
-
-FILES_${PN} = "${datadir}/fonts ${sysconfdir}"
-
-SRC_URI[md5sum] = "bf2c1cb512606d995873bada27c777da"
-SRC_URI[sha256sum] = "47355b6ec84bb309614b6d657ddfda993b96ed0be569264f82e523b254f945b2"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb
new file mode 100644
index 0000000..1207a61
--- /dev/null
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb
@@ -0,0 +1,27 @@
+require ttf.inc
+
+SUMMARY = "WenQuanYi Zen Hei - A Hei-Ti Style Chinese font"
+AUTHOR = "Qianqian Fang and The WenQuanYi Project Contributors"
+HOMEPAGE = "http://wenq.org/"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=cf540fc7d35b5777e36051280b3a911c"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wqy/wqy-zenhei-${PV}.tar.gz"
+SRC_URI[md5sum] = "4c6c3f4e902dd5ee0a121e8c41d040bd"
+SRC_URI[sha256sum] = "e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6"
+
+S = "${WORKDIR}/wqy-zenhei"
+
+do_install_append () {
+    sed -i -e '/<string>[^W]/d' ${S}/44-wqy-zenhei.conf
+    install -d ${D}${sysconfdir}/fonts/conf.d
+
+    for x in ${S}/*.conf; do
+        install -m 0644 $x ${D}${sysconfdir}/fonts/conf.d/
+    done
+}
+
+PACKAGES = "${PN}"
+FONT_PACKAGES = "${PN}"
+
+FILES_${PN} = "${datadir}/fonts ${sysconfdir}"