From 48c7883a6f0fa1820a3307d109ceb26d1bcb7a41 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 29 Jan 2008 14:40:07 +0000 Subject: qpf-fonts: some major clean-up and bumping of PR after the "update-font-common" commits * unify * drop update-qtfontdir from qte-fonts-common, it is provided by qpf-font-common * replace dependencies on qte-fonts-common with qpf-font-common * rename qte-fonts-common_3.3.5 to qpf-qte_3.3.5 --- packages/qpf-fonts/qpf-arabic_1.0.bb | 17 +- .../qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb | 27 +-- packages/qpf-fonts/qpf-bitstream-vera_1.10.bb | 23 +- packages/qpf-fonts/qpf-font-common_1.0.bb | 8 +- packages/qpf-fonts/qpf-freemono_1.0.bb | 17 +- packages/qpf-fonts/qpf-freeserif_1.0.bb | 18 +- packages/qpf-fonts/qpf-helvetica_1.0.bb | 17 +- packages/qpf-fonts/qpf-hunkysans_0.3.0.bb | 18 +- packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb | 18 +- packages/qpf-fonts/qpf-qte_2.3.10.bb | 12 +- packages/qpf-fonts/qpf-qte_3.3.5.bb | 57 +++++ packages/qpf-fonts/qpf-terminus.bb | 14 +- packages/qpf-fonts/qpf-unifont_1.0.bb | 16 +- packages/qpf-fonts/qpf-unismall_1.0.0.bb | 23 +- packages/qpf-fonts/qpf-utopia_1.0.bb | 18 +- packages/qpf-fonts/qpf.inc | 2 +- packages/qpf-fonts/qte-fonts-common/.mtn2git_empty | 0 .../qpf-fonts/qte-fonts-common/update-qtfontdir | 74 ------- packages/qpf-fonts/qte-fonts-common_3.3.5.bb | 231 --------------------- 19 files changed, 112 insertions(+), 498 deletions(-) create mode 100644 packages/qpf-fonts/qpf-qte_3.3.5.bb delete mode 100644 packages/qpf-fonts/qte-fonts-common/.mtn2git_empty delete mode 100755 packages/qpf-fonts/qte-fonts-common/update-qtfontdir delete mode 100644 packages/qpf-fonts/qte-fonts-common_3.3.5.bb (limited to 'packages/qpf-fonts') diff --git a/packages/qpf-fonts/qpf-arabic_1.0.bb b/packages/qpf-fonts/qpf-arabic_1.0.bb index 8a7a6549b5..d2ef3af639 100644 --- a/packages/qpf-fonts/qpf-arabic_1.0.bb +++ b/packages/qpf-fonts/qpf-arabic_1.0.bb @@ -1,18 +1,9 @@ +require qpf.inc + DESCRIPTION = "Arabic fonts from Arabeyes.org" -SECTION = "opie/fonts" -PRIORITY = "optional" -LICENSE = "GPL" HOMEPAGE = "http://www.arabeyes.org" -PR = "r0" +LICENSE = "GPL" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/arabeyes/arabic-fonts-${PV}.tar.gz" S = "${WORKDIR}" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} - -require qpf.inc diff --git a/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb b/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb index 5b9b9fcadc..8aaae9143e 100644 --- a/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb +++ b/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb @@ -1,8 +1,8 @@ +require qpf.inc + DESCRIPTION = "Bitstream Vera Monospaced Font, QPF for Qt/Embedded" -SECTION = "opie/fonts" LICENSE = "Bitstream Vera" -PACKAGE_ARCH = "all" -PR = "r3" +PR = "r4" PROVIDES += "qpf-bitstream-vera-sans-mono-small" PROVIDES += "qpf-bitstream-vera-sans-mono-larger" @@ -12,26 +12,7 @@ PROVIDES += "qpf-bitstream-vera-sans-mono-huge" SRC_URI = "http://openzaurus.org/mirror/fonts-bitstream-vera-sans-mono.tar.gz" S = "${WORKDIR}/verasansmono" -FILES_${PN} += "/opt" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - - cd ${WORKDIR} - files=`find . -name "*.qpf"` - for i in $files; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/ - done -} - -pkg_postinst () { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} - +FILES_${PN} += "${palmtopdir}" PACKAGES = "${PN}-dbg \ qpf-bitstream-vera-sans-mono-small \ diff --git a/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb b/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb index 93a8591002..b23653e0d6 100644 --- a/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb +++ b/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb @@ -1,31 +1,14 @@ +require qpf.inc + DESCRIPTION = "The Bitstream Vera fonts - QPF Edition" -SECTION = "opie/fonts" -PRIORITY = "optional" LICENSE = "Bitstream Vera" -PACKAGE_ARCH = "all" -PR = "r2" +PR = "r3" PROVIDES = "qpf-bitstream-vera-small qpf-bitstream-vera-large" SRC_URI = "http://openzaurus.org/mirror/vera-qpf_1.10-3.tar.gz" S = "${WORKDIR}/vera-qpf" -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} - -pkg_postinst () { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} - - PACKAGES = "${PN}-dbg qpf-bitstream-vera-small qpf-bitstream-vera-large" FILES_qpf-bitstream-vera-small = "${palmqtdir}/lib/fonts/vera_80_50* \ diff --git a/packages/qpf-fonts/qpf-font-common_1.0.bb b/packages/qpf-fonts/qpf-font-common_1.0.bb index 41bdad0a4a..ba4f0867ad 100644 --- a/packages/qpf-fonts/qpf-font-common_1.0.bb +++ b/packages/qpf-fonts/qpf-font-common_1.0.bb @@ -1,8 +1,6 @@ -DESCRIPTION = "Qt/Embedded Fonts Common Files" -SECTION = "opie/fonts" -PRIORITY = "optional" +DESCRIPTION = "Common files for Qt/Embedded fonts" LICENSE = "GPL QPL" -PR = "r3" +PR = "r4" SRC_URI = "file://update-qtfontdir" S = "${WORKDIR}/qt-${PV}" @@ -12,3 +10,5 @@ do_install() { install -m 0755 ${WORKDIR}/update-qtfontdir ${D}${sbindir}/ sed -i -e 's,@palmtopdir@,${palmtopdir},g' ${D}${sbindir}/update-qtfontdir } + +PACKAGE_ARCH = "all" diff --git a/packages/qpf-fonts/qpf-freemono_1.0.bb b/packages/qpf-fonts/qpf-freemono_1.0.bb index 550bdd587d..a4c73f2b7f 100644 --- a/packages/qpf-fonts/qpf-freemono_1.0.bb +++ b/packages/qpf-fonts/qpf-freemono_1.0.bb @@ -1,19 +1,10 @@ +require qpf.inc + DESCRIPTION = "FreeMono font - QPF Edition" -SECTION = "opie/fonts" -PRIORITY = "optional" -LICENSE = "GPL" HOMEPAGE = "http://savannah.nongnu.org/projects/freefont/" -PACKAGE_ARCH = "all" +LICENSE = "GPL" +PR = "r1" SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}.tar.bz2" S = "${WORKDIR}/${PN}" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} - -require qpf.inc diff --git a/packages/qpf-fonts/qpf-freeserif_1.0.bb b/packages/qpf-fonts/qpf-freeserif_1.0.bb index 01d667c4cb..a45abbdcd3 100644 --- a/packages/qpf-fonts/qpf-freeserif_1.0.bb +++ b/packages/qpf-fonts/qpf-freeserif_1.0.bb @@ -1,20 +1,10 @@ +require qpf.inc + DESCRIPTION = "FreeSerif font - QPF Edition" -SECTION = "opie/fonts" -PRIORITY = "optional" -LICENSE = "GPL" HOMEPAGE = "http://savannah.nongnu.org/projects/freefont/" -PACKAGE_ARCH = "all" -PR = "r2" +LICENSE = "GPL" +PR = "r3" SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}.tar.bz2" S = "${WORKDIR}/${PN}" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} - -require qpf.inc diff --git a/packages/qpf-fonts/qpf-helvetica_1.0.bb b/packages/qpf-fonts/qpf-helvetica_1.0.bb index 2b5c767caa..1d2c672bcb 100644 --- a/packages/qpf-fonts/qpf-helvetica_1.0.bb +++ b/packages/qpf-fonts/qpf-helvetica_1.0.bb @@ -1,18 +1,9 @@ +require qpf.inc + DESCRIPTION = "Helvetica fonts - QPF Edition" -LICENSE = "GPL QPL" -SECTION = "opie/fonts" -PRIORITY = "optional" HOMEPAGE = "http://www.pobox.sk/~mico/zaurus.html" -PR = "r1" +LICENSE = "GPL QPL" +PR = "r2" SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-helvetica.tar.bz2" S = "${WORKDIR}/helvetica" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for font in *.qpf; do - install -m 644 $font ${D}${palmqtdir}/lib/fonts/ - done -} - -require qpf.inc diff --git a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb index efdf913edb..6f9db1202c 100644 --- a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb +++ b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb @@ -1,20 +1,10 @@ +require qpf.inc + DESCRIPTION = "Hunky Sans font - QPF Edition" -SECTION = "opie/fonts" -PRIORITY = "optional" -LICENSE = "LGPL" HOMEPAGE = "http://www.yoper.com/ariszlo/hunky.html http://sourceforge.net/projects/hunkyfonts" -PACKAGE_ARCH = "all" -PR = "r5" +LICENSE = "LGPL" +PR = "r6" SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}-r4.tar.bz2" S = "${WORKDIR}/${PN}" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} - -require qpf.inc diff --git a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb index 22948c5475..f06599f9eb 100644 --- a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb +++ b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb @@ -1,20 +1,10 @@ +require qpf.inc + DESCRIPTION = "Hunky Serif font - QPF Edition" -SECTION = "opie/fonts" -PRIORITY = "optional" -LICENSE = "LGPL" HOMEPAGE = "http://www.yoper.com/ariszlo/hunky.html http://sourceforge.net/projects/hunkyfonts" -PACKAGE_ARCH = "all" -PR = "r5" +LICENSE = "LGPL" +PR = "r6" SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}-r4.tar.bz2" S = "${WORKDIR}/${PN}" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} - -require qpf.inc diff --git a/packages/qpf-fonts/qpf-qte_2.3.10.bb b/packages/qpf-fonts/qpf-qte_2.3.10.bb index 7cc4789c4a..a1a589f003 100644 --- a/packages/qpf-fonts/qpf-qte_2.3.10.bb +++ b/packages/qpf-fonts/qpf-qte_2.3.10.bb @@ -1,9 +1,9 @@ -DESCRIPTION = "Qt/Embedded Fonts Version ${PV}" -SECTION = "opie/fonts" -PRIORITY = "optional" -LICENSE = "GPL QPL" +require qpf.inc + +DESCRIPTION = "Qt/Embedded fonts version ${PV}" HOMEPAGE = "http://www.trolltech.com" -PR = "r1" +LICENSE = "GPL QPL" +PR = "r2" PROVIDES = "qte-font-helvetica-100 qte-font-helvetica-120" PROVIDES += "qte-font-fixed-70 qte-font-fixed-120" @@ -26,8 +26,6 @@ RPROVIDES_qte-font-japanese += "virtual/japanese-font" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz" S = "${WORKDIR}/qt-${PV}" -require qpf.inc - QPF_PKGPATTERN = "qte-font-%s" QPF_DESCRIPTION = "Qt/E font %s" diff --git a/packages/qpf-fonts/qpf-qte_3.3.5.bb b/packages/qpf-fonts/qpf-qte_3.3.5.bb new file mode 100644 index 0000000000..6ac091f29d --- /dev/null +++ b/packages/qpf-fonts/qpf-qte_3.3.5.bb @@ -0,0 +1,57 @@ +require qpf.inc + +DESCRIPTION = "Qt/Embedded fonts version ${PV}" +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL QPL" +PR = "r6" + +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2" +S = "${WORKDIR}/qt-embedded-free-${PV}" + +do_compile() { + : +} + +do_install() { + mkdir -p ${D}${sbindir} + mkdir -p ${D}${palmtopdir}/lib/fonts + cp -pPR lib/fonts/* ${D}${palmtopdir}/lib/fonts + # Delete all other font formats, Qt/E would have a dead slow + # application start time if it had to use any other font format + # as *.qpf ... + find ${D}${palmtopdir}/lib/fonts \ + -name "*.bdf" \ + -o -name "*.ttf" \ + -o -name "*.pfa" \ + -o -name "*.pfb" | xargs rm +} + +PACKAGES = "qte-font-fixed" +PROVIDES += "qte-font-fixed" +FILES_qte-font-fixed = "${palmtopdir}/lib/fonts/fixed*" + +PACKAGES += "qte-font-helvetica-small" +PROVIDES += "qte-font-helvetica-small" +FILES_qte-font-helvetica-small = "${palmtopdir}/lib/fonts/helvetica_80*.qpf \ + ${palmtopdir}/lib/fonts/helvetica_100*.qpf ${palmtopdir}/lib/fonts/helvetica_120*.qpf" + +PACKAGES += "qte-font-helvetica-large" +PROVIDES += "qte-font-helvetica-large" +FILES_qte-font-helvetica-large = "${palmtopdir}/lib/fonts/helvetica_140*.qpf \ + ${palmtopdir}/lib/fonts/helvetica_180*.qpf ${palmtopdir}/lib/fonts/helvetica_240*.qpf" + +PACKAGES += "qte-font-smoothtimes" +PROVIDES += "qte-font-smoothtimes" +FILES_qte-font-smoothtimes = "${palmtopdir}/lib/fonts/smoothtimes*" + +PACKAGES += "qte-font-smallsmooth" +PROVIDES += "qte-font-smallsmooth" +FILES_qte-font-smallsmooth = "${palmtopdir}/lib/fonts/smallsmooth*" + +PACKAGES += "qte-font-unicode" +PROVIDES += "qte-font-unicode" +FILES_qte-font-unicode = "${palmtopdir}/lib/fonts/unifont*.qpf" + +PACKAGES += "qte-font-micro" +PROVIDES += "qte-font-micro" +FILES_qte-font-micro = "${palmtopdir}/lib/fonts/micro*.qpf" diff --git a/packages/qpf-fonts/qpf-terminus.bb b/packages/qpf-fonts/qpf-terminus.bb index 868dd74e0d..7e8bbfe393 100644 --- a/packages/qpf-fonts/qpf-terminus.bb +++ b/packages/qpf-fonts/qpf-terminus.bb @@ -1,18 +1,10 @@ +require qpf.inc + DESCRIPTION = "Qt/Embedded terminus font" HOMEPAGE = "http://www.is-vn.bg/hamster/jimmy-en.html" -SECTION = "opie/fonts" -PRIORITY = "optional" LICENSE = "GPL" -PACKAGE_ARCH = "all" -PR = "r2" +PR = "r3" #SRC_URI = "http://www.mn-solutions.de/downloads/mnci/terminus-fonts.tar.bz2" -> 404 error SRC_URI = "http://openzaurus.linuxtogo.org/download/3.5.4/sources/terminus-fonts.tar.bz2" S = "${WORKDIR}/terminus-fonts" - -do_install() { - mkdir -p ${D}${palmqtdir}/lib/fonts - cp *.qpf ${D}${palmqtdir}/lib/fonts -} - -require qpf.inc diff --git a/packages/qpf-fonts/qpf-unifont_1.0.bb b/packages/qpf-fonts/qpf-unifont_1.0.bb index 14a63783c2..e91e762845 100644 --- a/packages/qpf-fonts/qpf-unifont_1.0.bb +++ b/packages/qpf-fonts/qpf-unifont_1.0.bb @@ -1,19 +1,9 @@ +require qpf.inc + DESCRIPTION = "Unicode fonts - QPF Edition" LICENSE = "GPL QPL" -SECTION = "opie/fonts" -PRIORITY = "optional" RPROVIDES = "virtual/japanese-font" -PACKAGE_ARCH = "all" -PR = "r1" +PR = "r2" SRC_URI = "http://www.openzaurus.org/mirror/qpf-unifont.tar.bz2" S = "${WORKDIR}" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} - -require qpf.inc diff --git a/packages/qpf-fonts/qpf-unismall_1.0.0.bb b/packages/qpf-fonts/qpf-unismall_1.0.0.bb index 62d84225ff..6298e2dfc4 100644 --- a/packages/qpf-fonts/qpf-unismall_1.0.0.bb +++ b/packages/qpf-fonts/qpf-unismall_1.0.0.bb @@ -1,26 +1,11 @@ +require qpf.inc + DESCRIPTION = "Lightweight Japanese font in 10 point suitable for 320x240 display" -SECTION = "opie/fonts" -PRIORITY = "optional" -LICENSE = "GPL" HOMEPAGE = "http://sourceforge.jp/projects/zaurus-ja/" +LICENSE = "GPL" RPROVIDES = "virtual/japanese-font" -PR = "r3" +PR = "r4" SRC_URI = "http://osdn.dl.sourceforge.jp/zaurus-ja/773/unismall-${PV}.tar.gz" S = "${WORKDIR}" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - cd unismall* - for i in *_100_*.qpf; do - ln -sf $i $(echo $i | sed 's/_100_/_160_/') - done - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} - -require qpf.inc - -PACKAGE_ARCH = "all" diff --git a/packages/qpf-fonts/qpf-utopia_1.0.bb b/packages/qpf-fonts/qpf-utopia_1.0.bb index 148af3a758..eaee2d07a4 100644 --- a/packages/qpf-fonts/qpf-utopia_1.0.bb +++ b/packages/qpf-fonts/qpf-utopia_1.0.bb @@ -1,19 +1,9 @@ +require qpf.inc + DESCRIPTION = "Utopia fonts - QPF Edition" -SECTION = "opie/fonts" -PRIORITY = "optional" -LICENSE = "GPL QPL" HOMEPAGE = "http://www.pobox.sk/~mico/zaurus.html" -PACKAGE_ARCH = "all" -PR = "r1" +LICENSE = "GPL QPL" +PR = "r2" SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-utopia.tar.bz2" S = "${WORKDIR}/utopia" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} - -require qpf.inc diff --git a/packages/qpf-fonts/qpf.inc b/packages/qpf-fonts/qpf.inc index 7597b436be..97e66587d2 100644 --- a/packages/qpf-fonts/qpf.inc +++ b/packages/qpf-fonts/qpf.inc @@ -1,4 +1,4 @@ -RDEPENDS = "font-update-common qte-fonts-common" +RDEPENDS = "font-update-common qpf-font-common" do_configure() { : diff --git a/packages/qpf-fonts/qte-fonts-common/.mtn2git_empty b/packages/qpf-fonts/qte-fonts-common/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/qpf-fonts/qte-fonts-common/update-qtfontdir b/packages/qpf-fonts/qte-fonts-common/update-qtfontdir deleted file mode 100755 index 857dc6c0d5..0000000000 --- a/packages/qpf-fonts/qte-fonts-common/update-qtfontdir +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh - -usage() -{ - echo "usage: $0 [font directory, defaults to \$QTDIR/lib/fonts]" - exit 1 -} - -setVar() -{ - eval "$1='$2'" -} - -getVar() -{ - eval "echo \$$1" -} - -handleQPF() -{ - base=`basename $1` - family=`echo $base|cut -d_ -f1` - pt=`echo $base|cut -d_ -f2` - weight=`echo $base|cut -d_ -f3|sed -e 's,i$,,'` - if (echo $base|cut -d_ -f3|grep -q 'i$'); then - italic="y" - else - italic="n" - fi - echo "$family $base.qpf QPF $italic $weight $pt u" -} - -if [ "$1" = "-f" ]; then - FORCE=1 - shift -else - FORCE=0 -fi - -if [ -z "$1" ]; then - if [ -n "$QTDIR" ]; then - fontdir=$QTDIR/lib/fonts - else - fontdir=/opt/QtPalmtop/lib/fonts - fi -else - fontdir=$1 -fi - -if ! [ -d $fontdir ]; then - echo Error: $fontdir not a directory - exit 1 -fi - -if [ -e $fontdir/fontdir ]; then - if find $fontdir -newer $fontdir/fontdir | grep -q "\(qpf\|ttf\)"; then - #echo "fontdir needs updating..." - : - elif [ "$FORCE" = "0" ]; then - #echo "fontdir already up to date - exiting" - exit 0 - fi - cat $fontdir/fontdir | grep -v '\.qpf' > $fontdir/fontdir.new -fi - -( - for file in `ls $fontdir/*.qpf 2>/dev/null |sed -e's,\.qpf$,,; s,_t[^_]*$,,;'|sort -u`; do - handleQPF $file - done -) >> $fontdir/fontdir.new - -mv $fontdir/fontdir.new $fontdir/fontdir - -exit 0 diff --git a/packages/qpf-fonts/qte-fonts-common_3.3.5.bb b/packages/qpf-fonts/qte-fonts-common_3.3.5.bb deleted file mode 100644 index 02d0663c3e..0000000000 --- a/packages/qpf-fonts/qte-fonts-common_3.3.5.bb +++ /dev/null @@ -1,231 +0,0 @@ -DESCRIPTION= "Tools to update the Qt fontdir" -HOMEPAGE = "http://www.trolltech.com" -SECTION = "opie/base" -LICENSE = "GPL QPL" -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" - -S = "${WORKDIR}/qt-embedded-free-${PV}" - -do_compile() { - : -} - -do_install() { - mkdir -p ${D}${sbindir} - install -m 755 ${WORKDIR}/update-qtfontdir ${D}${sbindir} - mkdir -p ${D}${palmtopdir}/lib/fonts - cp -pPR lib/fonts/* ${D}${palmtopdir}/lib/fonts - # Delete all other font formats, Qt/E would have a dead slow - # application start time if it had to use any other font format - # as *.qpf ... - find ${D}${palmtopdir}/lib/fonts \ - -name "*.bdf" \ - -o -name "*.ttf" \ - -o -name "*.pfa" \ - -o -name "*.pfb" | xargs rm -} - -PACKAGES = "qte-fonts-common" -FILES_${PN} = "${sbindir}" - -PACKAGES += "qte-font-fixed" -PROVIDES += "qte-font-fixed" -FILES_qte-font-fixed = "${palmtopdir}/lib/fonts/fixed*" -RDEPENDS_qte-font-fixed = "qte-fonts-common" -pkg_postinst_qte-font-fixed() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} -pkg_postrm_qte-font-fixed() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -f -} - -PACKAGES += "qte-font-helvetica-small" -PROVIDES += "qte-font-helvetica-small" -FILES_qte-font-helvetica-small = "${palmtopdir}/lib/fonts/helvetica_80*.qpf \ - ${palmtopdir}/lib/fonts/helvetica_100*.qpf ${palmtopdir}/lib/fonts/helvetica_120*.qpf" -RDEPENDS_qte-font-helvetica-small = "qte-fonts-common" -pkg_postinst_qte-font-helvetica-small() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} -pkg_postrm_qte-font-helvetica-small() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -f -} - -PACKAGES += "qte-font-helvetica-large" -PROVIDES += "qte-font-helvetica-large" -FILES_qte-font-helvetica-large = "${palmtopdir}/lib/fonts/helvetica_140*.qpf \ - ${palmtopdir}/lib/fonts/helvetica_180*.qpf ${palmtopdir}/lib/fonts/helvetica_240*.qpf" -RDEPENDS_qte-font-helvetica-large = "qte-fonts-common" -pkg_postinst_qte-font-helvetica-large() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} -pkg_postrm_qte-font-helvetica-large() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -f -} - -PACKAGES += "qte-font-smoothtimes" -PROVIDES += "qte-font-smoothtimes" -FILES_qte-font-smoothtimes = "${palmtopdir}/lib/fonts/smoothtimes*" -RDEPENDS_qte-font-smoothtimes = "qte-fonts-common" -pkg_postinst_qte-font-smoothtimes() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} -pkg_postrm_qte-font-smoothtimes() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -f -} - -PACKAGES += "qte-font-smallsmooth" -PROVIDES += "qte-font-smallsmooth" -FILES_qte-font-smallsmooth = "${palmtopdir}/lib/fonts/smallsmooth*" -RDEPENDS_qte-smallsmooth = "qte-fonts-common" -pkg_postinst_qte-font-smallsmooth() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} -pkg_postrm_qte-font-smallsmooth() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -f -} - -PACKAGES += "qte-font-unicode" -PROVIDES += "qte-font-unicode" -FILES_qte-font-unicode = "${palmtopdir}/lib/fonts/unifont*.qpf" -RDEPENDS_qte-font-unicode = "qte-fonts-common" -pkg_postinst_qte-font-unicode() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} -pkg_postrm_qte-font-unicode() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -f -} - -PACKAGES += "qte-font-micro" -PROVIDES += "qte-font-micro" -FILES_qte-font-micro = "${palmtopdir}/lib/fonts/micro*.qpf" -#RDEPENDS_qte-font-micro = "qte-fonts-common" -pkg_postinst_qte-font-micro() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -} -pkg_postrm_qte-font-micro() { -#!/bin/sh -if [ -n "$D" ]; then exit 1; fi -set -e -. /etc/profile -${sbindir}/update-qtfontdir -f -} - -# Not in the QtE/3 tar file: -#PACKAGES += "qte-font-lcd" -#PROVIDES += "qte-font-lcd" -#RDEPENDS_qte-font-lcd = "qte-fonts-common" -#FILES_qte-font-lcd = "${palmtopdir}/lib/fonts/lcd*" -#pkg_postinst_qte-font-lcd () { -##!/bin/sh -#if [ -n "$D" ]; then exit 1; fi -#set -e -#. /etc/profile -#${sbindir}/update-qtfontdir -#} -#pkg_postrm_qte-font-lcd() { -##!/bin/sh -#if [ -n "$D" ]; then exit 1; fi -#set -e -#. /etc/profile -#${sbindir}/update-qtfontdir -f -#} - -# Not in the QtE/3 tar file: -#PACKAGES += "qte-font-japanese" -#PROVIDES += "qte-font-japanese" -#FILES_qte-font-japanese = "${palmtopdir}/lib/fonts/japanese*" -#RDEPENDS_qte-font-japanese = "qte-fonts-common" -#pkg_postinst_qte-font-japanese() { -##!/bin/sh -#if [ -n "$D" ]; then exit 1; fi -#set -e -#. /etc/profile -#${sbindir}/update-qtfontdir -#} -#pkg_postrm_qte-font-japanese() { -##!/bin/sh -#if [ -n "$D" ]; then exit 1; fi -#set -e -#. /etc/profile -#${sbindir}/update-qtfontdir -f -#} - -# Not in the QtE/3 tar file: -#PACKAGES += "qte-font-courier" -#PROVIDES += "qte-font-courier" -#FILES_qte-font-courier = "${palmtopdir}/lib/fonts/cour*" -#RDEPENDS_qte-font-courier = "qte-fonts-common" -#pkg_postinst_qte-font-courier() { -##!/bin/sh -#if [ -n "$D" ]; then exit 1; fi -#set -e -#. /etc/profile -#${sbindir}/update-qtfontdir -#} -#pkg_postrm_qte-font-courier() { -##!/bin/sh -#if [ -n "$D" ]; then exit 1; fi -#set -e -#. /etc/profile -#${sbindir}/update-qtfontdir -f -#} - -PACKAGE_ARCH = "all" -- cgit 1.2.3-korg