merge of 'c43653bfb560ae719097dc966db74985b9b905ba'

     and 'f8480b9fe4209b03c291b9506684fe033956afa6'

3 files changed, 22 insertions, 9 deletions

diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb
index 8a782c349d..680be8c85d 100644
--- a/packages/linux/linux-hackndev-2.6_svn.bb
+++ b/packages/linux/linux-hackndev-2.6_svn.bb
@@ -6,7 +6,7 @@ PR = "r5"
 
 COMPATIBLE_MACHINE = "(palmtt3|palmtx|palmld|palmz72)"
 
-SRC_URI = "svn://svn.sourceforge.net/svnroot/hackndev/linux4palm/linux;module=trunk;proto=https \
+SRC_URI = "svn://hackndev.svn.sourceforge.net/svnroot/hackndev/linux4palm/linux;module=trunk;proto=https \
 	   file://defconfig"
 
 SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \
diff --git a/packages/qmake/qmake2-native_2.01a.bb b/packages/qmake/qmake2-native_2.01a.bb
index b4a736cb76..2ec783574c 100644
--- a/packages/qmake/qmake2-native_2.01a.bb
+++ b/packages/qmake/qmake2-native_2.01a.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL QPL"
 
-PR = "r1"
+PR = "r2"
 
 QTVER = "qt-x11-opensource-src-4.3.0"
 
@@ -58,6 +58,8 @@ do_stage() {
 	install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4
 	install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/
 	cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/
+	install -d ${STAGING_DIR}/${HOST_SYS}/qt4/
+	cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/
 }
 
 do_install() {
diff --git a/packages/uicmoc/uicmoc4-native_4.3.0.bb b/packages/uicmoc/uicmoc4-native_4.3.0.bb
index 341b092e29..fbfd8125cd 100644
--- a/packages/uicmoc/uicmoc4-native_4.3.0.bb
+++ b/packages/uicmoc/uicmoc4-native_4.3.0.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
 
@@ -9,7 +10,8 @@ S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
 
 inherit native
 
-EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \
+EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
+		-qt-libjpeg -qt-gif -system-zlib \
 		-no-nis -no-cups -no-exceptions  \
 		-no-accessibility -no-libjpeg    \
                 -no-nas-sound -no-sm             \
@@ -18,7 +20,8 @@ EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \
                 -no-xrender   -no-fontconfig     \
                 -no-tablet    -no-xkb            \
                 -no-libpng                       \
-                -verbose -release  -fast -static "
+                -verbose -release  -fast -static \
+                -qt3support "
 EXTRA_OEMAKE = " "
 
 do_configure() {
@@ -27,15 +30,23 @@ do_configure() {
 
 do_compile() {
 	unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
-	cd ${S}/src/tools/moc && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/corelib   && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/xml       && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/moc  && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/corelib    && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/sql        && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/qt3support && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/xml        && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/uic  && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/rcc  && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/network    && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/gui        && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/uic3 && oe_runmake CC="${CC}" CXX="${CXX}"
 }
 
 do_stage() {
         install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
         install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+        install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
         install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+        install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/
+        install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
 }