| author | kergoth <kergoth> | 2003-04-23 05:37:14 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2003-04-23 05:37:14 (UTC) |
| commit | 2b7ee2f7df2f79bc016dd8185e314a3f5df1b07e (patch) (side-by-side diff) | |
| tree | 6846f743352243d86fa88fd85f86d2c3dbc2975c | |
| parent | 27af46124e121bcd87b690f9fd5a28e5766b647f (diff) | |
| download | opie-2b7ee2f7df2f79bc016dd8185e314a3f5df1b07e.zip opie-2b7ee2f7df2f79bc016dd8185e314a3f5df1b07e.tar.gz opie-2b7ee2f7df2f79bc016dd8185e314a3f5df1b07e.tar.bz2 | |
Update fontdir tool to default to /opt/QtPalmtop, and update postinsts on the font packages to source /etc/profile prior to attempting to execute update-qtfontdir, which isnt necessarily in the path at the time of execution.
| -rwxr-xr-x | qt/control/qpf-cyberbit-120-50-t10.postinst | 2 | ||||
| -rwxr-xr-x | qt/control/qpf-fixed.postinst | 2 | ||||
| -rwxr-xr-x | qt/control/qpf-helvetica.postinst | 2 | ||||
| -rwxr-xr-x | qt/control/qpf-micro.postinst | 2 | ||||
| -rwxr-xr-x | qt/control/qpf-smallsmooth.postinst | 2 | ||||
| -rwxr-xr-x | qt/control/qpf-smoothtimes.postinst | 2 | ||||
| -rw-r--r-- | qt/qte234-for-opie091-fontdir.patch | 2 |
7 files changed, 13 insertions, 1 deletions
diff --git a/qt/control/qpf-cyberbit-120-50-t10.postinst b/qt/control/qpf-cyberbit-120-50-t10.postinst index 30336ce..9671d9a 100755 --- a/qt/control/qpf-cyberbit-120-50-t10.postinst +++ b/qt/control/qpf-cyberbit-120-50-t10.postinst @@ -1,9 +1,11 @@ #!/bin/sh set -e if [ "$1" != "configure" ]; then exit 0 fi +. /etc/profile + update-qtfontdir diff --git a/qt/control/qpf-fixed.postinst b/qt/control/qpf-fixed.postinst index 30336ce..9671d9a 100755 --- a/qt/control/qpf-fixed.postinst +++ b/qt/control/qpf-fixed.postinst @@ -1,9 +1,11 @@ #!/bin/sh set -e if [ "$1" != "configure" ]; then exit 0 fi +. /etc/profile + update-qtfontdir diff --git a/qt/control/qpf-helvetica.postinst b/qt/control/qpf-helvetica.postinst index 30336ce..9671d9a 100755 --- a/qt/control/qpf-helvetica.postinst +++ b/qt/control/qpf-helvetica.postinst @@ -1,9 +1,11 @@ #!/bin/sh set -e if [ "$1" != "configure" ]; then exit 0 fi +. /etc/profile + update-qtfontdir diff --git a/qt/control/qpf-micro.postinst b/qt/control/qpf-micro.postinst index 30336ce..9671d9a 100755 --- a/qt/control/qpf-micro.postinst +++ b/qt/control/qpf-micro.postinst @@ -1,9 +1,11 @@ #!/bin/sh set -e if [ "$1" != "configure" ]; then exit 0 fi +. /etc/profile + update-qtfontdir diff --git a/qt/control/qpf-smallsmooth.postinst b/qt/control/qpf-smallsmooth.postinst index 30336ce..9671d9a 100755 --- a/qt/control/qpf-smallsmooth.postinst +++ b/qt/control/qpf-smallsmooth.postinst @@ -1,9 +1,11 @@ #!/bin/sh set -e if [ "$1" != "configure" ]; then exit 0 fi +. /etc/profile + update-qtfontdir diff --git a/qt/control/qpf-smoothtimes.postinst b/qt/control/qpf-smoothtimes.postinst index 30336ce..9671d9a 100755 --- a/qt/control/qpf-smoothtimes.postinst +++ b/qt/control/qpf-smoothtimes.postinst @@ -1,9 +1,11 @@ #!/bin/sh set -e if [ "$1" != "configure" ]; then exit 0 fi +. /etc/profile + update-qtfontdir diff --git a/qt/qte234-for-opie091-fontdir.patch b/qt/qte234-for-opie091-fontdir.patch index a765d44..3b3daf4 100644 --- a/qt/qte234-for-opie091-fontdir.patch +++ b/qt/qte234-for-opie091-fontdir.patch @@ -24,33 +24,33 @@ + 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 ++ 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 + 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 |