[oe-commits] org.oe.dev qpf-font-common: fonts aren't in /opt/QtPalmtop anymore

[polyonymous commit]

qpf-font-common: fonts aren't in /opt/QtPalmtop anymore

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: eb704a1390c916f4e1c23a22cd7abe769ca7bba5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=eb704a1390c916f4e1c23a22cd7abe769ca7bba5
Files:
1
packages/qpf-fonts/files/update-qtfontdir
packages/qpf-fonts/qpf-font-common_1.0.bb
Diffs:

#
# mt diff -r416abd52184376faf859681c82ba47361f1e704b -reb704a1390c916f4e1c23a22cd7abe769ca7bba5
#
# 
# 
# patch "packages/qpf-fonts/files/update-qtfontdir"
#  from [0ffc203708c8b47f49fbcfcb74224e88592a5825]
#    to [5c709c3939225b46257facf90d34ee9cb46c7d8f]
# 
# patch "packages/qpf-fonts/qpf-font-common_1.0.bb"
#  from [bec271059e6ea98a8f1c3b63644f7f3f17eee110]
#    to [c89270e85a0fe6989f90dbd638f36e2b07d62343]
# 
============================================================
--- packages/qpf-fonts/files/update-qtfontdir	0ffc203708c8b47f49fbcfcb74224e88592a5825
+++ packages/qpf-fonts/files/update-qtfontdir	5c709c3939225b46257facf90d34ee9cb46c7d8f
@@ -41,7 +41,7 @@ if [ -z "$1" ]; then
 	if [ -n "$QTDIR" ]; then
 		fontdir=$QTDIR/lib/fonts
 	else
-		fontdir=/opt/QtPalmtop/lib/fonts
+		fontdir=@palmtopdir@/lib/fonts
 	fi
 else
 	fontdir=$1
============================================================
--- packages/qpf-fonts/qpf-font-common_1.0.bb	bec271059e6ea98a8f1c3b63644f7f3f17eee110
+++ packages/qpf-fonts/qpf-font-common_1.0.bb	c89270e85a0fe6989f90dbd638f36e2b07d62343
@@ -1,8 +1,8 @@ LICENSE = "GPL QPL"
 DESCRIPTION = "Qt/Embedded Fonts Common Files"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "file://update-qtfontdir"
 S = "${WORKDIR}/qt-${PV}"
@@ -10,4 +10,5 @@ do_install() {
 do_install() {
 	install -d ${D}${sbindir}/
 	install -m 0755 ${WORKDIR}/update-qtfontdir ${D}${sbindir}/
+	sed -i -e 's, at palmtopdir@,${palmtopdir},g' ${D}${sbindir}/update-qtfontdir
 }