diff options
author | Holger Freyther <zecke@selfish.org> | 2007-05-10 15:34:14 +0000 |
---|---|---|
committer | Holger Freyther <zecke@selfish.org> | 2007-05-10 15:34:14 +0000 |
commit | 3675b6af66fdab4701b21adca8ee18d4ed4f5a1d (patch) | |
tree | 103dc5c0f12a5310781409d712842c4263355f1f /packages | |
parent | 5ed78a09980a1623ef94809196614ddf6a1db748 (diff) |
packages/{qmake,uicmoc}: Update qmake and uic/moc from Qt4.1.2 to 4.2.3
Version 4.2 is needed to compile the WebKit/Gdk port. Update the checksums.ini
containing the md5/shasum of my download.
Install qmake as qmake2 and qmake-qt4 to follow the debian naming of this
binary.
Diffstat (limited to 'packages')
-rw-r--r-- | packages/qmake/qmake2-native-2.01a/.mtn2git_empty (renamed from packages/qmake/qmake2-native-2.00a/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf (renamed from packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf) | 0 | ||||
-rw-r--r-- | packages/qmake/qmake2-native_2.01a.bb (renamed from packages/qmake/qmake2-native_2.00a.bb) | 4 | ||||
-rw-r--r-- | packages/uicmoc/uicmoc4-native-4.2.3/.mtn2git_empty (renamed from packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/uicmoc/uicmoc4-native-4.2.3/fix-mkspecs.patch (renamed from packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch) | 0 | ||||
-rw-r--r-- | packages/uicmoc/uicmoc4-native_4.2.3.bb (renamed from packages/uicmoc/uicmoc4-native_4.1.1.bb) | 1 |
6 files changed, 2 insertions, 3 deletions
diff --git a/packages/qmake/qmake2-native-2.00a/.mtn2git_empty b/packages/qmake/qmake2-native-2.01a/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qmake/qmake2-native-2.00a/.mtn2git_empty +++ b/packages/qmake/qmake2-native-2.01a/.mtn2git_empty diff --git a/packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf b/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf index d803f036fc..d803f036fc 100644 --- a/packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf +++ b/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.01a.bb index 306891e9af..dab5b6a3b4 100644 --- a/packages/qmake/qmake2-native_2.00a.bb +++ b/packages/qmake/qmake2-native_2.01a.bb @@ -3,9 +3,8 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL QPL" -PR = "r2" -QTVER = "qt-x11-opensource-src-4.1.1" +QTVER = "qt-x11-opensource-src-4.2.3" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ file://linux-oe-qmake.conf" @@ -40,6 +39,7 @@ do_compile() { do_stage() { install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 + install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4 install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/ cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ } diff --git a/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.2.3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty +++ b/packages/uicmoc/uicmoc4-native-4.2.3/.mtn2git_empty diff --git a/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.2.3/fix-mkspecs.patch index 491edde370..491edde370 100644 --- a/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch +++ b/packages/uicmoc/uicmoc4-native-4.2.3/fix-mkspecs.patch diff --git a/packages/uicmoc/uicmoc4-native_4.1.1.bb b/packages/uicmoc/uicmoc4-native_4.2.3.bb index 59bdd1bc40..341b092e29 100644 --- a/packages/uicmoc/uicmoc4-native_4.1.1.bb +++ b/packages/uicmoc/uicmoc4-native_4.2.3.bb @@ -2,7 +2,6 @@ DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11| SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL QPL" -PR = "r0" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz" |