From 4439f3fd26db6b58f85b5e927600bad7d7a4539b Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 22 Feb 2005 22:40:13 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/22 23:23:54+01:00 handhelds.org!zecke Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/ich/programming/oe/openembedded 2005/02/22 23:23:17+01:00 handhelds.org!zecke Qt 4.0 Beta1: -Create a qx114 bbclass to override qmake -Use version four for uic, moc, qrr -Correct fetching the source (tar.bz2 didn't work) and it is named opensource and not free -Mark it as BROKEN and add comments about known errors 2005/02/22 19:45:42+01:00 handhelds.org!zecke QPF Font Handling: Use the palmtopdir instead of hardcoding /opt/QtPalmtop BKrev: 421bb4cdX_F5PVSIybTGnWqDS-go_A --- classes/qpf.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'classes/qpf.bbclass') diff --git a/classes/qpf.bbclass b/classes/qpf.bbclass index 7073d25f7e..45cf7d448e 100644 --- a/classes/qpf.bbclass +++ b/classes/qpf.bbclass @@ -18,11 +18,12 @@ ${sbindir}/update-qtfontdir python populate_packages_prepend() { postinst = bb.data.getVar('pkg_postinst_fonts', d, 1) postrm = postinst + fontdir = bb.data.getVar('palmtopdir', d, 1) + '/lib/fonts' pkgregex = "^([a-z]*_[0-9]*).*.qpf$" pkgpattern = bb.data.getVar('QPF_PKGPATTERN', d, 1) or 'qpf-%s' pkgdescription = bb.data.getVar('QPF_DESCRIPTION', d, 1) or 'QPF font %s' - do_split_packages(d, root='/opt/QtPalmtop/lib/fonts', file_regex=pkgregex, output_pattern=pkgpattern, + do_split_packages(d, root=fontdir, file_regex=pkgregex, output_pattern=pkgpattern, description=pkgdescription, postinst=postinst, postrm=postrm, recursive=True, hook=None, extra_depends='qpf-font-common') } -- cgit v1.2.3