diff options
| -rw-r--r-- | classes/qpf.bbclass | 28 | ||||
| -rw-r--r-- | packages/meta/opie-collections.inc | 4 | ||||
| -rw-r--r-- | packages/opie-backup/opie-backup_cvs.bb | 3 | ||||
| -rw-r--r-- | packages/opie-citytime/opie-citytime_cvs.bb | 4 | ||||
| -rw-r--r-- | packages/opie-formatter/opie-formatter_cvs.bb | 3 | ||||
| -rw-r--r-- | packages/opie-sysinfo/opie-sysinfo_cvs.bb | 2 |
6 files changed, 35 insertions, 9 deletions
diff --git a/classes/qpf.bbclass b/classes/qpf.bbclass index e69de29bb2..7073d25f7e 100644 --- a/classes/qpf.bbclass +++ b/classes/qpf.bbclass @@ -0,0 +1,28 @@ +PACKAGE_ARCH = "all" + +do_configure() { + : +} + +do_compile() { + : +} + +pkg_postinst_fonts() { +#!/bin/sh +set -e +. /etc/profile +${sbindir}/update-qtfontdir +} + +python populate_packages_prepend() { + postinst = bb.data.getVar('pkg_postinst_fonts', d, 1) + postrm = postinst + 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, + description=pkgdescription, postinst=postinst, postrm=postrm, recursive=True, hook=None, + extra_depends='qpf-font-common') +} diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc index 63532dba09..f522586ec1 100644 --- a/packages/meta/opie-collections.inc +++ b/packages/meta/opie-collections.inc @@ -8,7 +8,7 @@ OPIE_FONTS_SMALL = "qte-font-smoothsans-90 qte-font-smoothsans-100 qte-font-smoothsans-110 \ qte-font-smoothmono-90 qte-font-smoothmono-100 qte-font-smoothmono-110 \ - qte-font-fixed-70 qte-font-fixed-120 " + qte-font-fixed-70 qte-font-fixed-120 qpf-font-common " # # Fonts for >= 640x480 displays @@ -21,7 +21,7 @@ OPIE_FONTS_LARGE = "qte-font-smoothsans-120 qte-font-smoothsans-140 qte-font-smo # Dependencies to get the launcher up and running # -OPIE_LIBS_DEPENDS = "qte libopie2 qpf-qte" +OPIE_LIBS_DEPENDS = "qte libopie2 qpf-qte qpf-font-common" OPIE_LIBS_RDEPENDS = "${OPIE_FONTS_SMALL}" OPIE_BASE = "opie-pics opie-sounds opie-qcop opie-quicklauncher opie-taskbar" diff --git a/packages/opie-backup/opie-backup_cvs.bb b/packages/opie-backup/opie-backup_cvs.bb index 5c01e8b638..c33071dbb7 100644 --- a/packages/opie-backup/opie-backup_cvs.bb +++ b/packages/opie-backup/opie-backup_cvs.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Backup and Restore utility." -SECTION = "opie/settings" +SECTION = "opie/applications" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" @@ -14,7 +14,6 @@ S = "${WORKDIR}/${APPNAME}" inherit opie -# FILES plugins/application/libbackup.so* bin/backup pics/backup apps/Settings/backup.desktop do_install() { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ diff --git a/packages/opie-citytime/opie-citytime_cvs.bb b/packages/opie-citytime/opie-citytime_cvs.bb index 186727fa1f..74b8a74578 100644 --- a/packages/opie-citytime/opie-citytime_cvs.bb +++ b/packages/opie-citytime/opie-citytime_cvs.bb @@ -1,5 +1,5 @@ -DESCRIPTION = "Time-zone / world clock settings" -SECTION = "opie/settings" +DESCRIPTION = "Opie Time-zone / world clock settings" +SECTION = "opie/applications" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" diff --git a/packages/opie-formatter/opie-formatter_cvs.bb b/packages/opie-formatter/opie-formatter_cvs.bb index f86b08c18f..8bd2b065a9 100644 --- a/packages/opie-formatter/opie-formatter_cvs.bb +++ b/packages/opie-formatter/opie-formatter_cvs.bb @@ -1,5 +1,5 @@ DESCRIPTION = "The filesystem formatting and mountpoint app for the Opie environment." -SECTION = "opie/settings" +SECTION = "opie/applications" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" @@ -14,7 +14,6 @@ S = "${WORKDIR}/${APPNAME}" inherit opie -# FILES plugins/application/libformatter.so* bin/formatter pics/formatter/devices.png apps/Settings/formatter.desktop do_install() { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ diff --git a/packages/opie-sysinfo/opie-sysinfo_cvs.bb b/packages/opie-sysinfo/opie-sysinfo_cvs.bb index 9f25ab64d7..54c689e4f1 100644 --- a/packages/opie-sysinfo/opie-sysinfo_cvs.bb +++ b/packages/opie-sysinfo/opie-sysinfo_cvs.bb @@ -1,5 +1,5 @@ DESCRIPTION = "System Information dialog for the Opie environment" -SECTION = "opie/settings" +SECTION = "opie/applications" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" |