From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 29 Jan 2008 12:32:49 +0000 (+0000)
Subject: integrate qpf fonts into "font-update-common" framework.  partly closes 2430.
X-Git-Tag: Release-2010-05/1~7813
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f0126c42b47a09b2f360f761c76fc35bb874d0e;p=openembedded.git

integrate qpf fonts into "font-update-common" framework.  partly closes 2430.
---

diff --git a/packages/qpf-fonts/qpf.inc b/packages/qpf-fonts/qpf.inc
index 67761bd4be..7597b436be 100644
--- a/packages/qpf-fonts/qpf.inc
+++ b/packages/qpf-fonts/qpf.inc
@@ -1,4 +1,4 @@
-PACKAGE_ARCH = "all"
+RDEPENDS = "font-update-common qte-fonts-common"
 
 do_configure() {
 	:
@@ -9,13 +9,11 @@ do_compile() {
 }
 
 pkg_postinst_fonts() {
-. /etc/profile
-${sbindir}/update-qtfontdir
+        update-fonts
 }
 
 pkg_postrm_fonts() {
-. /etc/profile
-${sbindir}/update-qtfontdir -f
+        update-fonts
 }
 
 python populate_packages_prepend() {
@@ -30,3 +28,5 @@ python populate_packages_prepend() {
 			  description=pkgdescription, postinst=postinst, postrm=postrm, recursive=True, hook=None, 
 			  extra_depends='qpf-font-common')
 }
+
+PACKAGE_ARCH = "all"
diff --git a/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb
index 479ed55bb8..02d0663c3e 100644
--- a/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb
+++ b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb
@@ -1,12 +1,14 @@
 DESCRIPTION= "Tools to update the Qt fontdir"
+HOMEPAGE = "http://www.trolltech.com"
 SECTION = "opie/base"
 LICENSE = "GPL QPL"
-PACKAGE_ARCH = "all"
-HOMEPAGE = "http://www.trolltech.com"
-PR = "r3"
+RDEPENDS = "font-update-common"
+RDEPENDS_qte-font-common = ""
+PR = "r4"
+
+SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2 \
+          file://update-qtfontdir"
 
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2"
-SRC_URI += "file://update-qtfontdir"
 S = "${WORKDIR}/qt-embedded-free-${PV}"
 
 do_compile() {
@@ -31,7 +33,6 @@ do_install() {
 PACKAGES = "qte-fonts-common"
 FILES_${PN} = "${sbindir}"
 
-
 PACKAGES += "qte-font-fixed"
 PROVIDES += "qte-font-fixed"
 FILES_qte-font-fixed = "${palmtopdir}/lib/fonts/fixed*"
@@ -226,3 +227,5 @@ ${sbindir}/update-qtfontdir -f
 #. /etc/profile
 #${sbindir}/update-qtfontdir -f
 #}
+
+PACKAGE_ARCH = "all"