author | kergoth <kergoth> | 2003-01-26 19:46:41 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-01-26 19:46:41 (UTC) |
commit | f389dd4e3d5ceacb15b5c0b751a618d7586d6c31 (patch) (unidiff) | |
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,10 +1,26 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | [ -z "$QTE_VERSION" ] && QTE_VERSION=2.3.4 | 3 | if [ -z "$QTE_BASEVERSION" ] |
4 | [ -z "$QTE_BASEVERSION" ] && QTE_BASEVERSION=2.3.4 | 4 | then |
5 | if [ -e $QTDIR/include/qglobal.h ] | ||
6 | then | ||
7 | 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,;'` | ||
8 | else | ||
9 | QTE_BASEVERSION=2.3.4 | ||
10 | fi | ||
11 | fi | ||
12 | if [ -z "$QTE_VERSION" ] | ||
13 | then | ||
14 | if [ -e $QTDIR/include/qglobal.h ] | ||
15 | then | ||
16 | QTE_VERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION_STR'|sed -e 's,#define QT_VERSION_STR\t*,,;' -e 's,.*"\([^"]*\)".*,\1,;'` | ||
17 | else | ||
18 | QTE_VERSION=2.3.4 | ||
19 | fi | ||
20 | fi | ||
5 | [ -z "$QTE_REVISION" ] && QTE_REVISION=3 | 21 | [ -z "$QTE_REVISION" ] && QTE_REVISION=3 |
6 | DEB_VERSION=2.0 | 22 | DEB_VERSION=2.0 |
7 | 23 | ||
8 | # Have to do this here, since CVS can't store symlinks | 24 | # Have to do this here, since CVS can't store symlinks |
9 | 25 | ||
10 | mkdir -p $OPIEDIR/etc/rcS.d | 26 | 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 | |||
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> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Depends: libqt2-emb | 6 | Depends: libqt2-emb |
7 | Replaces: qt-embedded-rotation | 7 | Replaces: qt-embedded-rotation |
8 | Version: $QTE_VERSION-$QTE_REVISION.1 | 8 | Version: $QTE_VERSION-$QTE_REVISION |
9 | Description: Qt/Embedded fonts - 0,90,180,270 rotation | 9 | 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 @@ | |||
1 | Files: $QTDIR/lib/libqte.so.$QTE_BASEVERSION $QTDIR/lib/libqte.so.2.3 $QTDIR/lib/libqte.so.2 | 1 | Files: $QTDIR/lib/libqte.so.$QTE_BASEVERSION $QTDIR/lib/libqte.so.2.3 $QTDIR/lib/libqte.so.2 |
2 | Priority: required | 2 | Priority: required |
3 | Section: opie/system | 3 | Section: opie/system |
4 | Maintainer: Robert Griebl <sandman@handhelds.org> | 4 | Maintainer: Robert Griebl <sandman@handhelds.org> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QTE_VERSION-$QTE_REVISION.1 | 6 | Version: $QTE_VERSION-$QTE_REVISION |
7 | Depends: libjpeg62, libpng3, zlib1g | 7 | Depends: libjpeg62, libpng3, zlib1g |
8 | Provides: qt-embedded | 8 | Provides: qt-embedded |
9 | Replaces: qt-embedded | 9 | Replaces: qt-embedded |
10 | Description: Qt/Embedded environment | 10 | Description: Qt/Embedded environment |
11 | A complete windowing system and GUI toolkit for handhelds. | 11 | A complete windowing system and GUI toolkit for handhelds. |
12 | See "QPE" for applications. | 12 | See "QPE" for applications. |