[oe-commits] org.oe.dev packages/{qmake, uicmoc}: Update qmake and uic/moc from Qt4.1.2 to 4.2.3

[freyther commit]

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.

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: e4baf94c392e7be1386faa684f1c2eda59d9857b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e4baf94c392e7be1386faa684f1c2eda59d9857b
Files:
1
packages/qmake/qmake2-native-2.00a
packages/qmake/qmake2-native-2.01a
packages/qmake/qmake2-native_2.00a.bb
packages/qmake/qmake2-native_2.01a.bb
packages/uicmoc/uicmoc4-native-4.1.1
packages/uicmoc/uicmoc4-native-4.2.3
packages/uicmoc/uicmoc4-native_4.1.1.bb
packages/uicmoc/uicmoc4-native_4.2.3.bb
conf/checksums.ini
Diffs:

#
# mt diff -r41bf20bd35324874aeb1b210abca6fba39642f60 -re4baf94c392e7be1386faa684f1c2eda59d9857b
#
# 
# 
# rename "packages/qmake/qmake2-native-2.00a"
#     to "packages/qmake/qmake2-native-2.01a"
# 
# rename "packages/qmake/qmake2-native_2.00a.bb"
#     to "packages/qmake/qmake2-native_2.01a.bb"
# 
# rename "packages/uicmoc/uicmoc4-native-4.1.1"
#     to "packages/uicmoc/uicmoc4-native-4.2.3"
# 
# rename "packages/uicmoc/uicmoc4-native_4.1.1.bb"
#     to "packages/uicmoc/uicmoc4-native_4.2.3.bb"
# 
# patch "conf/checksums.ini"
#  from [b8f7f0e3092d2c84ba19a65e5651673762875f97]
#    to [91f4892ba3c44147cac1e22b442e8bfa1c29508c]
# 
# patch "packages/qmake/qmake2-native_2.01a.bb"
#  from [b8c2f1103fde9c112869d7c9725771d94052047d]
#    to [f53a579a8da06c4db16e86cc70f3a6ac22e8da31]
# 
# patch "packages/uicmoc/uicmoc4-native_4.2.3.bb"
#  from [c62ba1819443342e54b9d29fbfcaa895e427abbb]
#    to [bb258bfafd5b03ee012d8e4530a8f4219b862463]
# 
============================================================
--- conf/checksums.ini	b8f7f0e3092d2c84ba19a65e5651673762875f97
+++ conf/checksums.ini	91f4892ba3c44147cac1e22b442e8bfa1c29508c
@@ -1250,6 +1250,10 @@ sha256=a23860a7390bbbc87cf98833f8716cd03
 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
============================================================
--- packages/qmake/qmake2-native_2.00a.bb	b8c2f1103fde9c112869d7c9725771d94052047d
+++ packages/qmake/qmake2-native_2.01a.bb	f53a579a8da06c4db16e86cc70f3a6ac22e8da31
@@ -1,11 +1,10 @@ LICENSE = "GPL QPL"
 DESCRIPTION = "TrollTech Makefile Generator"
 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_stage() {
 
 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/
 }
============================================================
--- packages/uicmoc/uicmoc4-native_4.1.1.bb	c62ba1819443342e54b9d29fbfcaa895e427abbb
+++ packages/uicmoc/uicmoc4-native_4.2.3.bb	bb258bfafd5b03ee012d8e4530a8f4219b862463
@@ -1,8 +1,7 @@ LICENSE = "GPL QPL"
 DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
-PR = "r0"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"