summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/openzaurus-3.5.3.conf11
-rw-r--r--packages/meta/opie-kdepim-image.bb11
-rw-r--r--packages/qpf-fonts/files/update-qtfontdir70
-rw-r--r--packages/qpf-fonts/qpf-font-common_1.0.bb2
-rw-r--r--packages/qte-fonts-common/qte-fonts-common/update-qtfontdir70
-rw-r--r--packages/qte-fonts-common/qte-fonts-common_3.3.3.bb2
6 files changed, 149 insertions, 17 deletions
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index 4fa56f2ba6..e8ed0209e1 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -1,10 +1,8 @@
include conf/distro/openzaurus.conf
DISTRO = "openzaurus"
DISTRO_NAME = "OpenZaurus"
-DISTRO_VERSION = "3.5.2-snapshot-${DATE}"
-# DISTRO_VERSION = "3.5.3"
-DISTRO_TYPE = "debug"
-# DISTRO_TYPE = "release"
+DISTRO_VERSION = "3.5.3"
+DISTRO_TYPE = "release"
FEED_URIS += " \
upgrades##http://openzaurus.org/official/unstable/3.5.3/upgrades/ \
@@ -13,7 +11,7 @@ FEED_URIS += " \
console##http://openzaurus.org/official/unstable/3.5.3/feed/console \
devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel"
-CVSDATE = "20050331"
+CVSDATE = "20050403"
#
# Zaurus
@@ -21,7 +19,7 @@ CVSDATE = "20050331"
ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
OEINCLUDELOGS = "yes"
-KERNEL_CONSOLE = "tty1"
+KERNEL_CONSOLE = "ttyS0"
#DEBUG_OPTIMIZATION = "-O -g3"
#DEBUG_BUILD = "1"
#INHIBIT_PACKAGE_STRIP = "1"
@@ -31,6 +29,7 @@ KERNEL_CONSOLE = "tty1"
#
PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
+PREFERRED_VERSION_ipkg-native = "0.99.144"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
diff --git a/packages/meta/opie-kdepim-image.bb b/packages/meta/opie-kdepim-image.bb
index c3c84af26c..380ba70346 100644
--- a/packages/meta/opie-kdepim-image.bb
+++ b/packages/meta/opie-kdepim-image.bb
@@ -1,6 +1,6 @@
+include opie-image.bb
+
export IMAGE_BASENAME = "opie-kdepim-image"
-export IMAGE_LINGUAS = ""
-include opie-collections.inc
#
# Putting it altogether. Better state IPKG_INSTALL and DEPENDS twice, because library names != package names.
@@ -16,10 +16,3 @@ DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPENDS} ${OPIE_BASE} ${OPIE_BASE_APPLETS}
${OPIE_BASE_SETTINGS} ${OPIE_BASE_APPS} ${OPIE_BASE_DEPENDS} ${KDE_PIM_DEPENDS} \
${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS} \
${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} ${OPIE_BASE_INPUTMETHODS}"
-
-
-# zap the root password
-#IMAGE_POSTPROCESS_COMMAND = "zap_root_password"
-
-inherit image_ipk
-LICENSE = MIT
diff --git a/packages/qpf-fonts/files/update-qtfontdir b/packages/qpf-fonts/files/update-qtfontdir
index e69de29bb2..788c0b307d 100644
--- a/packages/qpf-fonts/files/update-qtfontdir
+++ b/packages/qpf-fonts/files/update-qtfontdir
@@ -0,0 +1,70 @@
+#!/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 [ -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 "\(qpf\|ttf\)"; then
+ echo "fontdir needs updating..."
+ else
+ echo "fontdir already up to date - exiting"
+ exit 0
+ fi
+ cat $fontdir/fontdir | grep -v '\.qpf' > $fontdir/fontdir.new
+else
+ echo "fontdir not existing. creating..."
+fi
+
+(
+ for file in `ls $fontdir/*.qpf|sed -e's,\.qpf$,,; s,_t[^_]*$,,;'|sort -u`; do
+ handleQPF $file
+ done
+) >> $fontdir/fontdir.new
+
+mv $fontdir/fontdir.new $fontdir/fontdir
+
+exit 0
+
+# vim:ai:et:sts=4:sw=4:tw=0:
diff --git a/packages/qpf-fonts/qpf-font-common_1.0.bb b/packages/qpf-fonts/qpf-font-common_1.0.bb
index f06ea7a76a..c3801c27ce 100644
--- a/packages/qpf-fonts/qpf-font-common_1.0.bb
+++ b/packages/qpf-fonts/qpf-font-common_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "opie/fonts"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL QPL"
-PR = "r0"
+PR = "r1"
SRC_URI = "file://update-qtfontdir"
S = "${WORKDIR}/qt-${PV}"
diff --git a/packages/qte-fonts-common/qte-fonts-common/update-qtfontdir b/packages/qte-fonts-common/qte-fonts-common/update-qtfontdir
index e69de29bb2..788c0b307d 100644
--- a/packages/qte-fonts-common/qte-fonts-common/update-qtfontdir
+++ b/packages/qte-fonts-common/qte-fonts-common/update-qtfontdir
@@ -0,0 +1,70 @@
+#!/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 [ -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 "\(qpf\|ttf\)"; then
+ echo "fontdir needs updating..."
+ else
+ echo "fontdir already up to date - exiting"
+ exit 0
+ fi
+ cat $fontdir/fontdir | grep -v '\.qpf' > $fontdir/fontdir.new
+else
+ echo "fontdir not existing. creating..."
+fi
+
+(
+ for file in `ls $fontdir/*.qpf|sed -e's,\.qpf$,,; s,_t[^_]*$,,;'|sort -u`; do
+ handleQPF $file
+ done
+) >> $fontdir/fontdir.new
+
+mv $fontdir/fontdir.new $fontdir/fontdir
+
+exit 0
+
+# vim:ai:et:sts=4:sw=4:tw=0:
diff --git a/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb b/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb
index 1cda5ac913..803d6923be 100644
--- a/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb
+++ b/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb
@@ -3,7 +3,7 @@ DESCRIPTION= "Tools to update the Qt fontdir"
MAINTAINER = "M&N Solutions <info@mn-solutions.de>"
LICENSE = "GPL/QPL"
PACKAGE_ARCH = "all"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.gz"
SRC_URI += "file://update-qtfontdir"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 23:02:38 +0000