| author | kergoth <kergoth> | 2003-01-26 19:46:41 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2003-01-26 19:46:41 (UTC) |
| commit | f389dd4e3d5ceacb15b5c0b751a618d7586d6c31 (patch) (side-by-side diff) | |
| tree | 4409bbfaee1f3467ccebef0d1ebbd20ba949bad0 | |
| parent | fcc5341e8eaef9586cb7fd2b40a22198de0d196d (diff) | |
| download | opie-f389dd4e3d5ceacb15b5c0b751a618d7586d6c31.zip opie-f389dd4e3d5ceacb15b5c0b751a618d7586d6c31.tar.gz opie-f389dd4e3d5ceacb15b5c0b751a618d7586d6c31.tar.bz2 | |
Rather hackish, but necessary, bits. mkipks now parses the qglobal header from $QTDIR to obtain both the base qt version and the full version string, thereby letting me use ipkg depends to Depends: libqt2-emb (>= 2.3.4-beta4).
| -rwxr-xr-x | mkipks | 20 | ||||
| -rw-r--r-- | qt/libqt2-emb-fonts.control | 2 | ||||
| -rw-r--r-- | qt/libqt2-emb.control | 2 |
3 files changed, 20 insertions, 4 deletions
@@ -1,68 +1,84 @@ #!/bin/sh -[ -z "$QTE_VERSION" ] && QTE_VERSION=2.3.4 -[ -z "$QTE_BASEVERSION" ] && QTE_BASEVERSION=2.3.4 +if [ -z "$QTE_BASEVERSION" ] +then + if [ -e $QTDIR/include/qglobal.h ] + then + QTE_BASEVERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION'|grep -v STR|sed -e 's,#define QT_VERSION\t*,,;' -e 's,.*\([0-9]\)\([0-9]\)\([0-9]\).*,\1.\2.\3,;'` + else + QTE_BASEVERSION=2.3.4 + fi +fi +if [ -z "$QTE_VERSION" ] +then + if [ -e $QTDIR/include/qglobal.h ] + then + QTE_VERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION_STR'|sed -e 's,#define QT_VERSION_STR\t*,,;' -e 's,.*"\([^"]*\)".*,\1,;'` + else + QTE_VERSION=2.3.4 + fi +fi [ -z "$QTE_REVISION" ] && QTE_REVISION=3 DEB_VERSION=2.0 # Have to do this here, since CVS can't store symlinks mkdir -p $OPIEDIR/etc/rcS.d ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h) SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h) if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h then [ -z "$VERSION_CVS" ] && VERSION_CVS="$(date +%Y%m%d)" SUB_VERSION=$VERSION_CVS else VERSION_CVS="" fi QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT ARCH=arm STRIP=arm-linux-strip STRIP_FILES="*ARM*not stripped" TDIR=/tmp/ipk$$ DATADIR=$TDIR CTRLDIR=$TDIR/CONTROL IMAGEDIR= VERB= LIST= RPM= while [ $# -ne 0 ] do case "$1" in -v) VERB=1 echo >&2 "Packaging for version $VERSION_MAJ.$VERSION_MIN.$VERSION_PAT$VERSION_CVS" ;; -l) LIST=1 ;; -i) shift IMAGEDIR=$1 DATADIR=$IMAGEDIR mkdir -p $IMAGEDIR ;; -classic) classicopts=-c ;; -rpm) if [ "$OPIEDIR" != "/opt/Qtopia" ] then echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.' sleep 1 #exit 1 fi RPM=1 ;; -arch) shift ARCH=$1 STRIP= STRIP_FILES= ;; /*) diff --git a/qt/libqt2-emb-fonts.control b/qt/libqt2-emb-fonts.control index f4b9260..8c0d98a 100644 --- a/qt/libqt2-emb-fonts.control +++ b/qt/libqt2-emb-fonts.control @@ -1,9 +1,9 @@ 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* Priority: required Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm Depends: libqt2-emb Replaces: qt-embedded-rotation -Version: $QTE_VERSION-$QTE_REVISION.1 +Version: $QTE_VERSION-$QTE_REVISION Description: Qt/Embedded fonts - 0,90,180,270 rotation diff --git a/qt/libqt2-emb.control b/qt/libqt2-emb.control index 450450d..2f9d822 100644 --- a/qt/libqt2-emb.control +++ b/qt/libqt2-emb.control @@ -1,12 +1,12 @@ Files: $QTDIR/lib/libqte.so.$QTE_BASEVERSION $QTDIR/lib/libqte.so.2.3 $QTDIR/lib/libqte.so.2 Priority: required Section: opie/system Maintainer: Robert Griebl <sandman@handhelds.org> Architecture: arm -Version: $QTE_VERSION-$QTE_REVISION.1 +Version: $QTE_VERSION-$QTE_REVISION Depends: libjpeg62, libpng3, zlib1g Provides: qt-embedded Replaces: qt-embedded Description: Qt/Embedded environment A complete windowing system and GUI toolkit for handhelds. See "QPE" for applications. |