2 files changed, 66 insertions, 1 deletions
diff --git a/qt/control/qte-fonts.control b/qt/control/qte-fonts.control
index e1b14ff..0f7164a 100644
--- a/qt/control/qte-fonts.control
+++ b/qt/control/qte-fonts.control
@@ -1,4 +1,4 @@
-Files: $QTDIR/lib/fonts/helvetica_*_{50,50i,75,75i}.* $QTDIR/lib/fonts/helvetica_*_t*5* $QTDIR/lib/fonts/fixed_*_50.* $QTDIR/lib/fonts/fixed_*_t*5* $QTDIR/lib/fonts/micro_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smallsmooth_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smoothtimes_{170,100}_{50,50_t15,50_t5}.* $QTDIR/lib/fonts/fontdir $QTDIR/lib/fonts/helvetica_*t10* $QTDIR/lib/fonts/fixed_*t10* $QTDIR/lib/fonts/micro_*t10* $QTDIR/lib/fonts/smallsmooth_*t10* $QTDIR/lib/fonts/smoothtimes_{170,100}_50*t10*
+Files: $QTDIR/lib/fonts/helvetica_*_{50,50i,75,75i}.* $QTDIR/lib/fonts/helvetica_*_t*5* $QTDIR/lib/fonts/fixed_*_50.* $QTDIR/lib/fonts/fixed_*_t*5* $QTDIR/lib/fonts/micro_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smallsmooth_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smoothtimes_{170,100}_{50,50_t15,50_t5}.* $QTDIR/lib/fonts/fontdir $QTDIR/lib/fonts/helvetica_*t10* $QTDIR/lib/fonts/fixed_*t10* $QTDIR/lib/fonts/micro_*t10* $QTDIR/lib/fonts/smallsmooth_*t10* $QTDIR/lib/fonts/smoothtimes_{170,100}_50*t10* $QTDIR/bin/update-qtfontdir
 Priority: required
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
diff --git a/qt/qte234-for-opie091-fontdir.patch b/qt/qte234-for-opie091-fontdir.patch
new file mode 100644
index 0000000..4db7df2
--- a/dev/null
+++ b/qt/qte234-for-opie091-fontdir.patch
@@ -0,0 +1,65 @@
+        --- /dev/null2003-01-17 15:37:44.000000000 -0600
+        +++ qt-2.3.5/bin/update-qtfontdir2003-04-22 00:37:07.000000000 -0500
+@@ -0,0 +1,62 @@
+#!/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
+        usage
+    fi
+else
+    fontdir=$1
+fi
+    
+if ! [ -d $fontdir ]; then
+    echo Error: $fontdir not a directory
+    exit 1
+fi
+
+if [ -e $fontdir/fontdir ]; then
+    cat $fontdir/fontdir | grep -v '\.qpf' > $fontdir/fontdir.new
+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/qt/control/qte-fonts.control b/qt/control/qte-fonts.control index e1b14ff..0f7164a 100644 --- a/qt/control/qte-fonts.control +++ b/qt/control/qte-fonts.control
@@ -1,4 +1,4 @@
1	Files: $QTDIR/lib/fonts/helvetica__{50,50i,75,75i}. $QTDIR/lib/fonts/helvetica__t5* $QTDIR/lib/fonts/fixed__50. $QTDIR/lib/fonts/fixed__t5* $QTDIR/lib/fonts/micro_{50,50_t15,50_t5}. $QTDIR/lib/fonts/smallsmooth_{50,50_t15,50_t5}. $QTDIR/lib/fonts/smoothtimes_{170,100}_{50,50_t15,50_t5}.* $QTDIR/lib/fonts/fontdir $QTDIR/lib/fonts/helvetica_t10 $QTDIR/lib/fonts/fixed_t10 $QTDIR/lib/fonts/micro_t10 $QTDIR/lib/fonts/smallsmooth_t10 $QTDIR/lib/fonts/smoothtimes_{170,100}_50t10	1	Files: $QTDIR/lib/fonts/helvetica__{50,50i,75,75i}. $QTDIR/lib/fonts/helvetica__t5* $QTDIR/lib/fonts/fixed__50. $QTDIR/lib/fonts/fixed__t5* $QTDIR/lib/fonts/micro_{50,50_t15,50_t5}. $QTDIR/lib/fonts/smallsmooth_{50,50_t15,50_t5}. $QTDIR/lib/fonts/smoothtimes_{170,100}_{50,50_t15,50_t5}.* $QTDIR/lib/fonts/fontdir $QTDIR/lib/fonts/helvetica_t10 $QTDIR/lib/fonts/fixed_t10 $QTDIR/lib/fonts/micro_t10 $QTDIR/lib/fonts/smallsmooth_t10 $QTDIR/lib/fonts/smoothtimes_{170,100}_50t10 $QTDIR/bin/update-qtfontdir
2	Priority: required	2	Priority: required
3	Section: opie/system	3	Section: opie/system
4	Maintainer: Opie Team <opie@handhelds.org>	4	Maintainer: Opie Team <opie@handhelds.org>


