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.

7 files changed, 6 insertions, 3 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index c20c6ea4b1..4ad2414af4 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1250,6 +1250,10 @@ sha256=a97656796c0ef8e87dd83e6138bc406e31830d08f9b213e039d8be39ea65c8e4
 md5=d82b0374d481f93e481aad4e3f26893a
 sha256=a23860a7390bbbc87cf98833f8716cd03b88b1d6fce77e0624daba3150a177e9
 
+[ftp://ftp.trolltech.com/pub/qt/source/qt-x11-opensource-src-4.2.3.tar.gz]
+md5=13f12bf58a32ebf15837fcd605cb3c99
+sha256=c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
+
 [ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.3.5.tar.bz2]
 md5=022d7a3c572b554f3c47b12cae71a8a4
 sha256=a97656796c0ef8e87dd83e6138bc406e31830d08f9b213e039d8be39ea65c8e4
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"