[oe-commits] org.oe.dev integrate qpf fonts into "font-update-common" framework. partly closes 2430.

[Laibsch commit]

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

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 00152e23f5366f1e8e84e4b10b210ec4df91ddc2
ViewMTN: http://monotone.openembedded.org/revision/info/00152e23f5366f1e8e84e4b10b210ec4df91ddc2
Files:
1
packages/qpf-fonts/qpf.inc
packages/qte-fonts-common/qte-fonts-common_3.3.5.bb
Diffs:

#
# mt diff -rf00585816c3caa386e981ceb5580dc29a81b448f -r00152e23f5366f1e8e84e4b10b210ec4df91ddc2
#
# 
# 
# patch "packages/qpf-fonts/qpf.inc"
#  from [a84555b66be4b2a2653c8c737ac5a0be38dc5351]
#    to [8c21a9e146ae1312ea62c73be596e04b6cbca7f9]
# 
# patch "packages/qte-fonts-common/qte-fonts-common_3.3.5.bb"
#  from [6b1fb3fd41be95b7f11f5bfae14ddc12cdbe5cc1]
#    to [9c034f281ff42c756ba67094657aedcf637c0f22]
# 
============================================================
--- packages/qpf-fonts/qpf.inc	a84555b66be4b2a2653c8c737ac5a0be38dc5351
+++ packages/qpf-fonts/qpf.inc	8c21a9e146ae1312ea62c73be596e04b6cbca7f9
@@ -1,4 +1,4 @@
-PACKAGE_ARCH = "all"
+RDEPENDS = "font-update-common qte-fonts-common"
 
 do_configure() {
 	:
@@ -9,13 +9,11 @@ pkg_postinst_fonts() {
 }
 
 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"
============================================================
--- packages/qte-fonts-common/qte-fonts-common_3.3.5.bb	6b1fb3fd41be95b7f11f5bfae14ddc12cdbe5cc1
+++ packages/qte-fonts-common/qte-fonts-common_3.3.5.bb	9c034f281ff42c756ba67094657aedcf637c0f22
@@ -1,12 +1,14 @@ DESCRIPTION= "Tools to update the Qt fon
 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"
-SRC_URI += "file://update-qtfontdir"
+SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2 \
+          file://update-qtfontdir"
+
 S = "${WORKDIR}/qt-embedded-free-${PV}"
 
 do_compile() {
@@ -31,7 +33,6 @@ FILES_${PN} = "${sbindir}"
 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"