diff --git a/qt/qte234-for-opie091-fontdir.patch b/qt/qte234-for-opie091-fontdir.patch new file mode 100644 index 0000000..4db7df2 --- a/dev/null +++ b/qt/qte234-for-opie091-fontdir.patch
@@ -0,0 +1,65 @@
		1	--- /dev/null2003-01-17 15:37:44.000000000 -0600
		2	+++ qt-2.3.5/bin/update-qtfontdir2003-04-22 00:37:07.000000000 -0500
		3	@@ -0,0 +1,62 @@
		4	+#!/bin/sh
		5	+
		6	+usage()
		7	+{
		8	+ echo "usage: $0 [font directory, defaults to QTDIR/lib/fonts]"
		9	+ exit 1
		10	+}
		11	+
		12	+setVar()
		13	+{
		14	+ eval "$1='$2'"
		15	+}
		16	+
		17	+getVar()
		18	+{
		19	+ eval "echo \$$1"
		20	+}
		21	+
		22	+handleQPF()
		23	+{
		24	+ base=`basename $1`
		25	+ family=`echo $base\|cut -d_ -f1`
		26	+ pt=`echo $base\|cut -d_ -f2`
		27	+ weight=`echo $base\|cut -d_ -f3\|sed -e 's,i$,,'`
		28	+ if (echo $base\|cut -d_ -f3\|grep -q 'i$'); then
		29	+ italic="y"
		30	+ else
		31	+ italic="n"
		32	+ fi
		33	+ echo "$family $base.qpf QPF $italic $weight $pt u"
		34	+}
		35	+
		36	+if [ -z "$1" ]; then
		37	+ if [ -n "$QTDIR" ]; then
		38	+ fontdir=$QTDIR/lib/fonts
		39	+ else
		40	+ usage
		41	+ fi
		42	+else
		43	+ fontdir=$1
		44	+fi
		45	+
		46	+if ! [ -d $fontdir ]; then
		47	+ echo Error: $fontdir not a directory
		48	+ exit 1
		49	+fi
		50	+
		51	+if [ -e $fontdir/fontdir ]; then
		52	+ cat $fontdir/fontdir \| grep -v '\.qpf' > $fontdir/fontdir.new
		53	+fi
		54	+
		55	+(
		56	+ for file in `ls $fontdir/.qpf\|sed -e's,\.qpf$,,; s,_t[^_]$,,;'\|sort -u`; do
		57	+ handleQPF $file
		58	+ done
		59	+) >> $fontdir/fontdir.new
		60	+
		61	+mv $fontdir/fontdir.new $fontdir/fontdir
		62	+
		63	+exit 0
		64	+
		65	+# vim:ai:et:sts=4:sw=4:tw=0: