summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-26 19:46:41 (UTC)
committer kergoth <kergoth>2003-01-26 19:46:41 (UTC)
commitf389dd4e3d5ceacb15b5c0b751a618d7586d6c31 (patch) (side-by-side diff)
tree4409bbfaee1f3467ccebef0d1ebbd20ba949bad0
parentfcc5341e8eaef9586cb7fd2b40a22198de0d196d (diff)
downloadopie-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).
Diffstat (more/less context) (show whitespace changes)
-rwxr-xr-xmkipks20
-rw-r--r--qt/libqt2-emb-fonts.control2
-rw-r--r--qt/libqt2-emb.control2
3 files changed, 20 insertions, 4 deletions
diff --git a/mkipks b/mkipks
index d4e4b38..3fbf160 100755
--- a/mkipks
+++ b/mkipks
@@ -1,10 +1,26 @@
#!/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
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
@@ -2,8 +2,8 @@ Files: $QTDIR/lib/fonts/helvetica_*_{50,50i,75,75i}.* $QTDIR/lib/fonts/helvetica
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.